* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Format and print bootp packets.
*/
-#define NETDISSECT_REWORKED
+/* \summary: BOOTP and IPv4 DHCP printer */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
#include <string.h>
-#include "interface.h"
+#include "netdissect.h"
#include "addrtoname.h"
#include "extract.h"
/* RFC 3442 */
#define TAG_CLASSLESS_STATIC_RT ((uint8_t) 121)
#define TAG_CLASSLESS_STA_RT_MS ((uint8_t) 249)
+/* RFC 5859 - TFTP Server Address Option for DHCPv4 */
+#define TAG_TFTP_SERVER_ADDRESS ((uint8_t) 150)
/* ftp://ftp.isi.edu/.../assignments/bootp-dhcp-extensions */
#define TAG_SLP_NAMING_AUTH ((uint8_t) 80)
#define TAG_CLIENT_FQDN ((uint8_t) 81)
#define TAG_CLIENT_GUID ((uint8_t) 97)
#define TAG_LDAP_URL ((uint8_t) 95)
#define TAG_6OVER4 ((uint8_t) 96)
-#define TAG_PRINTER_NAME ((uint8_t) 100)
-#define TAG_MDHCP_SERVER ((uint8_t) 101)
+/* RFC 4833, TZ codes */
+#define TAG_TZ_PCODE ((uint8_t) 100)
+#define TAG_TZ_TCODE ((uint8_t) 101)
#define TAG_IPX_COMPAT ((uint8_t) 110)
#define TAG_NETINFO_PARENT ((uint8_t) 112)
#define TAG_NETINFO_PARENT_TAG ((uint8_t) 113)
#define TAG_FAILOVER ((uint8_t) 115)
#define TAG_EXTENDED_REQUEST ((uint8_t) 126)
#define TAG_EXTENDED_OPTION ((uint8_t) 127)
+#define TAG_MUDURL ((uint8_t) 161)
/* DHCP Message types (values for TAG_DHCP_MESSAGE option) */
#define DHCPDISCOVER 1
ND_PRINT((ndo, "BOOTP/DHCP, %s",
tok2str(bootp_op_values, "unknown (0x%02x)", bp->bp_op)));
+ ND_TCHECK(bp->bp_hlen);
if (bp->bp_htype == 1 && bp->bp_hlen == 6 && bp->bp_op == BOOTPREQUEST) {
ND_TCHECK2(bp->bp_chaddr[0], 6);
ND_PRINT((ndo, " from %s", etheraddr_string(ndo, bp->bp_chaddr)));
/* Only print interesting fields */
if (bp->bp_hops)
ND_PRINT((ndo, ", hops %d", bp->bp_hops));
- if (EXTRACT_32BITS(&bp->bp_xid))
- ND_PRINT((ndo, ", xid 0x%x", EXTRACT_32BITS(&bp->bp_xid)));
- if (EXTRACT_16BITS(&bp->bp_secs))
- ND_PRINT((ndo, ", secs %d", EXTRACT_16BITS(&bp->bp_secs)));
+ if (EXTRACT_BE_U_4(&bp->bp_xid))
+ ND_PRINT((ndo, ", xid 0x%x", EXTRACT_BE_U_4(&bp->bp_xid)));
+ if (EXTRACT_BE_U_2(&bp->bp_secs))
+ ND_PRINT((ndo, ", secs %d", EXTRACT_BE_U_2(&bp->bp_secs)));
+ ND_TCHECK(bp->bp_flags);
ND_PRINT((ndo, ", Flags [%s]",
- bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags))));
+ bittok2str(bootp_flag_values, "none", EXTRACT_BE_U_2(&bp->bp_flags))));
if (ndo->ndo_vflag > 1)
- ND_PRINT((ndo, " (0x%04x)", EXTRACT_16BITS(&bp->bp_flags)));
+ ND_PRINT((ndo, " (0x%04x)", EXTRACT_BE_U_2(&bp->bp_flags)));
/* Client's ip address */
ND_TCHECK(bp->bp_ciaddr);
- if (EXTRACT_32BITS(&bp->bp_ciaddr.s_addr))
+ if (EXTRACT_BE_U_4(&bp->bp_ciaddr.s_addr))
ND_PRINT((ndo, "\n\t Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr)));
/* 'your' ip address (bootp client) */
ND_TCHECK(bp->bp_yiaddr);
- if (EXTRACT_32BITS(&bp->bp_yiaddr.s_addr))
+ if (EXTRACT_BE_U_4(&bp->bp_yiaddr.s_addr))
ND_PRINT((ndo, "\n\t Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr)));
/* Server's ip address */
ND_TCHECK(bp->bp_siaddr);
- if (EXTRACT_32BITS(&bp->bp_siaddr.s_addr))
+ if (EXTRACT_BE_U_4(&bp->bp_siaddr.s_addr))
ND_PRINT((ndo, "\n\t Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr)));
/* Gateway's ip address */
ND_TCHECK(bp->bp_giaddr);
- if (EXTRACT_32BITS(&bp->bp_giaddr.s_addr))
+ if (EXTRACT_BE_U_4(&bp->bp_giaddr.s_addr))
ND_PRINT((ndo, "\n\t Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr)));
/* Client's Ethernet address */
ND_PRINT((ndo, "\n\t Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr)));
}
- ND_TCHECK2(bp->bp_sname[0], 1); /* check first char only */
- if (*bp->bp_sname) {
+ ND_TCHECK_1(bp->bp_sname); /* check first char only */
+ if (EXTRACT_U_1(bp->bp_sname)) {
ND_PRINT((ndo, "\n\t sname \""));
- if (fn_print(ndo, bp->bp_sname, ndo->ndo_snapend)) {
+ if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof bp->bp_sname,
+ ndo->ndo_snapend)) {
ND_PRINT((ndo, "\""));
ND_PRINT((ndo, "%s", tstr + 1));
return;
}
ND_PRINT((ndo, "\""));
}
- ND_TCHECK2(bp->bp_file[0], 1); /* check first char only */
- if (*bp->bp_file) {
+ ND_TCHECK_1(bp->bp_file); /* check first char only */
+ if (EXTRACT_U_1(bp->bp_file)) {
ND_PRINT((ndo, "\n\t file \""));
- if (fn_print(ndo, bp->bp_file, ndo->ndo_snapend)) {
+ if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof bp->bp_file,
+ ndo->ndo_snapend)) {
ND_PRINT((ndo, "\""));
ND_PRINT((ndo, "%s", tstr + 1));
return;
else {
uint32_t ul;
- ul = EXTRACT_32BITS(&bp->bp_vend);
+ ul = EXTRACT_BE_U_4(&bp->bp_vend);
if (ul != 0)
ND_PRINT((ndo, "\n\t Vendor-#0x%x", ul));
}
* s - short (16 bits)
* b - period-seperated decimal bytes (variable length)
* x - colon-seperated hex bytes (variable length)
- * a - ascii string (variable length)
+ * a - ASCII string (variable length)
* B - on/off (8 bits)
* $ - special (explicit code to handle)
*/
{ TAG_LPR_SERVER, "iLPR-Server" }, /* lpr server (RFC1179) */
{ TAG_IMPRESS_SERVER, "iIM" }, /* impress servers (Imagen) */
{ TAG_RLP_SERVER, "iRL" }, /* resource location (RFC887) */
- { TAG_HOSTNAME, "aHostname" }, /* ascii hostname */
+ { TAG_HOSTNAME, "aHostname" }, /* ASCII hostname */
{ TAG_BOOTSIZE, "sBS" }, /* 512 byte blocks */
{ TAG_END, " END" },
/* RFC1497 tags */
/* RFC 3442 */
{ TAG_CLASSLESS_STATIC_RT, "$Classless-Static-Route" },
{ 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 */
{ TAG_SLP_NAMING_AUTH, "aSLP-NA" },
{ TAG_CLIENT_FQDN, "$FQDN" },
{ TAG_CLIENT_GUID, "bGUID" }, /* XXX 'b' */
{ TAG_LDAP_URL, "aLDAP" },
{ TAG_6OVER4, "i6o4" },
- { TAG_PRINTER_NAME, "aPRTR" },
- { TAG_MDHCP_SERVER, "bMDHCP" }, /* XXX 'b' */
+ { TAG_TZ_PCODE, "aPOSIX-TZ" },
+ { TAG_TZ_TCODE, "aTZ-Name" },
{ TAG_IPX_COMPAT, "bIPX" }, /* XXX 'b' */
{ TAG_NETINFO_PARENT, "iNI" },
{ TAG_NETINFO_PARENT_TAG, "aNITAG" },
{ TAG_URL, "aURL" },
{ TAG_FAILOVER, "bFAIL" }, /* XXX 'b' */
+ { TAG_MUDURL, "aMUD-URL" },
{ 0, NULL }
};
/* 2-byte extended tags */
ND_PRINT((ndo, "\n\t Vendor-rfc1048 Extensions"));
/* Step over magic cookie */
- ND_PRINT((ndo, "\n\t Magic Cookie 0x%08x", EXTRACT_32BITS(bp)));
+ ND_PRINT((ndo, "\n\t Magic Cookie 0x%08x", EXTRACT_BE_U_4(bp)));
bp += sizeof(int32_t);
/* Loop while we there is a tag left in the buffer */
- while (ND_TTEST2(*bp, 1)) {
- tag = *bp++;
+ while (ND_TTEST_1(bp)) {
+ tag = EXTRACT_U_1(bp);
+ bp++;
if (tag == TAG_PAD && ndo->ndo_vflag < 3)
continue;
if (tag == TAG_END && ndo->ndo_vflag < 3)
return;
if (tag == TAG_EXTENDED_OPTION) {
- ND_TCHECK2(*(bp + 1), 2);
- tag = EXTRACT_16BITS(bp + 1);
+ ND_TCHECK_2(bp + 1);
+ tag = EXTRACT_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.
len = 0;
else {
/* Get the length; check for truncation */
- ND_TCHECK2(*bp, 1);
- len = *bp++;
+ ND_TCHECK_1(bp);
+ len = EXTRACT_U_1(bp);
+ bp++;
}
ND_PRINT((ndo, "\n\t %s Option %u, length %u%s", cp, tag, len,
if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
u_int ntag = 1;
- while (ND_TTEST2(*bp, 1) && *bp == TAG_PAD) {
+ while (ND_TTEST_1(bp) &&
+ EXTRACT_U_1(bp) == TAG_PAD) {
bp++;
ntag++;
}
}
if (tag == TAG_DHCP_MESSAGE && len == 1) {
- uc = *bp++;
+ uc = EXTRACT_U_1(bp);
+ bp++;
ND_PRINT((ndo, "%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc)));
continue;
}
if (tag == TAG_PARM_REQUEST) {
idx = 0;
while (len-- > 0) {
- uc = *bp++;
+ uc = EXTRACT_U_1(bp);
+ bp++;
cp = tok2str(tag2str, "?Option %u", uc);
if (idx % 4 == 0)
ND_PRINT((ndo, "\n\t "));
first = 1;
while (len > 1) {
len -= 2;
- us = EXTRACT_16BITS(bp);
+ us = EXTRACT_BE_U_2(bp);
bp += 2;
cp = tok2str(xtag2str, "?xT%u", us);
if (!first)
switch (c) {
case 'a':
- /* ascii strings */
+ /* ASCII strings */
ND_PRINT((ndo, "\""));
if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
ND_PRINT((ndo, "\""));
while (len >= sizeof(ul)) {
if (!first)
ND_PRINT((ndo, ","));
- ul = EXTRACT_32BITS(bp);
+ ul = EXTRACT_BE_U_4(bp);
if (c == 'i') {
ul = htonl(ul);
ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ul)));
while (len >= sizeof(us)) {
if (!first)
ND_PRINT((ndo, ","));
- us = EXTRACT_16BITS(bp);
+ us = EXTRACT_BE_U_2(bp);
ND_PRINT((ndo, "%u", us));
bp += sizeof(us);
len -= sizeof(us);
case 'B':
/* boolean */
while (len > 0) {
+ uint8_t bool_value;
if (!first)
ND_PRINT((ndo, ","));
- switch (*bp) {
+ bool_value = EXTRACT_U_1(bp);
+ switch (bool_value) {
case 0:
ND_PRINT((ndo, "N"));
break;
ND_PRINT((ndo, "Y"));
break;
default:
- ND_PRINT((ndo, "%u?", *bp));
+ ND_PRINT((ndo, "%u?", bool_value));
break;
}
++bp;
default:
/* Bytes */
while (len > 0) {
+ uint8_t byte_value;
if (!first)
ND_PRINT((ndo, c == 'x' ? ":" : "."));
+ byte_value = EXTRACT_U_1(bp);
if (c == 'x')
- ND_PRINT((ndo, "%02x", *bp));
+ ND_PRINT((ndo, "%02x", byte_value));
else
- ND_PRINT((ndo, "%u", *bp));
+ ND_PRINT((ndo, "%u", byte_value));
++bp;
--len;
first = 0;
ND_PRINT((ndo, "ERROR: length < 1 bytes"));
break;
}
- tag = *bp++;
+ tag = EXTRACT_U_1(bp);
+ ++bp;
--len;
ND_PRINT((ndo, "%s", tok2str(nbo2str, NULL, tag)));
break;
ND_PRINT((ndo, "ERROR: length < 1 bytes"));
break;
}
- tag = *bp++;
+ tag = EXTRACT_U_1(bp);
+ ++bp;
--len;
ND_PRINT((ndo, "%s", tok2str(oo2str, NULL, tag)));
break;
len = 0;
break;
}
- if (*bp)
- ND_PRINT((ndo, "[%s] ", client_fqdn_flags(*bp)));
+ if (EXTRACT_U_1(bp))
+ ND_PRINT((ndo, "[%s] ", client_fqdn_flags(EXTRACT_U_1(bp))));
bp++;
- if (*bp || *(bp+1))
- ND_PRINT((ndo, "%u/%u ", *bp, *(bp+1)));
+ if (EXTRACT_U_1(bp) || EXTRACT_U_1(bp + 1))
+ ND_PRINT((ndo, "%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(bp + 1)));
bp += 2;
ND_PRINT((ndo, "\""));
if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
case TAG_CLIENT_ID:
{
- int type;
+ int type;
/* this option should be at least 1 byte long */
if (len < 1) {
ND_PRINT((ndo, "ERROR: length < 1 bytes"));
break;
}
- type = *bp++;
+ type = EXTRACT_U_1(bp);
+ bp++;
len--;
if (type == 0) {
ND_PRINT((ndo, "\""));
while (len > 0) {
if (!first)
ND_PRINT((ndo, ":"));
- ND_PRINT((ndo, "%02x", *bp));
+ ND_PRINT((ndo, "%02x", EXTRACT_U_1(bp)));
++bp;
--len;
first = 0;
case TAG_AGENT_CIRCUIT:
while (len >= 2) {
- subopt = *bp++;
- suboptlen = *bp++;
+ subopt = EXTRACT_U_1(bp);
+ suboptlen = EXTRACT_U_1(bp + 1);
+ bp += 2;
len -= 2;
if (suboptlen > len) {
ND_PRINT((ndo, "\n\t %s SubOption %u, length %u: length goes past end of option",
case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
case AGENT_SUBOPTION_REMOTE_ID:
case AGENT_SUBOPTION_SUBSCRIBER_ID:
- fn_printn(ndo, bp, suboptlen, NULL);
+ if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
+ goto trunc;
break;
default:
while (len > 0) {
if (!first)
ND_PRINT((ndo, ","));
- mask_width = *bp++;
+ mask_width = EXTRACT_U_1(bp);
+ bp++;
len--;
/* mask_width <= 32 */
if (mask_width > 32) {
for (i = 0; i < significant_octets ; i++) {
if (i > 0)
ND_PRINT((ndo, "."));
- ND_PRINT((ndo, "%d", *bp++));
+ ND_PRINT((ndo, "%d", EXTRACT_U_1(bp)));
+ bp++;
}
for (i = significant_octets ; i < 4 ; i++)
ND_PRINT((ndo, ".0"));
break;
}
while (len > 0) {
- suboptlen = *bp++;
+ suboptlen = EXTRACT_U_1(bp);
+ bp++;
len--;
ND_PRINT((ndo, "\n\t "));
ND_PRINT((ndo, "instance#%u: ", suboptnumber));
break;
}
if (len < suboptlen) {
- ND_PRINT((ndo, "ERROR: malformed option"));
+ ND_PRINT((ndo, "ERROR: invalid option"));
bp += len;
len = 0;
break;
projects / tcpdump / blobdiff