diff options
| author |   kn <kn@openbsd.org> | 2018-10-22 16:12:45 +0000 |
|---|---|---|
| committer | kn <kn@openbsd.org> | 2018-10-22 16:12:45 +0000 |
| commit | e654d8cdd26d89ab3ef1c8068214ba920c998264 (patch) | |
| tree | 4f9889dc410cf5d22d7fd2ffb728135b1347786b /usr.sbin/tcpdump/print-ip.c | |
| parent | ipsec: use monotonic clock for SA creation/lookup timestamps; ok dlg@ (diff) | |
| download | wireguard-openbsd-e654d8cdd26d89ab3ef1c8068214ba920c998264.tar.xz wireguard-openbsd-e654d8cdd26d89ab3ef1c8068214ba920c998264.zip | |
Remove #ifdef INET6
There's not reason to build without IPv6 support, `-U INET6' builds were
broken anyway.
Fix an empty redefine for IPPROTO_IPV6 in print-ip.c while here.
No object change on amd64 and sparc64 with clang, gcc compiles differently
but behaviour stays the same.
OK denis deraadt
Diffstat (limited to 'usr.sbin/tcpdump/print-ip.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-ip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/tcpdump/print-ip.c b/usr.sbin/tcpdump/print-ip.c index 20bef72e9b3..5d6d8735110 100644 --- a/usr.sbin/tcpdump/print-ip.c +++ b/usr.sbin/tcpdump/print-ip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ip.c,v 1.50 2018/07/06 04:49:21 dlg Exp $ */ +/* $OpenBSD: print-ip.c,v 1.51 2018/10/22 16:12:45 kn Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -441,9 +441,8 @@ ip_print(const u_char *bp, u_int length) } break; -#ifdef INET6 #ifndef IPPROTO_IPV6 -#define IPPROTO_IPV6 +#define IPPROTO_IPV6 41 #endif case IPPROTO_IPV6: /* ip6-in-ip encapsulation */ @@ -457,7 +456,6 @@ ip_print(const u_char *bp, u_int length) goto out; } break; -#endif /*INET6*/ #ifndef IPPROTO_GRE #define IPPROTO_GRE 47 |