diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:37:07 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:37:07 -0300 |
| commit | 4ef888db25896b2295f521c736ef04aa2e5e64ec (patch) | |
| tree | 3fcc00dda536bd32ae85bc09f21be4081d32bad5 /contrib/tcpdump/print-rt6.c | |
| parent | 272ffd7c3e4e5e27910eb918e2e36556f2a8ec3a (diff) | |
| parent | af015c5bcac0e333adeec07eff0698bad3b91e95 (diff) | |
| download | FreeBSD-src-4ef888db25896b2295f521c736ef04aa2e5e64ec.zip FreeBSD-src-4ef888db25896b2295f521c736ef04aa2e5e64ec.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'contrib/tcpdump/print-rt6.c')
| -rw-r--r-- | contrib/tcpdump/print-rt6.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/contrib/tcpdump/print-rt6.c b/contrib/tcpdump/print-rt6.c index 3d5f9e3..35dbed9 100644 --- a/contrib/tcpdump/print-rt6.c +++ b/contrib/tcpdump/print-rt6.c @@ -19,20 +19,19 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \summary: IPv6 routing header printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#ifdef INET6 - -#include <tcpdump-stdinc.h> +#include <netdissect-stdinc.h> #include <string.h> #include "ip6.h" -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" @@ -44,9 +43,8 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 register const u_char *ep; int i, len; register const struct in6_addr *addr; - const struct in6_addr *last_addr = NULL; - dp = (struct ip6_rthdr *)bp; + dp = (const struct ip6_rthdr *)bp; len = dp->ip6r_len; /* 'ep' points to the end of available data. */ @@ -59,15 +57,9 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 ND_PRINT((ndo, ", segleft=%d", dp->ip6r_segleft)); switch (dp->ip6r_type) { -#ifndef IPV6_RTHDR_TYPE_0 -#define IPV6_RTHDR_TYPE_0 0 -#endif -#ifndef IPV6_RTHDR_TYPE_2 -#define IPV6_RTHDR_TYPE_2 2 -#endif case IPV6_RTHDR_TYPE_0: case IPV6_RTHDR_TYPE_2: /* Mobile IPv6 ID-20 */ - dp0 = (struct ip6_rthdr0 *)dp; + dp0 = (const struct ip6_rthdr0 *)dp; ND_TCHECK(dp0->ip6r0_reserved); if (dp0->ip6r0_reserved || ndo->ndo_vflag) { @@ -80,21 +72,12 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 len >>= 1; addr = &dp0->ip6r0_addr[0]; for (i = 0; i < len; i++) { - if ((u_char *)(addr + 1) > ep) + if ((const u_char *)(addr + 1) > ep) goto trunc; ND_PRINT((ndo, ", [%d]%s", i, ip6addr_string(ndo, addr))); - last_addr = addr; addr++; } - /* - * the destination address used in the pseudo-header is that of the final - * destination : the last address of the routing header - */ - if (last_addr != NULL) { - struct ip6_hdr *ip6 = (struct ip6_hdr *)bp2; - UNALIGNED_MEMCPY(&ip6->ip6_dst, last_addr, sizeof (struct in6_addr)); - } /*(*/ ND_PRINT((ndo, ") ")); return((dp0->ip6r0_len + 1) << 3); @@ -108,4 +91,3 @@ rt6_print(netdissect_options *ndo, register const u_char *bp, const u_char *bp2 ND_PRINT((ndo, "[|srcrt]")); return -1; } -#endif /* INET6 */ |
