From: hannes <hannes>
Date: Fri, 6 Oct 2006 06:26:40 +0000 (+0000)
Subject: bugfix from Aaron Campbel <aaron@arbor.net>:
X-Git-Tag: tcpdump-3.9.7~51
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/96fc9f5d28c509316e424af8c01ded25a85836a6

bugfix from Aaron Campbel <aaron@arbor.net>:
The expression (BGP_OSPF_RTYPE_EXT ||BGP_OSPF_RTYPE_NSSA) will always evaluate to 1.
---

diff --git a/CREDITS b/CREDITS
index 186867ba..7b93e39b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -11,6 +11,7 @@ The current maintainers:
 
 Additional people who have contributed patches:
 
+        Aaron Campbell                  <aaron@arbor.net>
 	Alfredo Andres			<aandres@s21sec.com>
 	Albert Chin			<china@thewrittenword.com>
 	Andrew Brown			<atatat@atatdot.net>
diff --git a/print-bgp.c b/print-bgp.c
index e4c08f27..439d8b60 100644
--- 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",