summaryrefslogtreecommitdiff
path: root/print-ether.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-10-01 15:32:11 -0700
committerGuy Harris <guy@alum.mit.edu>2014-10-01 15:32:11 -0700
commita6f81d534ddc1026442664d21a2122d64ab571a9 (patch)
tree0c856b94619099775613d6a07a6f56e17014f392 /print-ether.c
parent214eb814eeced4f3ffa3c84455f0b168c756e57e (diff)
downloadtcpdump-a6f81d534ddc1026442664d21a2122d64ab571a9.tar.gz
Leave it up to ip6_print() to handle non-IPv6-capable systems.
Always define and declare ip6_print(), always compile print-ip6.c, and always call it if we recognize a payload as IPv6. If INET6 isn't defined, ip6_print() will just print the length and note that printing isn't supported. That way, we don't do weird dissection of IPv6 packets on systems without IPv6 support, due to, for example, ethertype_print() returning 0 ("not dissected") for IPv6 packets on those systems (IPv6-over-Frame Relay was dissected weirdly due to this).
Diffstat (limited to 'print-ether.c')
-rw-r--r--print-ether.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/print-ether.c b/print-ether.c
index 0e7777e9..49e7803c 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -326,11 +326,9 @@ ethertype_print(netdissect_options *ndo,
ip_print(ndo, p, length);
return (1);
-#ifdef INET6
case ETHERTYPE_IPV6:
ip6_print(ndo, p, length);
return (1);
-#endif /*INET6*/
case ETHERTYPE_ARP:
case ETHERTYPE_REVARP: