bugfix from Aaron Campbel <[email protected]>:

The expression (BGP_OSPF_RTYPE_EXT ||BGP_OSPF_RTYPE_NSSA) will always evaluate to 1.

diff --git a/CREDITS b/CREDITS
index 186867bae5a81c3b0f70a717dd9709ee9f866444..7b93e39b5c5d340f92abb4d9e803c0efb463d7a9 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -11,6 +11,7 @@ The current maintainers:
 
 Additional people who have contributed patches:
 
+        Aaron Campbell                  <[email protected]>
        Alfredo Andres                  <[email protected]>
        Albert Chin                     <[email protected]>
        Andrew Brown                    <[email protected]>

diff --git a/print-bgp.c b/print-bgp.c
index e4c08f27a5a9d7d43c6e515bc9c175c33ea97a1d..439d8b60444866d285643c63bcd54cf017306e0d 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.9 2006-02-02 12:36:46 hannes Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.91.2.10 2006-10-06 06:26:40 hannes Exp $";
 #endif
 
 #include <tcpdump-stdinc.h>
@@ -1548,7 +1548,7 @@ bgp_attr_print(const struct bgp_attr *attr, const u_char *pptr, int len)
                                          *(tptr+6),
                                          tokbuf, sizeof(tokbuf)),
                                (*(tptr+7) &  BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
-                               (*(tptr+6) == (BGP_OSPF_RTYPE_EXT ||BGP_OSPF_RTYPE_NSSA )) ? "E1" : "");
+                               ((*(tptr+6) == BGP_OSPF_RTYPE_EXT) || (*(tptr+6) == BGP_OSPF_RTYPE_NSSA)) ? "E1" : "");
                         break;
                     case BGP_EXT_COM_L2INFO:
                         printf(": %s Control Flags [0x%02x]:MTU %u",