diff options
| author |   kn <kn@openbsd.org> | 2018-09-29 15:53:07 +0000 |
|---|---|---|
| committer | kn <kn@openbsd.org> | 2018-09-29 15:53:07 +0000 |
| commit | b6b72fb5fd59d49b8c13d39c24ba3fc9a30c29f2 (patch) | |
| tree | 4c1cb9524e06d58b2f621f345f4d0e49090be2e4 /usr.sbin/tcpdump/print-ip6.c | |
| parent | Export the PWD and OLDPWD shell variables as per POSIX. (diff) | |
| download | wireguard-openbsd-b6b72fb5fd59d49b8c13d39c24ba3fc9a30c29f2.tar.xz wireguard-openbsd-b6b72fb5fd59d49b8c13d39c24ba3fc9a30c29f2.zip | |
Zap dead/obsolete code
Flow labels used to be 24-bit back in 1995 until the IPv6 header format
changed in 1998 when the field size was reduced to 20-bit.
https://tools.ietf.org/html/rfc1883#section-6
https://tools.ietf.org/html/rfc2460#section-6
OK denis deraadt
Diffstat (limited to 'usr.sbin/tcpdump/print-ip6.c')
| -rw-r--r-- | usr.sbin/tcpdump/print-ip6.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c index 86b5989de1f..541b6cb3558 100644 --- a/usr.sbin/tcpdump/print-ip6.c +++ b/usr.sbin/tcpdump/print-ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ip6.c,v 1.26 2018/02/10 10:00:32 dlg Exp $ */ +/* $OpenBSD: print-ip6.c,v 1.27 2018/09/29 15:53:07 kn Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 @@ -224,19 +224,10 @@ ip6_print(const u_char *bp, u_int length) end: flow = ntohl(ip6->ip6_flow); -#if 0 - /* rfc1883 */ - if (flow & 0x0f000000) - (void)printf(" [pri 0x%x]", (flow & 0x0f000000) >> 24); - if (flow & 0x00ffffff) - (void)printf(" [flowlabel 0x%x]", flow & 0x00ffffff); -#else - /* RFC 2460 */ if (flow & 0x0ff00000) (void)printf(" [class 0x%x]", (flow & 0x0ff00000) >> 20); if (flow & 0x000fffff) (void)printf(" [flowlabel 0x%x]", flow & 0x000fffff); -#endif if (ip6->ip6_hlim <= 1) (void)printf(" [hlim %d]", (int)ip6->ip6_hlim); |