X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f3b1a282845777b4e729ecfe5d0c8b8d669010c5..ad6df73f5a6c46a409c7629f5588b1b81dff6357:/print-ip6opts.c?ds=inline diff --git a/print-ip6opts.c b/print-ip6opts.c index 163b70f4..07124068 100644 --- a/print-ip6opts.c +++ b/print-ip6opts.c @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.8 2000-12-13 07:57:05 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.10 2002-03-28 10:02:35 guy Exp $"; #endif #ifdef INET6 @@ -64,10 +64,12 @@ static const char rcsid[] = #define IP6OPT_BU_MINLEN 10 #define IP6OPT_BA_MINLEN 13 #define IP6OPT_BR_MINLEN 2 -#define IP6SOPT_ALTCOA 0x4 -#define IP6SOPT_ALTCOA_MINLEN 18 #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); @@ -78,10 +80,20 @@ ip6_sopt_print(const u_char *bp, int len) int optlen; for (i = 0; i < len; i += optlen) { + if (bp[i] == IP6OPT_PAD1) + optlen = 1; + else { + if (i + 1 < len) + optlen = bp[i + 1] + 2; + else + goto trunc; + } + if (i + optlen > len) + goto trunc; + switch (bp[i]) { case IP6OPT_PAD1: printf(", pad1"); - optlen = 1; break; case IP6OPT_PADN: if (len - i < IP6OPT_MINLEN) { @@ -89,7 +101,13 @@ ip6_sopt_print(const u_char *bp, int len) goto trunc; } printf(", padn"); - optlen = bp[i + 1] + 2; + break; + case IP6SOPT_UI: + if (len - i < IP6SOPT_UI_MINLEN) { + printf(", ui: trunc"); + goto trunc; + } + printf(", ui: 0x%04x ", ntohs(*(u_int16_t *)&bp[i + 2])); break; case IP6SOPT_ALTCOA: if (len - i < IP6SOPT_ALTCOA_MINLEN) { @@ -97,15 +115,14 @@ ip6_sopt_print(const u_char *bp, int len) goto trunc; } printf(", alt-CoA: %s", ip6addr_string(&bp[i+2])); - optlen = bp[i + 1] + 2; break; - case IP6SOPT_UI: - if (len - i < IP6SOPT_UI_MINLEN) { - printf(", ui: trunc"); + case IP6SOPT_AUTH: + if (len - i < IP6SOPT_AUTH_MINLEN) { + printf(", auth: trunc"); goto trunc; } - printf("(ui: 0x%04x) ", ntohs(*(u_int16_t *)&bp[i + 2])); - optlen = bp[i + 1] + 2; + printf(", auth spi: 0x%08x", + (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 2])); break; default: if (len - i < IP6OPT_MINLEN) { @@ -113,7 +130,6 @@ ip6_sopt_print(const u_char *bp, int len) goto trunc; } printf(", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]); - optlen = bp[i + 1] + 2; break; } } @@ -130,10 +146,20 @@ ip6_opt_print(const u_char *bp, int len) int optlen; for (i = 0; i < len; i += optlen) { + if (bp[i] == IP6OPT_PAD1) + optlen = 1; + else { + if (i + 1 < len) + optlen = bp[i + 1] + 2; + else + goto trunc; + } + if (i + optlen > len) + goto trunc; + switch (bp[i]) { case IP6OPT_PAD1: printf("(pad1)"); - optlen = 1; break; case IP6OPT_PADN: if (len - i < IP6OPT_MINLEN) { @@ -141,7 +167,6 @@ ip6_opt_print(const u_char *bp, int len) goto trunc; } printf("(padn)"); - optlen = bp[i + 1] + 2; break; case IP6OPT_ROUTER_ALERT: if (len - i < IP6OPT_RTALERT_LEN) { @@ -153,7 +178,6 @@ ip6_opt_print(const u_char *bp, int len) goto trunc; } printf("(rtalert: 0x%04x) ", ntohs(*(u_int16_t *)&bp[i + 2])); - optlen = IP6OPT_RTALERT_LEN; break; case IP6OPT_JUMBO: if (len - i < IP6OPT_JUMBO_LEN) { @@ -165,7 +189,6 @@ ip6_opt_print(const u_char *bp, int len) goto trunc; } printf("(jumbo: %u) ", (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 2])); - optlen = IP6OPT_JUMBO_LEN; break; case IP6OPT_HOME_ADDRESS: if (len - i < IP6OPT_HOMEADDR_MINLEN) { @@ -179,10 +202,9 @@ ip6_opt_print(const u_char *bp, int len) 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)); + (optlen - IP6OPT_HOMEADDR_MINLEN)); } printf(")"); - optlen = bp[i + 1] + 2; break; case IP6OPT_BINDING_UPDATE: if (len - i < IP6OPT_BU_MINLEN) { @@ -199,18 +221,15 @@ ip6_opt_print(const u_char *bp, int len) if (bp[i + 2] & 0x40) printf("H"); if (bp[i + 2] & 0x20) - printf("R"); + printf("S"); if (bp[i + 2] & 0x10) printf("D"); - if (bp[i + 2] & 0x0f) + if ((bp[i + 2] & 0x0f) || bp[i + 3] || bp[i + 4]) printf("res"); - printf(", prefixlen: %u", bp[i + 3]); - printf(", sequence: %u", - (u_int16_t)ntohs(*(u_int16_t *)&bp[i + 4])); + printf(", sequence: %u", bp[i + 5]); printf(", lifetime: %u", - (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 8])); + (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 6])); - optlen = bp[i + 1] + 2; if (bp[i + 1] > IP6OPT_BU_MINLEN - 2) { ip6_sopt_print(&bp[i + IP6OPT_BU_MINLEN], (optlen - IP6OPT_BU_MINLEN)); @@ -228,19 +247,19 @@ ip6_opt_print(const u_char *bp, int len) } printf("(ba: "); printf("status: %u", bp[i + 2]); - printf(", sequence: %u", - (u_int16_t)ntohs(*(u_int16_t *)&bp[i + 3])); + if (bp[i + 3]) + printf("res"); + printf(", sequence: %u", bp[i + 4]); printf(", lifetime: %u", - (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 7])); + (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 5])); printf(", refresh: %u", - (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 11])); + (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 9])); if (bp[i + 1] > IP6OPT_BA_MINLEN - 2) { ip6_sopt_print(&bp[i + IP6OPT_BA_MINLEN], - (optlen-IP6OPT_BA_MINLEN)); + (optlen - IP6OPT_BA_MINLEN)); } printf(")"); - optlen = bp[i + 1] + 2; break; case IP6OPT_BINDING_REQ: if (len - i < IP6OPT_BR_MINLEN) { @@ -250,10 +269,9 @@ ip6_opt_print(const u_char *bp, int len) printf("(br"); if (bp[i + 1] > IP6OPT_BR_MINLEN - 2) { ip6_sopt_print(&bp[i + IP6OPT_BR_MINLEN], - (optlen-IP6OPT_BR_MINLEN)); + (optlen - IP6OPT_BR_MINLEN)); } printf(")"); - optlen = bp[i + 1] + 2; break; default: if (len - i < IP6OPT_MINLEN) { @@ -261,7 +279,6 @@ ip6_opt_print(const u_char *bp, int len) goto trunc; } printf("(opt_type 0x%02x: len=%d) ", bp[i], bp[i + 1]); - optlen = bp[i + 1] + 2; break; } }