X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/202ad447124735307fcb08d3a724a8f6c80c3290..cfbae609a18fa6d61d09a8b263ceaf389f510e9b:/print-bootp.c diff --git a/print-bootp.c b/print-bootp.c index 62b337cb..4df86100 100644 --- a/print-bootp.c +++ b/print-bootp.c @@ -290,16 +290,16 @@ bootp_print(netdissect_options *ndo, ndo->ndo_protocol = "bootp"; bp = (const struct bootp *)cp; ND_TCHECK_1(bp->bp_op); - bp_op = EXTRACT_U_1(bp->bp_op); + bp_op = GET_U_1(bp->bp_op); ND_PRINT("BOOTP/DHCP, %s", tok2str(bootp_op_values, "unknown (0x%02x)", bp_op)); ND_TCHECK_1(bp->bp_hlen); - bp_htype = EXTRACT_U_1(bp->bp_htype); - bp_hlen = EXTRACT_U_1(bp->bp_hlen); + bp_htype = GET_U_1(bp->bp_htype); + bp_hlen = GET_U_1(bp->bp_hlen); if (bp_htype == 1 && bp_hlen == 6 && bp_op == BOOTPREQUEST) { ND_TCHECK_6(bp->bp_chaddr); - ND_PRINT(" from %s", etheraddr_string(ndo, bp->bp_chaddr)); + ND_PRINT(" from %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); } ND_PRINT(", length %u", length); @@ -318,47 +318,47 @@ bootp_print(netdissect_options *ndo, ND_PRINT(", hlen %u", bp_hlen); /* Only print interesting fields */ - if (EXTRACT_U_1(bp->bp_hops)) - ND_PRINT(", hops %u", EXTRACT_U_1(bp->bp_hops)); - if (EXTRACT_BE_U_4(bp->bp_xid)) - ND_PRINT(", xid 0x%x", EXTRACT_BE_U_4(bp->bp_xid)); - if (EXTRACT_BE_U_2(bp->bp_secs)) - ND_PRINT(", secs %u", EXTRACT_BE_U_2(bp->bp_secs)); + if (GET_U_1(bp->bp_hops)) + ND_PRINT(", hops %u", GET_U_1(bp->bp_hops)); + if (GET_BE_U_4(bp->bp_xid)) + ND_PRINT(", xid 0x%x", GET_BE_U_4(bp->bp_xid)); + if (GET_BE_U_2(bp->bp_secs)) + ND_PRINT(", secs %u", GET_BE_U_2(bp->bp_secs)); ND_TCHECK_2(bp->bp_flags); ND_PRINT(", Flags [%s]", - bittok2str(bootp_flag_values, "none", EXTRACT_BE_U_2(bp->bp_flags))); + bittok2str(bootp_flag_values, "none", GET_BE_U_2(bp->bp_flags))); if (ndo->ndo_vflag > 1) - ND_PRINT(" (0x%04x)", EXTRACT_BE_U_2(bp->bp_flags)); + ND_PRINT(" (0x%04x)", GET_BE_U_2(bp->bp_flags)); /* Client's ip address */ ND_TCHECK_4(bp->bp_ciaddr); - if (EXTRACT_IPV4_TO_NETWORK_ORDER(bp->bp_ciaddr)) - ND_PRINT("\n\t Client-IP %s", ipaddr_string(ndo, bp->bp_ciaddr)); + if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_ciaddr)) + ND_PRINT("\n\t Client-IP %s", GET_IPADDR_STRING(bp->bp_ciaddr)); /* 'your' ip address (bootp client) */ ND_TCHECK_4(bp->bp_yiaddr); - if (EXTRACT_IPV4_TO_NETWORK_ORDER(bp->bp_yiaddr)) - ND_PRINT("\n\t Your-IP %s", ipaddr_string(ndo, bp->bp_yiaddr)); + if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_yiaddr)) + ND_PRINT("\n\t Your-IP %s", GET_IPADDR_STRING(bp->bp_yiaddr)); /* Server's ip address */ ND_TCHECK_4(bp->bp_siaddr); - if (EXTRACT_IPV4_TO_NETWORK_ORDER(bp->bp_siaddr)) - ND_PRINT("\n\t Server-IP %s", ipaddr_string(ndo, bp->bp_siaddr)); + if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_siaddr)) + ND_PRINT("\n\t Server-IP %s", GET_IPADDR_STRING(bp->bp_siaddr)); /* Gateway's ip address */ ND_TCHECK_4(bp->bp_giaddr); - if (EXTRACT_IPV4_TO_NETWORK_ORDER(bp->bp_giaddr)) - ND_PRINT("\n\t Gateway-IP %s", ipaddr_string(ndo, bp->bp_giaddr)); + if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_giaddr)) + ND_PRINT("\n\t Gateway-IP %s", GET_IPADDR_STRING(bp->bp_giaddr)); /* Client's Ethernet address */ if (bp_htype == 1 && bp_hlen == 6) { ND_TCHECK_6(bp->bp_chaddr); - ND_PRINT("\n\t Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr)); + ND_PRINT("\n\t Client-Ethernet-Address %s", GET_ETHERADDR_STRING(bp->bp_chaddr)); } ND_TCHECK_1(bp->bp_sname); /* check first char only */ - if (EXTRACT_U_1(bp->bp_sname)) { + if (GET_U_1(bp->bp_sname)) { ND_PRINT("\n\t sname \""); if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname), ndo->ndo_snapend) == 0) { @@ -369,7 +369,7 @@ bootp_print(netdissect_options *ndo, ND_PRINT("\""); } ND_TCHECK_1(bp->bp_file); /* check first char only */ - if (EXTRACT_U_1(bp->bp_file)) { + if (GET_U_1(bp->bp_file)) { ND_PRINT("\n\t file \""); if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file), ndo->ndo_snapend) == 0) { @@ -391,7 +391,7 @@ bootp_print(netdissect_options *ndo, else { uint32_t ul; - ul = EXTRACT_BE_U_4(bp->bp_vend); + ul = GET_BE_U_4(bp->bp_vend); if (ul != 0) ND_PRINT("\n\t Vendor-#0x%x", ul); } @@ -408,8 +408,8 @@ trunc: * l - long (32 bits) * L - unsigned long (32 bits) * s - short (16 bits) - * b - period-seperated decimal bytes (variable length) - * x - colon-seperated hex bytes (variable length) + * b - period-separated decimal bytes (variable length) + * x - colon-separated hex bytes (variable length) * a - ASCII string (variable length) * B - on/off (8 bits) * $ - special (explicit code to handle) @@ -512,7 +512,7 @@ static const struct tok tag2str[] = { { TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" }, /* RFC 5859 - TFTP Server Address Option for DHCPv4 */ { TAG_TFTP_SERVER_ADDRESS, "iTFTP-Server-Address" }, -/* http://www.iana.org/assignments/bootp-dhcp-extensions/index.htm */ +/* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml#options */ { TAG_SLP_NAMING_AUTH, "aSLP-NA" }, { TAG_CLIENT_FQDN, "$FQDN" }, { TAG_AGENT_CIRCUIT, "$Agent-Information" }, @@ -608,12 +608,12 @@ rfc1048_print(netdissect_options *ndo, ND_PRINT("\n\t Vendor-rfc1048 Extensions"); /* Step over magic cookie */ - ND_PRINT("\n\t Magic Cookie 0x%08x", EXTRACT_BE_U_4(bp)); + ND_PRINT("\n\t Magic Cookie 0x%08x", GET_BE_U_4(bp)); bp += sizeof(int32_t); /* Loop while we there is a tag left in the buffer */ while (ND_TTEST_1(bp)) { - tag = EXTRACT_U_1(bp); + tag = GET_U_1(bp); bp++; if (tag == TAG_PAD && ndo->ndo_vflag < 3) continue; @@ -621,7 +621,7 @@ rfc1048_print(netdissect_options *ndo, return; if (tag == TAG_EXTENDED_OPTION) { ND_TCHECK_2(bp + 1); - tag = EXTRACT_BE_U_2(bp + 1); + tag = GET_BE_U_2(bp + 1); /* XXX we don't know yet if the IANA will * preclude overlap of 1-byte and 2-byte spaces. * If not, we need to offset tag after this step. @@ -636,7 +636,7 @@ rfc1048_print(netdissect_options *ndo, else { /* Get the length; check for truncation */ ND_TCHECK_1(bp); - len = EXTRACT_U_1(bp); + len = GET_U_1(bp); bp++; } @@ -646,7 +646,7 @@ rfc1048_print(netdissect_options *ndo, if (tag == TAG_PAD && ndo->ndo_vflag > 2) { u_int ntag = 1; while (ND_TTEST_1(bp) && - EXTRACT_U_1(bp) == TAG_PAD) { + GET_U_1(bp) == TAG_PAD) { bp++; ntag++; } @@ -657,7 +657,8 @@ rfc1048_print(netdissect_options *ndo, ND_TCHECK_LEN(bp, len); if (tag == TAG_DHCP_MESSAGE && len == 1) { - ND_PRINT("%s", tok2str(dhcp_msg_values, "Unknown (%u)", EXTRACT_U_1(bp))); + ND_PRINT("%s", + tok2str(dhcp_msg_values, "Unknown (%u)", GET_U_1(bp))); bp++; continue; } @@ -665,7 +666,8 @@ rfc1048_print(netdissect_options *ndo, if (tag == TAG_PARM_REQUEST) { idx = 0; while (len > 0) { - cp = tok2str(tag2str, "?Option %u", EXTRACT_U_1(bp)); + cp = tok2str(tag2str, "?Option %u", + GET_U_1(bp)); bp++; len--; if (idx % 4 == 0) @@ -681,7 +683,8 @@ rfc1048_print(netdissect_options *ndo, if (tag == TAG_EXTENDED_REQUEST) { first = 1; while (len > 1) { - cp = tok2str(xtag2str, "?xT%u", EXTRACT_BE_U_2(bp)); + cp = tok2str(xtag2str, "?xT%u", + GET_BE_U_2(bp)); bp += 2; len -= 2; if (!first) @@ -725,11 +728,11 @@ rfc1048_print(netdissect_options *ndo, if (!first) ND_PRINT(","); if (c == 'i') - ND_PRINT("%s", ipaddr_string(ndo, bp)); + ND_PRINT("%s", GET_IPADDR_STRING(bp)); else if (c == 'L') - ND_PRINT("%d", EXTRACT_BE_S_4(bp)); + ND_PRINT("%d", GET_BE_S_4(bp)); else - ND_PRINT("%u", EXTRACT_BE_U_4(bp)); + ND_PRINT("%u", GET_BE_U_4(bp)); bp += 4; len -= 4; first = 0; @@ -741,10 +744,10 @@ rfc1048_print(netdissect_options *ndo, while (len >= 2*4) { if (!first) ND_PRINT(","); - ND_PRINT("(%s:", ipaddr_string(ndo, bp)); + ND_PRINT("(%s:", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; - ND_PRINT("%s)", ipaddr_string(ndo, bp)); + ND_PRINT("%s)", GET_IPADDR_STRING(bp)); bp += 4; len -= 4; first = 0; @@ -756,7 +759,7 @@ rfc1048_print(netdissect_options *ndo, while (len >= 2) { if (!first) ND_PRINT(","); - ND_PRINT("%u", EXTRACT_BE_U_2(bp)); + ND_PRINT("%u", GET_BE_U_2(bp)); bp += 2; len -= 2; first = 0; @@ -769,7 +772,7 @@ rfc1048_print(netdissect_options *ndo, uint8_t bool_value; if (!first) ND_PRINT(","); - bool_value = EXTRACT_U_1(bp); + bool_value = GET_U_1(bp); switch (bool_value) { case 0: ND_PRINT("N"); @@ -795,7 +798,7 @@ rfc1048_print(netdissect_options *ndo, uint8_t byte_value; if (!first) ND_PRINT(c == 'x' ? ":" : "."); - byte_value = EXTRACT_U_1(bp); + byte_value = GET_U_1(bp); if (c == 'x') ND_PRINT("%02x", byte_value); else @@ -813,10 +816,10 @@ 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("[ERROR: length < 1 bytes]"); break; } - tag = EXTRACT_U_1(bp); + tag = GET_U_1(bp); ++bp; --len; ND_PRINT("%s", tok2str(nbo2str, NULL, tag)); @@ -825,10 +828,10 @@ 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("[ERROR: length < 1 bytes]"); break; } - tag = EXTRACT_U_1(bp); + tag = GET_U_1(bp); ++bp; --len; ND_PRINT("%s", tok2str(oo2str, NULL, tag)); @@ -837,16 +840,22 @@ 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("[ERROR: length < 3 bytes]"); bp += len; len = 0; break; } - if (EXTRACT_U_1(bp)) - ND_PRINT("[%s] ", client_fqdn_flags(EXTRACT_U_1(bp))); + if (GET_U_1(bp) & 0xf0) { + ND_PRINT("[ERROR: MBZ nibble 0x%x != 0] ", + (GET_U_1(bp) & 0xf0) >> 4); + } + if (GET_U_1(bp) & 0x0f) + ND_PRINT("[%s] ", + client_fqdn_flags(GET_U_1(bp))); bp++; - if (EXTRACT_U_1(bp) || EXTRACT_U_1(bp + 1)) - ND_PRINT("%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(bp + 1)); + if (GET_U_1(bp) || GET_U_1(bp + 1)) + ND_PRINT("%u/%u ", GET_U_1(bp), + GET_U_1(bp + 1)); bp += 2; ND_PRINT("\""); if (nd_printn(ndo, bp, len - 3, ndo->ndo_snapend)) { @@ -864,10 +873,10 @@ 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("[ERROR: length < 1 bytes]"); break; } - type = EXTRACT_U_1(bp); + type = GET_U_1(bp); bp++; len--; if (type == 0) { @@ -885,7 +894,7 @@ rfc1048_print(netdissect_options *ndo, while (len > 0) { if (!first) ND_PRINT(":"); - ND_PRINT("%02x", EXTRACT_U_1(bp)); + ND_PRINT("%02x", GET_U_1(bp)); ++bp; --len; first = 0; @@ -896,8 +905,8 @@ rfc1048_print(netdissect_options *ndo, case TAG_AGENT_CIRCUIT: while (len >= 2) { - subopt = EXTRACT_U_1(bp); - suboptlen = EXTRACT_U_1(bp + 1); + subopt = GET_U_1(bp); + suboptlen = GET_U_1(bp + 1); bp += 2; len -= 2; if (suboptlen > len) { @@ -938,7 +947,7 @@ 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("[ERROR: length < 5 bytes]"); bp += len; len = 0; break; @@ -946,7 +955,7 @@ rfc1048_print(netdissect_options *ndo, while (len > 0) { if (!first) ND_PRINT(","); - mask_width = EXTRACT_U_1(bp); + mask_width = GET_U_1(bp); bp++; len--; /* mask_width <= 32 */ @@ -971,14 +980,15 @@ rfc1048_print(netdissect_options *ndo, for (i = 0; i < significant_octets ; i++) { if (i > 0) ND_PRINT("."); - ND_PRINT("%u", EXTRACT_U_1(bp)); + ND_PRINT("%u", + GET_U_1(bp)); bp++; } for (i = significant_octets ; i < 4 ; i++) ND_PRINT(".0"); ND_PRINT("/%u", mask_width); } - ND_PRINT(":%s)", ipaddr_string(ndo, bp)); + ND_PRINT(":%s)", GET_IPADDR_STRING(bp)); bp += 4; len -= (significant_octets + 4); first = 0; @@ -992,25 +1002,25 @@ rfc1048_print(netdissect_options *ndo, first = 1; if (len < 2) { - ND_PRINT("ERROR: length < 2 bytes"); + ND_PRINT("[ERROR: length < 2 bytes]"); bp += len; len = 0; break; } while (len > 0) { - suboptlen = EXTRACT_U_1(bp); + 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("[ERROR: suboption length must be non-zero]"); bp += len; len = 0; break; } if (len < suboptlen) { - ND_PRINT("ERROR: invalid option"); + ND_PRINT("[ERROR: invalid option]"); bp += len; len = 0; break; @@ -1049,9 +1059,9 @@ trunc: nd_print_trunc(ndo); } -#define PRINTCMUADDR(m, s) { ND_TCHECK_4(&cmu->m); \ - if (EXTRACT_IPV4_TO_NETWORK_ORDER(cmu->m) != 0) \ - ND_PRINT(" %s:%s", s, ipaddr_string(ndo, cmu->m)); } +#define PRINTCMUADDR(m, s) { ND_TCHECK_4(cmu->m); \ + if (GET_IPV4_TO_NETWORK_ORDER(cmu->m) != 0) \ + ND_PRINT(" %s:%s", s, GET_IPADDR_STRING(cmu->m)); } static void cmu_print(netdissect_options *ndo, @@ -1065,7 +1075,7 @@ cmu_print(netdissect_options *ndo, /* Only print if there are unknown bits */ ND_TCHECK_4(cmu->v_flags); - v_flags = EXTRACT_U_1(cmu->v_flags); + v_flags = GET_U_1(cmu->v_flags); if ((v_flags & ~(VF_SMASK)) != 0) ND_PRINT(" F:0x%x", v_flags); PRINTCMUADDR(v_dgate, "DG");