* SUCH DAMAGE.
*/
-#define NETDISSECT_REWORKED
+/* \summary: IPv6 header option printer */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#ifdef INET6
-#include <tcpdump-stdinc.h>
-
-#include "ip6.h"
+#include "netdissect-stdinc.h"
-#include "interface.h"
+#include "netdissect.h"
#include "addrtoname.h"
#include "extract.h"
-static void
+#include "ip6.h"
+
+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:
- ND_PRINT((ndo, ", pad1"));
+ ND_PRINT(", pad1");
break;
case IP6OPT_PADN:
if (len - i < IP6OPT_MINLEN) {
- ND_PRINT((ndo, ", padn: trunc"));
+ ND_PRINT(", padn: trunc");
goto trunc;
}
- ND_PRINT((ndo, ", padn"));
+ ND_PRINT(", padn");
break;
default:
if (len - i < IP6OPT_MINLEN) {
- ND_PRINT((ndo, ", sopt_type %d: trunc)", bp[i]));
+ ND_PRINT(", sopt_type %u: trunc)", GET_U_1(bp + i));
goto trunc;
}
- ND_PRINT((ndo, ", 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:
- ND_PRINT((ndo, "[trunc] "));
+ return -1;
}
-static void
+static int
ip6_opt_print(netdissect_options *ndo, const u_char *bp, int len)
{
int i;
int optlen = 0;
if (len == 0)
- return;
+ 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:
- ND_PRINT((ndo, "(pad1)"));
+ ND_PRINT("(pad1)");
break;
case IP6OPT_PADN:
if (len - i < IP6OPT_MINLEN) {
- ND_PRINT((ndo, "(padn: trunc)"));
+ ND_PRINT("(padn: trunc)");
goto trunc;
}
- ND_PRINT((ndo, "(padn)"));
+ ND_PRINT("(padn)");
break;
case IP6OPT_ROUTER_ALERT:
if (len - i < IP6OPT_RTALERT_LEN) {
- ND_PRINT((ndo, "(rtalert: trunc)"));
+ ND_PRINT("(rtalert: trunc)");
goto trunc;
}
- if (bp[i + 1] != IP6OPT_RTALERT_LEN - 2) {
- ND_PRINT((ndo, "(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;
}
- ND_PRINT((ndo, "(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) {
- ND_PRINT((ndo, "(jumbo: trunc)"));
+ ND_PRINT("(jumbo: trunc)");
goto trunc;
}
- if (bp[i + 1] != IP6OPT_JUMBO_LEN - 2) {
- ND_PRINT((ndo, "(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;
}
- ND_PRINT((ndo, "(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) {
- ND_PRINT((ndo, "(homeaddr: trunc)"));
+ ND_PRINT("(homeaddr: trunc)");
goto trunc;
}
- if (bp[i + 1] < IP6OPT_HOMEADDR_MINLEN - 2) {
- ND_PRINT((ndo, "(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;
}
- ND_PRINT((ndo, "(homeaddr: %s", ip6addr_string(ndo, &bp[i + 2])));
- if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) {
- ip6_sopt_print(ndo, &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;
}
- ND_PRINT((ndo, ")"));
+ ND_PRINT(")");
break;
default:
if (len - i < IP6OPT_MINLEN) {
- ND_PRINT((ndo, "(type %d: trunc)", bp[i]));
+ ND_PRINT("(type %u: trunc)", GET_U_1(bp + i));
goto trunc;
}
- ND_PRINT((ndo, "(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;
}
}
- ND_PRINT((ndo, " "));
- return;
+ ND_PRINT(" ");
+ return 0;
trunc:
- ND_PRINT((ndo, "[trunc] "));
+ return -1;
}
int
-hbhopt_print(netdissect_options *ndo, register const u_char *bp)
+hbhopt_print(netdissect_options *ndo, const u_char *bp)
{
- const struct ip6_hbh *dp = (struct ip6_hbh *)bp;
- int hbhlen = 0;
-
- ND_TCHECK(dp->ip6h_len);
- hbhlen = (int)((dp->ip6h_len + 1) << 3);
- ND_TCHECK2(*dp, hbhlen);
- ND_PRINT((ndo, "HBH "));
+ 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)
- ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp));
-
- return(hbhlen);
+ if (ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp),
+ hbhlen - sizeof(*dp)) == -1)
+ goto trunc;
+ return hbhlen;
- trunc:
- ND_PRINT((ndo, "[|HBH]"));
- return(-1);
+trunc:
+ nd_print_trunc(ndo);
+ return -1;
}
int
-dstopt_print(netdissect_options *ndo, register const u_char *bp)
+dstopt_print(netdissect_options *ndo, const u_char *bp)
{
- const struct ip6_dest *dp = (struct ip6_dest *)bp;
- int dstoptlen = 0;
-
- ND_TCHECK(dp->ip6d_len);
- dstoptlen = (int)((dp->ip6d_len + 1) << 3);
- ND_TCHECK2(*dp, dstoptlen);
- ND_PRINT((ndo, "DSTOPT "));
+ 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) {
- ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp),
- dstoptlen - sizeof(*dp));
+ if (ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp),
+ dstoptlen - sizeof(*dp)) == -1)
+ goto trunc;
}
- return(dstoptlen);
+ return dstoptlen;
- trunc:
- ND_PRINT((ndo, "[|DSTOPT]"));
- return(-1);
+trunc:
+ nd_print_trunc(ndo);
+ return -1;
}
-#endif /* INET6 */
projects / tcpdump / blobdiff