/*
* Copyright (C) 1998 WIDE Project.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 3. Neither the name of the project nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
#endif
#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.8 2000-12-13 07:57:05 itojun Exp $";
+static const char rcsid[] _U_ =
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.17.2.1 2005-04-20 22:19:06 guy Exp $";
#endif
#ifdef INET6
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <tcpdump-stdinc.h>
-#include <netinet/in.h>
#include <stdio.h>
#include "ip6.h"
#include "interface.h"
#include "addrtoname.h"
+#include "extract.h"
/* items outside of rfc2292bis */
#ifndef IP6OPT_MINLEN
#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);
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) {
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 ", EXTRACT_16BITS(&bp[i + 2]));
break;
case IP6SOPT_ALTCOA:
if (len - i < IP6SOPT_ALTCOA_MINLEN) {
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", EXTRACT_32BITS(&bp[i + 2]));
break;
default:
if (len - i < IP6OPT_MINLEN) {
goto trunc;
}
printf(", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]);
- optlen = bp[i + 1] + 2;
break;
}
}
ip6_opt_print(const u_char *bp, int len)
{
int i;
- int optlen;
+ int optlen = 0;
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) {
goto trunc;
}
printf("(padn)");
- optlen = bp[i + 1] + 2;
break;
case IP6OPT_ROUTER_ALERT:
if (len - i < IP6OPT_RTALERT_LEN) {
printf("(rtalert: invalid len %d)", bp[i + 1]);
goto trunc;
}
- printf("(rtalert: 0x%04x) ", ntohs(*(u_int16_t *)&bp[i + 2]));
- optlen = IP6OPT_RTALERT_LEN;
+ printf("(rtalert: 0x%04x) ", EXTRACT_16BITS(&bp[i + 2]));
break;
case IP6OPT_JUMBO:
if (len - i < IP6OPT_JUMBO_LEN) {
printf("(jumbo: invalid len %d)", bp[i + 1]);
goto trunc;
}
- printf("(jumbo: %u) ", (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 2]));
- optlen = IP6OPT_JUMBO_LEN;
+ printf("(jumbo: %u) ", EXTRACT_32BITS(&bp[i + 2]));
break;
case IP6OPT_HOME_ADDRESS:
if (len - i < IP6OPT_HOMEADDR_MINLEN) {
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) {
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(", lifetime: %u",
- (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 8]));
+ printf(", sequence: %u", bp[i + 5]);
+ printf(", lifetime: %u", EXTRACT_32BITS(&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));
}
printf("(ba: ");
printf("status: %u", bp[i + 2]);
- printf(", sequence: %u",
- (u_int16_t)ntohs(*(u_int16_t *)&bp[i + 3]));
- printf(", lifetime: %u",
- (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 7]));
- printf(", refresh: %u",
- (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 11]));
+ 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));
+ (optlen - IP6OPT_BA_MINLEN));
}
printf(")");
- optlen = bp[i + 1] + 2;
break;
case IP6OPT_BINDING_REQ:
if (len - i < IP6OPT_BR_MINLEN) {
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) {
goto trunc;
}
printf("(opt_type 0x%02x: len=%d) ", bp[i], bp[i + 1]);
- optlen = bp[i + 1] + 2;
break;
}
}
hbhopt_print(register 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);
trunc:
fputs("[|HBH]", stdout);
- return(hbhlen);
+ return(-1);
}
int
dstopt_print(register 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);
trunc:
fputs("[|DSTOPT]", stdout);
- return(dstoptlen);
+ return(-1);
}
#endif /* INET6 */
projects / tcpdump / blobdiff