diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-09-17 14:56:44 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-09-17 14:56:44 -0700 |
commit | 11f73ad248fa22461ca040baa8dc94b864509efa (patch) | |
tree | 5a0e2679a78a1dfbe2388b4bf2d55490a38ef989 /print-ahcp.c | |
parent | 2a85a1bba4c2e63094a259c5d0ed397f234ba5f3 (diff) | |
download | tcpdump-11f73ad248fa22461ca040baa8dc94b864509efa.tar.gz |
Don't require IPv6 library support in order to support IPv6 addresses.
Have our own routines to convert between IPv4/IPv6 addresses and
strings; that helps if, for example, we want to build binary versions of
tcpdump for Windows that can run both on NT 5 (W2K/WXP), which doesn't
have inet_ntop() or inet_pton(), and NT 6 (Vista/7/8/10), which do. It
also means that we don't require IPv6 library support on UN*X to print
addresses (if somebody wants to build tcpdump for older UN*Xes lacking
IPv6 support in the system library or in add-on libraries).
Get rid of files in the missing directory that we don't need, and
various no-longer-necessary autoconf tests.
Diffstat (limited to 'print-ahcp.c')
-rw-r--r-- | print-ahcp.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/print-ahcp.c b/print-ahcp.c index 41a1bb05..5a60e4fe 100644 --- a/print-ahcp.c +++ b/print-ahcp.c @@ -153,11 +153,7 @@ ahcp_ipv6_addresses_print(netdissect_options *ndo, const u_char *cp, const u_cha if (cp + 16 > ep) goto invalid; ND_TCHECK2(*cp, 16); -#ifdef INET6 ND_PRINT((ndo, "%s%s", sep, ip6addr_string(ndo, cp))); -#else - ND_PRINT((ndo, "%s(compiled w/o IPv6)", sep)); -#endif /* INET6 */ cp += 16; sep = ", "; } @@ -205,11 +201,7 @@ ahcp_ipv6_prefixes_print(netdissect_options *ndo, const u_char *cp, const u_char if (cp + 17 > ep) goto invalid; ND_TCHECK2(*cp, 17); -#ifdef INET6 ND_PRINT((ndo, "%s%s/%u", sep, ip6addr_string(ndo, cp), *(cp + 16))); -#else - ND_PRINT((ndo, "%s(compiled w/o IPv6)/%u", sep, *(cp + 16))); -#endif /* INET6 */ cp += 17; sep = ", "; } |