X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/86cfeae8aba347560a63f93d1d4f0424c458e407..d75ee07998ef8ac0fc1a9a6beea2e15a3ca1f726:/print-rt6.c diff --git a/print-rt6.c b/print-rt6.c index 24f2d473..6b8bae64 100644 --- a/print-rt6.c +++ b/print-rt6.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.20 2002-06-27 08:21:41 guy Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-rt6.c,v 1.23 2003-02-05 02:36:26 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) @@ -76,13 +71,13 @@ rt6_print(register const u_char *bp, register const u_char *bp2) #define IPV6_RTHDR_TYPE_2 2 #endif case IPV6_RTHDR_TYPE_0: - case IPV6_RTHDR_TYPE_2: /* Mobile IPv6 ID-17 */ + 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)