X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a11713da52b0a72a1cb17f00fc339d332866e9ca..00c74e34be5c224ec7b18ae763d4db381fa3e7f0:/print-rt6.c diff --git a/print-rt6.c b/print-rt6.c index 8b249788..822ae7cc 100644 --- a/print-rt6.c +++ b/print-rt6.c @@ -20,8 +20,8 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.18 2001-06-15 22:17:34 fenner Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.26 2003-11-19 00:36:08 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -30,13 +30,7 @@ static const char rcsid[] = #ifdef INET6 -#include -#include -#include -#include - - -#include +#include #include @@ -44,6 +38,7 @@ static const char rcsid[] = #include "interface.h" #include "addrtoname.h" +#include "extract.h" int rt6_print(register const u_char *bp, register const u_char *bp2) @@ -71,14 +66,18 @@ rt6_print(register const u_char *bp, register const u_char *bp2) 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; TCHECK(dp0->ip6r0_reserved); if (dp0->ip6r0_reserved || vflag) { printf(", rsv=0x%0x", - (u_int32_t)ntohl(dp0->ip6r0_reserved)); + EXTRACT_32BITS(&dp0->ip6r0_reserved)); } if (len % 2 == 1) @@ -88,7 +87,7 @@ rt6_print(register const u_char *bp, register const u_char *bp2) for (i = 0; i < len; i++) { if ((u_char *)(addr + 1) > ep) goto trunc; - + printf(", [%d]%s", i, ip6addr_string(addr)); addr++; } @@ -103,6 +102,6 @@ rt6_print(register const u_char *bp, register const u_char *bp2) trunc: fputs("[|srcrt]", stdout); - return 65535; /* XXX */ + return -1; } #endif /* INET6 */