[gentoo-commits] gentoo-x86 commit in net-analyzer/tcpdump/files: tcpdump-4.2.0-ipv6.patch

[gentoo-commits] gentoo-x86 commit in net-analyzer/tcpdump/files: tcpdump-4.2.0-ipv6.patch

[Jeroen Roovers (jer)]

jer         11/12/17 14:22:46

  Added:                tcpdump-4.2.0-ipv6.patch
  Log:
  Fix building with USE=-ipv6 thanks to Andrey Grozin, patch by Andrew Savchenko (bug #395031). Clean up inherit.
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/tcpdump/files/tcpdump-4.2.0-ipv6.patch?rev=1.1&content-type=text/plain

Index: tcpdump-4.2.0-ipv6.patch
===================================================================
Fix compiling with USE=-ipv6 (bug #395031).
https://bugs.gentoo.org/395031

--- a/tcpdump-4.2.0/print-babel.c
+++ b/tcpdump-4.2.0/print-babel.c
@@ -115,10 +115,14 @@
 format_prefix(const u_char *prefix, unsigned char plen)
 {
     static char buf[50];
+#ifdef INET6
     if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
+#endif
         snprintf(buf, 50, "%s/%u", ipaddr_string(prefix + 12), plen - 96);
+#ifdef INET6
     else
         snprintf(buf, 50, "%s/%u", ip6addr_string(prefix), plen);
+#endif
     buf[49] = '\0';
     return buf;
 }
@@ -126,10 +130,14 @@
 static const char *
 format_address(const u_char *prefix)
 {
+#ifdef INET6
     if(memcmp(prefix, v4prefix, 12) == 0)
+#endif
         return ipaddr_string(prefix + 12);
+#ifdef INET6
     else
         return ip6addr_string(prefix);
+#endif
 }
 
 static int