X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9c37f53ddedfd335c5b16b240ec5730dff522c7b..2db7c32de1a1c3e7f940e8275a285bbf44c658ad:/print-bootp.c diff --git a/print-bootp.c b/print-bootp.c index 227ed410..0e47ef50 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -21,9 +21,7 @@ /* \summary: BOOTP and IPv4 DHCP printer */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" @@ -148,7 +146,7 @@ struct bootp { #define TAG_NIS_P_DOMAIN ((uint8_t) 64) #define TAG_NIS_P_SERVERS ((uint8_t) 65) #define TAG_MOBILE_HOME ((uint8_t) 68) -#define TAG_SMPT_SERVER ((uint8_t) 69) +#define TAG_SMTP_SERVER ((uint8_t) 69) #define TAG_POP3_SERVER ((uint8_t) 70) #define TAG_NNTP_SERVER ((uint8_t) 71) #define TAG_WWW_SERVER ((uint8_t) 72) @@ -181,10 +179,12 @@ struct bootp { /* RFC 2485 */ #define TAG_OPEN_GROUP_UAP ((uint8_t) 98) /* RFC 2563 */ -#define TAG_DISABLE_AUTOCONF ((uint8_t) 116) +#define TAG_AUTO_CONFIGURE ((uint8_t) 116) /* RFC 2610 */ #define TAG_SLP_DA ((uint8_t) 78) #define TAG_SLP_SCOPE ((uint8_t) 79) +/* RFC 8925 */ +#define TAG_IPV6_ONLY_PREFERRED ((uint8_t) 108) /* RFC 2937 */ #define TAG_NS_SEARCH ((uint8_t) 117) /* RFC 3004 - The User Class Option for DHCP */ @@ -305,8 +305,8 @@ bootp_print(netdissect_options *ndo, bp_htype = GET_U_1(bp->bp_htype); bp_hlen = GET_U_1(bp->bp_hlen); - if (bp_htype == 1 && bp_hlen == MAC_ADDR_LEN && bp_op == BOOTPREQUEST) { - ND_PRINT(" from %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); + if (bp_htype == 1 && bp_hlen == MAC48_LEN && bp_op == BOOTPREQUEST) { + ND_PRINT(" from %s", GET_MAC48_STRING(bp->bp_chaddr)); } ND_PRINT(", length %u", length); @@ -321,7 +321,7 @@ bootp_print(netdissect_options *ndo, ND_PRINT(", htype %u", bp_htype); /* The usual length for 10Mb Ethernet address is 6 bytes */ - if (bp_htype != 1 || bp_hlen != MAC_ADDR_LEN) + if (bp_htype != 1 || bp_hlen != MAC48_LEN) ND_PRINT(", hlen %u", bp_hlen); /* Only print interesting fields */ @@ -354,8 +354,8 @@ bootp_print(netdissect_options *ndo, ND_PRINT("\n\t Gateway-IP %s", GET_IPADDR_STRING(bp->bp_giaddr)); /* Client's Ethernet address */ - if (bp_htype == 1 && bp_hlen == MAC_ADDR_LEN) { - ND_PRINT("\n\t Client-Ethernet-Address %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); + if (bp_htype == 1 && bp_hlen == MAC48_LEN) { + ND_PRINT("\n\t Client-Ethernet-Address %s", GET_MAC48_STRING(bp->bp_chaddr)); } if (GET_U_1(bp->bp_sname)) { /* get first char only */ @@ -403,9 +403,9 @@ invalid: * The first character specifies the format to print: * i - ip address (32 bits) * p - ip address pairs (32 bits + 32 bits) - * l - long (32 bits) - * L - unsigned long (32 bits) - * s - short (16 bits) + * l - unsigned longs (32 bits) + * L - longs (32 bits) + * s - unsigned shorts (16 bits) * b - period-separated decimal bytes (variable length) * x - colon-separated hex bytes (variable length) * a - ASCII string (variable length) @@ -470,7 +470,7 @@ static const struct tok tag2str[] = { { TAG_NIS_P_DOMAIN, "sN+D" }, { TAG_NIS_P_SERVERS, "iN+S" }, { TAG_MOBILE_HOME, "iMH" }, - { TAG_SMPT_SERVER, "iSMTP" }, + { TAG_SMTP_SERVER, "iSMTP" }, { TAG_POP3_SERVER, "iPOP3" }, { TAG_NNTP_SERVER, "iNNTP" }, { TAG_WWW_SERVER, "iWWW" }, @@ -495,7 +495,7 @@ static const struct tok tag2str[] = { /* RFC 2485 */ { TAG_OPEN_GROUP_UAP, "aUAP" }, /* RFC 2563 */ - { TAG_DISABLE_AUTOCONF, "BNOAUTO" }, + { TAG_AUTO_CONFIGURE, "BAuto-Configure" }, /* RFC 2610 */ { TAG_SLP_DA, "bSLP-DA" }, /*"b" is a little wrong */ { TAG_SLP_SCOPE, "bSLP-SCOPE" }, /*"b" is a little wrong */ @@ -520,7 +520,7 @@ static const struct tok tag2str[] = { { TAG_TZ_STRING, "aTZSTR" }, { TAG_FQDN_OPTION, "bFQDNS" }, /* XXX 'b' */ { TAG_AUTH, "bAUTH" }, /* XXX 'b' */ - { TAG_CLIENT_LAST_TRANSACTION_TIME, "LLast-Transaction-Time" }, + { TAG_CLIENT_LAST_TRANSACTION_TIME, "lLast-Transaction-Time" }, { TAG_ASSOCIATED_IP, "iAssociated-IP" }, { TAG_CLIENT_ARCH, "sARCH" }, { TAG_CLIENT_NDI, "bNDI" }, /* XXX 'b' */ @@ -532,6 +532,7 @@ static const struct tok tag2str[] = { { TAG_NETINFO_PARENT_TAG, "aNITAG" }, { TAG_URL, "aURL" }, { TAG_MUDURL, "aMUD-URL" }, + { TAG_IPV6_ONLY_PREFERRED, "$IPv6-Only-Preferred" }, { 0, NULL } }; @@ -651,7 +652,7 @@ rfc1048_print(netdissect_options *ndo, if (tag == TAG_PARM_REQUEST) { idx = 0; - while (len > 0) { + while (len != 0) { uint8_t innertag = GET_U_1(bp); bp++; len--; @@ -709,6 +710,14 @@ rfc1048_print(netdissect_options *ndo, case 'p': /* IP address pairs */ + /* this option should be N x 8 bytes long */ + if (len < 8 || len % 8 != 0) { + ND_PRINT("%s[length != N x 8 bytes]", + len == 0 ? " " : ""); + bp += len; + len = 0; + break; + } while (len >= 2*4) { if (!first) ND_PRINT(","); @@ -723,7 +732,7 @@ rfc1048_print(netdissect_options *ndo, break; case 's': - /* shorts */ + /* unsigned shorts */ while (len >= 2) { if (!first) ND_PRINT(","); @@ -736,33 +745,39 @@ rfc1048_print(netdissect_options *ndo, case 'B': /* boolean */ - while (len > 0) { - uint8_t bool_value; - if (!first) - ND_PRINT(","); - bool_value = GET_U_1(bp); - switch (bool_value) { - case 0: - ND_PRINT("N"); - break; - case 1: - ND_PRINT("Y"); - break; - default: - ND_PRINT("%u?", bool_value); - break; - } - ++bp; - --len; - first = 0; + { + /* this option should be 1 byte long */ + if (len != 1) { + ND_PRINT("[length != 1 byte]"); + nd_print_invalid(ndo); + bp += len; + len = 0; + break; + } + + uint8_t bool_value; + bool_value = GET_U_1(bp); + switch (bool_value) { + case 0: + ND_PRINT("N"); + break; + case 1: + ND_PRINT("Y"); + break; + default: + ND_PRINT("%u?", bool_value); + break; } + ++bp; + --len; break; + } case 'b': case 'x': default: /* Bytes */ - while (len > 0) { + while (len != 0) { uint8_t byte_value; if (!first) ND_PRINT(c == 'x' ? ":" : "."); @@ -784,7 +799,8 @@ rfc1048_print(netdissect_options *ndo, case TAG_NETBIOS_NODE: /* this option should be at least 1 byte long */ if (len < 1) { - ND_PRINT("[ERROR: length < 1 bytes]"); + ND_PRINT("[length < 1 byte]"); + nd_print_invalid(ndo); break; } tag = GET_U_1(bp); @@ -796,7 +812,8 @@ rfc1048_print(netdissect_options *ndo, case TAG_OPT_OVERLOAD: /* this option should be at least 1 byte long */ if (len < 1) { - ND_PRINT("[ERROR: length < 1 bytes]"); + ND_PRINT("[length < 1 byte]"); + nd_print_invalid(ndo); break; } tag = GET_U_1(bp); @@ -808,14 +825,16 @@ rfc1048_print(netdissect_options *ndo, case TAG_CLIENT_FQDN: /* this option should be at least 3 bytes long */ if (len < 3) { - ND_PRINT("[ERROR: length < 3 bytes]"); + ND_PRINT("[length < 3 bytes]"); + nd_print_invalid(ndo); bp += len; len = 0; break; } if (GET_U_1(bp) & 0xf0) { - ND_PRINT("[ERROR: MBZ nibble 0x%x != 0] ", + ND_PRINT("[MBZ nibble 0x%x != 0] ", (GET_U_1(bp) & 0xf0) >> 4); + nd_print_invalid(ndo); } if (GET_U_1(bp) & 0x0f) ND_PRINT("[%s] ", @@ -838,7 +857,8 @@ rfc1048_print(netdissect_options *ndo, /* this option should be at least 1 byte long */ if (len < 1) { - ND_PRINT("[ERROR: length < 1 bytes]"); + ND_PRINT("[length < 1 byte]"); + nd_print_invalid(ndo); break; } type = GET_U_1(bp); @@ -853,7 +873,7 @@ rfc1048_print(netdissect_options *ndo, break; } else { ND_PRINT("%s ", tok2str(arp2str, "hardware-type %u,", type)); - while (len > 0) { + while (len != 0) { if (!first) ND_PRINT(":"); ND_PRINT("%02x", GET_U_1(bp)); @@ -908,12 +928,13 @@ rfc1048_print(netdissect_options *ndo, /* this option should be at least 5 bytes long */ if (len < 5) { - ND_PRINT("[ERROR: length < 5 bytes]"); + ND_PRINT("[length < 5 bytes]"); + nd_print_invalid(ndo); bp += len; len = 0; break; } - while (len > 0) { + while (len != 0) { if (!first) ND_PRINT(","); mask_width = GET_U_1(bp); @@ -921,7 +942,8 @@ rfc1048_print(netdissect_options *ndo, len--; /* mask_width <= 32 */ if (mask_width > 32) { - ND_PRINT("[ERROR: Mask width (%u) > 32]", mask_width); + ND_PRINT("[Mask width (%u) > 32]", mask_width); + nd_print_invalid(ndo); bp += len; len = 0; break; @@ -929,7 +951,8 @@ rfc1048_print(netdissect_options *ndo, significant_octets = (mask_width + 7) / 8; /* significant octets + router(4) */ if (len < significant_octets + 4) { - ND_PRINT("[ERROR: Remaining length (%u) < %u bytes]", len, significant_octets + 4); + ND_PRINT("[Remaining length (%u) < %u bytes]", len, significant_octets + 4); + nd_print_invalid(ndo); bp += len; len = 0; break; @@ -963,25 +986,29 @@ rfc1048_print(netdissect_options *ndo, first = 1; if (len < 2) { - ND_PRINT("[ERROR: length < 2 bytes]"); + ND_PRINT("[length < 2 bytes]"); + nd_print_invalid(ndo); bp += len; len = 0; break; } - while (len > 0) { + while (len != 0) { suboptlen = GET_U_1(bp); bp++; len--; ND_PRINT("\n\t "); ND_PRINT("instance#%u: ", suboptnumber); if (suboptlen == 0) { - ND_PRINT("[ERROR: suboption length must be non-zero]"); + ND_PRINT("[suboption length == 0]"); + nd_print_invalid(ndo); bp += len; len = 0; break; } if (len < suboptlen) { - ND_PRINT("[ERROR: invalid option]"); + ND_PRINT("[length %u < suboption length %u", + len, suboptlen); + nd_print_invalid(ndo); bp += len; len = 0; break; @@ -1008,26 +1035,42 @@ rfc1048_print(netdissect_options *ndo, * URI: URI of the SZTP bootstrap server. */ while (len >= 2) { - suboptlen = GET_BE_U_2(bp); + uint16_t suboptlen2; + + suboptlen2 = GET_BE_U_2(bp); bp += 2; len -= 2; ND_PRINT("\n\t "); - ND_PRINT("length %u: ", suboptlen); - if (len < suboptlen) { + ND_PRINT("length %u: ", suboptlen2); + if (len < suboptlen2) { ND_PRINT("length goes past end of option"); bp += len; len = 0; break; } ND_PRINT("\""); - nd_printjn(ndo, bp, suboptlen); + nd_printjn(ndo, bp, suboptlen2); ND_PRINT("\""); - len -= suboptlen; - bp += suboptlen; + len -= suboptlen2; + bp += suboptlen2; } if (len != 0) { - ND_PRINT("[ERROR: length < 2 bytes]"); + ND_PRINT("[length < 2 bytes]"); + nd_print_invalid(ndo); + } + break; + + case TAG_IPV6_ONLY_PREFERRED: + /* this option should be 4 bytes long */ + if (len != 4) { + ND_PRINT("[length != 4 bytes]"); + nd_print_invalid(ndo); + bp += len; + len = 0; } + ND_PRINT("%u", GET_BE_U_4(bp)); + bp += 4; + len -= 4; break; default: