Merge commit 'quagga_0_99_20_1_release' into euro_ix_bex22b

v0.99.20ex22b

Conflicts:
  bgpd/bgp_open.c
  bgpd/bgp_packet.c

  The bpp_open.c code has been replaced by code in bgp_open_state.c, so
  these changes have no effect on the euro_ix branch, which already
  rejects invalid OPEN with a NOTIFY.

Otherwise:

  modified:   ospfd/ospf_dump.c
  modified:   ospfd/ospf_dump.h
  modified:   ospfd/ospf_lsa.h
  modified:   ospfd/ospf_packet.c
  modified:   ospfd/ospf_packet.h

1 files changed, 10 insertions, 4 deletions

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 872e12a2..d9db1c99 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -454,12 +454,20 @@ bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
 static as_t
 bgp_capability_as4 (struct peer *peer, struct capability_header *hdr)
 {
+  SET_FLAG (peer->cap, PEER_CAP_AS4_RCV);
+
+  if (hdr->length != CAPABILITY_CODE_AS4_LEN)
+    {
+      zlog_err ("%s AS4 capability has incorrect data length %d",
+                peer->host, hdr->length);
+      return 0;
+    }
+
   as_t as4 = stream_getl (BGP_INPUT(peer));
 
   if (BGP_DEBUG (as4, AS4))
     zlog_debug ("%s [AS4] about to set cap PEER_CAP_AS4_RCV, got as4 %u",
                 peer->host, as4);
-  SET_FLAG (peer->cap, PEER_CAP_AS4_RCV);
 
   return as4;
 }
@@ -724,11 +732,9 @@ peek_for_as4_capability (struct peer *peer, u_char length)
 
 	      if (hdr.code == CAPABILITY_CODE_AS4)
 	        {
-	          if (hdr.length != CAPABILITY_CODE_AS4_LEN)
-	            goto end;
-
 	          if (BGP_DEBUG (as4, AS4))
 	            zlog_info ("[AS4] found AS4 capability, about to parse");
+
 	          as4 = bgp_capability_as4 (peer, &hdr);
 
 	          goto end;