From Francois-Xavier Le Bail: #ifdef INET6-out some code that only

builds if the platform supports IPv6.

diff --git a/CREDITS b/CREDITS
index fe396cd57b2255ee05d4d534dfd3bffc228ea7d5..9d6b0113da6b2af3ed87d2e2999b8de7e06e54e6 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -47,6 +47,7 @@ Additional people who have contributed patches:
        Florent Drouin                  <[email protected]>
        Francis Dupont                  <[email protected]>
        Francisco Matias Cuenca-Acuna   <[email protected]>
        Florent Drouin                  <[email protected]>
        Francis Dupont                  <[email protected]>
        Francisco Matias Cuenca-Acuna   <[email protected]>

+       Francois-Xavier Le Bail         <[email protected]>

        Frank Volf                      <[email protected]>
        Fulvio Risso                    <[email protected]>
        George Bakos                    <[email protected]>
        Frank Volf                      <[email protected]>
        Fulvio Risso                    <[email protected]>
        George Bakos                    <[email protected]>

diff --git a/print-bgp.c b/print-bgp.c
index 0bbdb40abb6e5d2d445c8dcf89d15b3102b9b541..92552e538799f77c50cbebb326d2dce6153f9793 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.114 2007-07-14 22:24:54 guy Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-bgp.c,v 1.115 2007-07-22 02:42:53 guy Exp $";

 #endif
 
 #include <tcpdump-stdinc.h>
 #endif
 
 #include <tcpdump-stdinc.h>


@@ -544,10 +544,12 @@ bgp_vpn_ip_print (const u_char *pptr, u_int addr_length) {
         TCHECK2(pptr[0], sizeof(struct in_addr));
         snprintf(pos, sizeof(addr), "%s", ipaddr_string(pptr));
         break;
         TCHECK2(pptr[0], sizeof(struct in_addr));
         snprintf(pos, sizeof(addr), "%s", ipaddr_string(pptr));
         break;

+#ifdef INET6

     case (sizeof(struct in6_addr) << 3): /* 128 */
         TCHECK2(pptr[0], sizeof(struct in6_addr));
         snprintf(pos, sizeof(addr), "%s", ip6addr_string(pptr));
         break;
     case (sizeof(struct in6_addr) << 3): /* 128 */
         TCHECK2(pptr[0], sizeof(struct in6_addr));
         snprintf(pos, sizeof(addr), "%s", ip6addr_string(pptr));
         break;

+#endif

     default:
         snprintf(pos, sizeof(addr), "bogus address length %u", addr_length);
         break;
     default:
         snprintf(pos, sizeof(addr), "bogus address length %u", addr_length);
         break;