X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/988cd2bb0e8d368505897ffeabc30cfafcf1b449..cda9bf8c5f842fc7110fbbf2234bcc898f78c0bd:/print-ip6opts.c diff --git a/print-ip6opts.c b/print-ip6opts.c index a5da63df..acc36713 100644 --- a/print-ip6opts.c +++ b/print-ip6opts.c @@ -27,309 +27,194 @@ * SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +/* \summary: IPv6 header option printer */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.17 2003-11-19 00:36:08 guy Exp $"; +#ifdef HAVE_CONFIG_H +#include #endif -#ifdef INET6 -#include - -#include - -#include "ip6.h" +#include "netdissect-stdinc.h" -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" -/* items outside of rfc2292bis */ -#ifndef IP6OPT_MINLEN -#define IP6OPT_MINLEN 2 -#endif -#ifndef IP6OPT_RTALERT_LEN -#define IP6OPT_RTALERT_LEN 4 -#endif -#ifndef IP6OPT_JUMBO_LEN -#define IP6OPT_JUMBO_LEN 6 -#endif -#define IP6OPT_HOMEADDR_MINLEN 18 -#define IP6OPT_BU_MINLEN 10 -#define IP6OPT_BA_MINLEN 13 -#define IP6OPT_BR_MINLEN 2 -#define IP6SOPT_UI 0x2 -#define IP6SOPT_UI_MINLEN 4 -#define IP6SOPT_ALTCOA 0x3 -#define IP6SOPT_ALTCOA_MINLEN 18 -#define IP6SOPT_AUTH 0x4 -#define IP6SOPT_AUTH_MINLEN 6 - -static void ip6_sopt_print(const u_char *, int); +#include "ip6.h" -static void -ip6_sopt_print(const u_char *bp, int len) +static int +ip6_sopt_print(netdissect_options *ndo, const u_char *bp, int len) { int i; int optlen; for (i = 0; i < len; i += optlen) { - if (bp[i] == IP6OPT_PAD1) + if (GET_U_1(bp + i) == IP6OPT_PAD1) optlen = 1; else { if (i + 1 < len) - optlen = bp[i + 1] + 2; + optlen = GET_U_1(bp + i + 1) + 2; else goto trunc; } if (i + optlen > len) goto trunc; - switch (bp[i]) { + switch (GET_U_1(bp + i)) { case IP6OPT_PAD1: - printf(", pad1"); + ND_PRINT(", pad1"); break; case IP6OPT_PADN: if (len - i < IP6OPT_MINLEN) { - printf(", padn: trunc"); - goto trunc; - } - printf(", padn"); - break; - case IP6SOPT_UI: - if (len - i < IP6SOPT_UI_MINLEN) { - printf(", ui: trunc"); - goto trunc; - } - printf(", ui: 0x%04x ", EXTRACT_16BITS(&bp[i + 2])); - break; - case IP6SOPT_ALTCOA: - if (len - i < IP6SOPT_ALTCOA_MINLEN) { - printf(", altcoa: trunc"); - goto trunc; - } - printf(", alt-CoA: %s", ip6addr_string(&bp[i+2])); - break; - case IP6SOPT_AUTH: - if (len - i < IP6SOPT_AUTH_MINLEN) { - printf(", auth: trunc"); + ND_PRINT(", padn: trunc"); goto trunc; } - printf(", auth spi: 0x%08x", EXTRACT_32BITS(&bp[i + 2])); + ND_PRINT(", padn"); break; default: if (len - i < IP6OPT_MINLEN) { - printf(", sopt_type %d: trunc)", bp[i]); + ND_PRINT(", sopt_type %u: trunc)", GET_U_1(bp + i)); goto trunc; } - printf(", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]); + ND_PRINT(", sopt_type 0x%02x: len=%u", GET_U_1(bp + i), + GET_U_1(bp + i + 1)); break; } } - return; + return 0; trunc: - printf("[trunc] "); + return -1; } -void -ip6_opt_print(const u_char *bp, int len) +static int +ip6_opt_print(netdissect_options *ndo, const u_char *bp, int len) { int i; int optlen = 0; + if (len == 0) + return 0; for (i = 0; i < len; i += optlen) { - if (bp[i] == IP6OPT_PAD1) + if (GET_U_1(bp + i) == IP6OPT_PAD1) optlen = 1; else { if (i + 1 < len) - optlen = bp[i + 1] + 2; + optlen = GET_U_1(bp + i + 1) + 2; else goto trunc; } if (i + optlen > len) goto trunc; - switch (bp[i]) { + switch (GET_U_1(bp + i)) { case IP6OPT_PAD1: - printf("(pad1)"); + ND_PRINT("(pad1)"); break; case IP6OPT_PADN: if (len - i < IP6OPT_MINLEN) { - printf("(padn: trunc)"); + ND_PRINT("(padn: trunc)"); goto trunc; } - printf("(padn)"); + ND_PRINT("(padn)"); break; case IP6OPT_ROUTER_ALERT: if (len - i < IP6OPT_RTALERT_LEN) { - printf("(rtalert: trunc)"); + ND_PRINT("(rtalert: trunc)"); goto trunc; } - if (bp[i + 1] != IP6OPT_RTALERT_LEN - 2) { - printf("(rtalert: invalid len %d)", bp[i + 1]); + if (GET_U_1(bp + i + 1) != IP6OPT_RTALERT_LEN - 2) { + ND_PRINT("(rtalert: invalid len %u)", GET_U_1(bp + i + 1)); goto trunc; } - printf("(rtalert: 0x%04x) ", EXTRACT_16BITS(&bp[i + 2])); + ND_PRINT("(rtalert: 0x%04x) ", GET_BE_U_2(bp + i + 2)); break; case IP6OPT_JUMBO: if (len - i < IP6OPT_JUMBO_LEN) { - printf("(jumbo: trunc)"); + ND_PRINT("(jumbo: trunc)"); goto trunc; } - if (bp[i + 1] != IP6OPT_JUMBO_LEN - 2) { - printf("(jumbo: invalid len %d)", bp[i + 1]); + if (GET_U_1(bp + i + 1) != IP6OPT_JUMBO_LEN - 2) { + ND_PRINT("(jumbo: invalid len %u)", GET_U_1(bp + i + 1)); goto trunc; } - printf("(jumbo: %u) ", EXTRACT_32BITS(&bp[i + 2])); + ND_PRINT("(jumbo: %u) ", GET_BE_U_4(bp + i + 2)); break; case IP6OPT_HOME_ADDRESS: if (len - i < IP6OPT_HOMEADDR_MINLEN) { - printf("(homeaddr: trunc)"); + ND_PRINT("(homeaddr: trunc)"); goto trunc; } - if (bp[i + 1] < IP6OPT_HOMEADDR_MINLEN - 2) { - printf("(homeaddr: invalid len %d)", bp[i + 1]); + if (GET_U_1(bp + i + 1) < IP6OPT_HOMEADDR_MINLEN - 2) { + ND_PRINT("(homeaddr: invalid len %u)", GET_U_1(bp + i + 1)); goto trunc; } - printf("(homeaddr: %s", ip6addr_string(&bp[i + 2])); - if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) { - ip6_sopt_print(&bp[i + IP6OPT_HOMEADDR_MINLEN], - (optlen - IP6OPT_HOMEADDR_MINLEN)); + ND_PRINT("(homeaddr: %s", ip6addr_string(ndo, bp + i + 2)); + if (GET_U_1(bp + i + 1) > IP6OPT_HOMEADDR_MINLEN - 2) { + if (ip6_sopt_print(ndo, bp + i + IP6OPT_HOMEADDR_MINLEN, + (optlen - IP6OPT_HOMEADDR_MINLEN)) == -1) + goto trunc; } - printf(")"); - break; - case IP6OPT_BINDING_UPDATE: - if (len - i < IP6OPT_BU_MINLEN) { - printf("(bu: trunc)"); - goto trunc; - } - if (bp[i + 1] < IP6OPT_BU_MINLEN - 2) { - printf("(bu: invalid len %d)", bp[i + 1]); - goto trunc; - } - printf("(bu: "); - if (bp[i + 2] & 0x80) - printf("A"); - if (bp[i + 2] & 0x40) - printf("H"); - if (bp[i + 2] & 0x20) - printf("S"); - if (bp[i + 2] & 0x10) - printf("D"); - if ((bp[i + 2] & 0x0f) || bp[i + 3] || bp[i + 4]) - printf("res"); - printf(", sequence: %u", bp[i + 5]); - printf(", lifetime: %u", EXTRACT_32BITS(&bp[i + 6])); - - if (bp[i + 1] > IP6OPT_BU_MINLEN - 2) { - ip6_sopt_print(&bp[i + IP6OPT_BU_MINLEN], - (optlen - IP6OPT_BU_MINLEN)); - } - printf(")"); - break; - case IP6OPT_BINDING_ACK: - if (len - i < IP6OPT_BA_MINLEN) { - printf("(ba: trunc)"); - goto trunc; - } - if (bp[i + 1] < IP6OPT_BA_MINLEN - 2) { - printf("(ba: invalid len %d)", bp[i + 1]); - goto trunc; - } - printf("(ba: "); - printf("status: %u", bp[i + 2]); - if (bp[i + 3]) - printf("res"); - printf(", sequence: %u", bp[i + 4]); - printf(", lifetime: %u", EXTRACT_32BITS(&bp[i + 5])); - printf(", refresh: %u", EXTRACT_32BITS(&bp[i + 9])); - - if (bp[i + 1] > IP6OPT_BA_MINLEN - 2) { - ip6_sopt_print(&bp[i + IP6OPT_BA_MINLEN], - (optlen - IP6OPT_BA_MINLEN)); - } - printf(")"); - break; - case IP6OPT_BINDING_REQ: - if (len - i < IP6OPT_BR_MINLEN) { - printf("(br: trunc)"); - goto trunc; - } - printf("(br"); - if (bp[i + 1] > IP6OPT_BR_MINLEN - 2) { - ip6_sopt_print(&bp[i + IP6OPT_BR_MINLEN], - (optlen - IP6OPT_BR_MINLEN)); - } - printf(")"); + ND_PRINT(")"); break; default: if (len - i < IP6OPT_MINLEN) { - printf("(type %d: trunc)", bp[i]); + ND_PRINT("(type %u: trunc)", GET_U_1(bp + i)); goto trunc; } - printf("(opt_type 0x%02x: len=%d) ", bp[i], bp[i + 1]); + ND_PRINT("(opt_type 0x%02x: len=%u)", GET_U_1(bp + i), + GET_U_1(bp + i + 1)); break; } } - -#if 0 -end: -#endif - return; + ND_PRINT(" "); + return 0; trunc: - printf("[trunc] "); + return -1; } int -hbhopt_print(register const u_char *bp) +hbhopt_print(netdissect_options *ndo, const u_char *bp) { - const struct ip6_hbh *dp = (struct ip6_hbh *)bp; - register const u_char *ep; - int hbhlen = 0; - - /* 'ep' points to the end of available data. */ - ep = snapend; - TCHECK(dp->ip6h_len); - hbhlen = (int)((dp->ip6h_len + 1) << 3); - TCHECK2(*dp, hbhlen); - printf("HBH "); - if (vflag) - ip6_opt_print((const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp)); - - return(hbhlen); + const struct ip6_hbh *dp = (const struct ip6_hbh *)bp; + u_int hbhlen = 0; + + ndo->ndo_protocol = "hbhopt"; + ND_TCHECK_1(dp->ip6h_len); + hbhlen = (GET_U_1(dp->ip6h_len) + 1) << 3; + ND_TCHECK_LEN(dp, hbhlen); + ND_PRINT("HBH "); + if (ndo->ndo_vflag) + if (ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp), + hbhlen - sizeof(*dp)) == -1) + goto trunc; + return hbhlen; - trunc: - fputs("[|HBH]", stdout); - return(-1); +trunc: + nd_print_trunc(ndo); + return -1; } int -dstopt_print(register const u_char *bp) +dstopt_print(netdissect_options *ndo, const u_char *bp) { - const struct ip6_dest *dp = (struct ip6_dest *)bp; - register const u_char *ep; - int dstoptlen = 0; - - /* 'ep' points to the end of available data. */ - ep = snapend; - TCHECK(dp->ip6d_len); - dstoptlen = (int)((dp->ip6d_len + 1) << 3); - TCHECK2(*dp, dstoptlen); - printf("DSTOPT "); - if (vflag) { - ip6_opt_print((const u_char *)dp + sizeof(*dp), - dstoptlen - sizeof(*dp)); + const struct ip6_dest *dp = (const struct ip6_dest *)bp; + u_int dstoptlen = 0; + + ndo->ndo_protocol = "dstopt"; + ND_TCHECK_1(dp->ip6d_len); + dstoptlen = (GET_U_1(dp->ip6d_len) + 1) << 3; + ND_TCHECK_LEN(dp, dstoptlen); + ND_PRINT("DSTOPT "); + if (ndo->ndo_vflag) { + if (ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp), + dstoptlen - sizeof(*dp)) == -1) + goto trunc; } - return(dstoptlen); + return dstoptlen; - trunc: - fputs("[|DSTOPT]", stdout); - return(-1); +trunc: + nd_print_trunc(ndo); + return -1; } -#endif /* INET6 */