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-udp.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-udp.c')
-rw-r--r-- | print-udp.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/print-udp.c b/print-udp.c index 21102391..cc6b275e 100644 --- a/print-udp.c +++ b/print-udp.c @@ -33,9 +33,7 @@ #include "udp.h" #include "ip.h" -#ifdef INET6 #include "ip6.h" -#endif #include "ipproto.h" #include "rpc_auth.h" #include "rpc_msg.h" @@ -277,19 +275,16 @@ static int udp_cksum(netdissect_options *ndo, register const struct ip *ip, IPPROTO_UDP); } -#ifdef INET6 static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up, u_int len) { return nextproto6_cksum(ip6, (const uint8_t *)(const void *)up, len, len, IPPROTO_UDP); } -#endif static void udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dport) { -#ifdef INET6 const struct ip6_hdr *ip6; if (IP_V(ip) == 6) @@ -317,9 +312,7 @@ udpipaddr_print(netdissect_options *ndo, const struct ip *ip, int sport, int dpo udpport_string(ndo, dport))); } } - } else -#endif /*INET6*/ - { + } else { if (ip->ip_p == IPPROTO_UDP) { if (sport == -1) { ND_PRINT((ndo, "%s > %s: ", @@ -351,20 +344,16 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, register const u_char *cp; register const u_char *ep = bp + length; uint16_t sport, dport, ulen; -#ifdef INET6 register const struct ip6_hdr *ip6; -#endif if (ep > ndo->ndo_snapend) ep = ndo->ndo_snapend; up = (const struct udphdr *)bp; ip = (const struct ip *)bp2; -#ifdef INET6 if (IP_V(ip) == 6) ip6 = (const struct ip6_hdr *)bp2; else ip6 = NULL; -#endif /*INET6*/ if (!ND_TTEST(up->uh_dport)) { udpipaddr_print(ndo, ip, -1, -1); ND_PRINT((ndo, "[|udp]")); @@ -453,11 +442,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, case PT_AODV: udpipaddr_print(ndo, ip, sport, dport); aodv_print(ndo, (const u_char *)(up + 1), length, -#ifdef INET6 ip6 != NULL); -#else - 0); -#endif break; case PT_RADIUS: @@ -543,7 +528,6 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, ND_PRINT((ndo, "[udp sum ok] ")); } } -#ifdef INET6 else if (IP_V(ip) == 6 && ip6->ip6_plen) { /* for IPv6, UDP checksum is mandatory */ if (ND_TTEST2(cp[0], length)) { @@ -558,7 +542,6 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, ND_PRINT((ndo, "[udp sum ok] ")); } } -#endif } if (!ndo->ndo_qflag) { @@ -577,11 +560,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, rip_print(ndo, (const u_char *)(up + 1), length); else if (ISPORT(AODV_PORT)) aodv_print(ndo, (const u_char *)(up + 1), length, -#ifdef INET6 ip6 != NULL); -#else - 0); -#endif else if (ISPORT(ISAKMP_PORT)) isakmp_print(ndo, (const u_char *)(up + 1), length, bp2); else if (ISPORT(ISAKMP_PORT_NATT)) @@ -616,7 +595,6 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, (dport >= RX_PORT_LOW && dport <= RX_PORT_HIGH)) rx_print(ndo, (const void *)(up + 1), length, sport, dport, (const u_char *) ip); -#ifdef INET6 else if (ISPORT(RIPNG_PORT)) ripng_print(ndo, (const u_char *)(up + 1), length); else if (ISPORT(DHCP6_SERV_PORT) || ISPORT(DHCP6_CLI_PORT)) @@ -625,7 +603,6 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, ahcp_print(ndo, (const u_char *)(up + 1), length); else if (ISPORT(BABEL_PORT) || ISPORT(BABEL_PORT_OLD)) babel_print(ndo, (const u_char *)(up + 1), length); -#endif /*INET6*/ /* * Kludge in test for whiteboard packets. */ @@ -647,11 +624,7 @@ udp_print(netdissect_options *ndo, register const u_char *bp, u_int length, ldp_print(ndo, (const u_char *)(up + 1), length); else if (ISPORT(OLSR_PORT)) olsr_print(ndo, (const u_char *)(up + 1), length, -#if INET6 (IP_V(ip) == 6) ? 1 : 0); -#else - 0); -#endif else if (ISPORT(MPLS_LSP_PING_PORT)) lspping_print(ndo, (const u_char *)(up + 1), length); else if (dport == BFD_CONTROL_PORT || |