commit 1a211cb369dc865a4e7e9f58a100c041af457262
author Paul Jakma <paul@opensourcerouting.org> Sat Nov 01 17:21:47 2014 +0000
committer Paul Jakma <paul@quagga.net> Tue Nov 25 15:57:12 2014 +0000
tree 2f9bc481464ea27c46a0389134ee2e31df7e9c7a
parent ec98d90767b341877fb7f1547f025b946955899a

bgpd: one more fix for tightening of check for missing well-known attributes

* bgp_attr.c: (bgp_attr_check) The check for missing NEXT_HOP has the right
  spirit, but wrong where it counts, on the logic.  It wouldn't catch a
  missing NEXT_HOP on a v4-only UPDATE.  It would though have incorrectly
  flagged next-hop as missing on multi-protocol-only UPDATEs.

  Caught by Martin Winter with a test-suite.

bgpd/bgp_attr.c

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index da17e82..5e213db 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1761,8 +1761,8 @@
   /* RFC 2858 makes Next-Hop optional/ignored, if MP_REACH_NLRI is present and
    * NLRI is empty. We can't easily check NLRI empty here though.
    */
-  if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_MP_REACH_NLRI))
-      && !CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_NEXT_HOP)))
+  if (!CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_NEXT_HOP))
+      && !CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_MP_REACH_NLRI)))
     type = BGP_ATTR_NEXT_HOP;
   
   if (peer->sort == BGP_PEER_IBGP