From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 14 Aug 2011 23:26:32 +0000 (-0700)
Subject: Don't compile print-babel.c if we don't have IPv6 support.
X-Git-Tag: tcpdump-4.2.1~21
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/b4eb26f3f4c94b77c623ad5260a480085d5804df

Don't compile print-babel.c if we don't have IPv6 support.
---

diff --git a/Makefile.in b/Makefile.in
index f03aa85f..48634a1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,7 +72,7 @@ CSRC =	addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c ipproto.c
         nlpid.c l2vpn.c machdep.c parsenfsfh.c in_cksum.c \
 	print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
 	print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
-	print-atm.c print-babel.c print-beep.c print-bfd.c print-bgp.c \
+	print-atm.c print-beep.c print-bfd.c print-bgp.c \
 	print-bootp.c print-bt.c print-cdp.c print-cfm.c print-chdlc.c \
 	print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
 	print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
@@ -245,6 +245,7 @@ EXTRA_DIST = \
 	mkdep \
 	packetdat.awk \
 	pcap_dump_ftell.c \
+	print-babel.c \
 	print-dhcp6.c \
 	print-frag6.c \
 	print-icmp6.c \
diff --git a/configure b/configure
index a22e815f..fd0617b1 100755
--- a/configure
+++ b/configure
@@ -4840,7 +4840,7 @@ if test "${enable_ipv6+set}" = set; then
   enableval=$enable_ipv6;  case "$enableval" in
 yes)   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
        cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF
@@ -4900,7 +4900,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (exit $ac_status); }; }; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
   cat >>confdefs.h <<\_ACEOF
 #define INET6 1
 _ACEOF
diff --git a/configure.in b/configure.in
index 90dd2f5a..96d89831 100644
--- a/configure.in
+++ b/configure.in
@@ -199,7 +199,7 @@ AC_ARG_ENABLE(ipv6,
   --disable-ipv6          disable ipv6 support],
 [ case "$enableval" in
 yes)   AC_MSG_RESULT(yes)
-       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+       LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
        AC_DEFINE(INET6)
        ipv6=yes
        ;;
@@ -221,7 +221,7 @@ main()
 }
 ],
 [ AC_MSG_RESULT(yes)
-  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c $LOCALSRC"
+  LOCALSRC="print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c print-babel.c $LOCALSRC"
   AC_DEFINE(INET6)
   ipv6=yes],
 [ AC_MSG_RESULT(no)
diff --git a/print-babel.c b/print-babel.c
index a61651db..a8108fc5 100644
--- a/print-babel.c
+++ b/print-babel.c
@@ -118,11 +118,7 @@ format_prefix(const u_char *prefix, unsigned char plen)
     if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
         snprintf(buf, 50, "%s/%u", ipaddr_string(prefix + 12), plen - 96);
     else
-#ifdef INET6
         snprintf(buf, 50, "%s/%u", ip6addr_string(prefix), plen);
-#else
-        snprintf(buf, 50, "(IPv6 address)");
-#endif
     buf[49] = '\0';
     return buf;
 }
@@ -133,11 +129,7 @@ format_address(const u_char *prefix)
     if(memcmp(prefix, v4prefix, 12) == 0)
         return ipaddr_string(prefix + 12);
     else
-#ifdef INET6
         return ip6addr_string(prefix);
-#else
-        return "(IPv6 address)";
-#endif
 }
 
 static int