/* \summary: BOOTP and IPv4 DHCP printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <string.h>
#include "addrtoname.h"
#include "extract.h"
-static const char tstr[] = " [|bootp]";
/*
* Bootstrap Protocol (BOOTP). RFC951 and RFC1048.
nd_uint16_t bp_secs; /* seconds since boot began */
nd_uint16_t bp_flags; /* flags - see bootp_flag_values[]
in print-bootp.c */
- struct in_addr bp_ciaddr; /* client IP address */
- struct in_addr bp_yiaddr; /* 'your' IP address */
- struct in_addr bp_siaddr; /* server IP address */
- struct in_addr bp_giaddr; /* gateway IP address */
+ nd_ipv4 bp_ciaddr; /* client IP address */
+ nd_ipv4 bp_yiaddr; /* 'your' IP address */
+ nd_ipv4 bp_siaddr; /* server IP address */
+ nd_ipv4 bp_giaddr; /* gateway IP address */
nd_byte bp_chaddr[16]; /* client hardware address */
nd_byte bp_sname[64]; /* server host name */
nd_byte bp_file[128]; /* boot file name */
nd_byte bp_vend[64]; /* vendor-specific area */
-} UNALIGNED;
+};
#define BOOTPREPLY 2
#define BOOTPREQUEST 1
struct cmu_vend {
nd_byte v_magic[4]; /* magic number */
nd_uint32_t v_flags; /* flags/opcodes, etc. */
- struct in_addr v_smask; /* Subnet mask */
- struct in_addr v_dgate; /* Default gateway */
- struct in_addr v_dns1, v_dns2; /* Domain name servers */
- struct in_addr v_ins1, v_ins2; /* IEN-116 name servers */
- struct in_addr v_ts1, v_ts2; /* Time servers */
+ nd_ipv4 v_smask; /* Subnet mask */
+ nd_ipv4 v_dgate; /* Default gateway */
+ nd_ipv4 v_dns1, v_dns2; /* Domain name servers */
+ nd_ipv4 v_ins1, v_ins2; /* IEN-116 name servers */
+ nd_ipv4 v_ts1, v_ts2; /* Time servers */
nd_byte v_unused[24]; /* currently unused */
-} UNALIGNED;
+};
/* v_flags values */
static const u_char vm_rfc1048[4] = VM_RFC1048;
uint8_t bp_op, bp_htype, bp_hlen;
+ ndo->ndo_protocol = "bootp";
bp = (const struct bootp *)cp;
ND_TCHECK_1(bp->bp_op);
bp_op = EXTRACT_U_1(bp->bp_op);
bp_htype = EXTRACT_U_1(bp->bp_htype);
bp_hlen = EXTRACT_U_1(bp->bp_hlen);
if (bp_htype == 1 && bp_hlen == 6 && bp_op == BOOTPREQUEST) {
- ND_TCHECK_LEN(bp->bp_chaddr, 6);
+ ND_TCHECK_6(bp->bp_chaddr);
ND_PRINT(" from %s", etheraddr_string(ndo, bp->bp_chaddr));
}
ND_PRINT(" (0x%04x)", EXTRACT_BE_U_2(bp->bp_flags));
/* Client's ip address */
- ND_TCHECK(bp->bp_ciaddr);
- if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_ciaddr.s_addr))
- ND_PRINT("\n\t Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr));
+ 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));
/* 'your' ip address (bootp client) */
- ND_TCHECK(bp->bp_yiaddr);
- if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_yiaddr.s_addr))
- ND_PRINT("\n\t Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr));
+ 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));
/* Server's ip address */
- ND_TCHECK(bp->bp_siaddr);
- if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_siaddr.s_addr))
- ND_PRINT("\n\t Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr));
+ 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));
/* Gateway's ip address */
- ND_TCHECK(bp->bp_giaddr);
- if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_giaddr.s_addr))
- ND_PRINT("\n\t Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr));
+ 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));
/* Client's Ethernet address */
if (bp_htype == 1 && bp_hlen == 6) {
- ND_TCHECK_LEN(bp->bp_chaddr, 6);
+ ND_TCHECK_6(bp->bp_chaddr);
ND_PRINT("\n\t Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr));
}
ND_TCHECK_1(bp->bp_sname); /* check first char only */
if (EXTRACT_U_1(bp->bp_sname)) {
ND_PRINT("\n\t sname \"");
- if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof bp->bp_sname,
- ndo->ndo_snapend)) {
+ if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
+ ndo->ndo_snapend) == 0) {
ND_PRINT("\"");
- ND_PRINT("%s", tstr + 1);
+ nd_print_trunc(ndo);
return;
}
ND_PRINT("\"");
ND_TCHECK_1(bp->bp_file); /* check first char only */
if (EXTRACT_U_1(bp->bp_file)) {
ND_PRINT("\n\t file \"");
- if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof bp->bp_file,
- ndo->ndo_snapend)) {
+ if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
+ ndo->ndo_snapend) == 0) {
ND_PRINT("\"");
- ND_PRINT("%s", tstr + 1);
+ nd_print_trunc(ndo);
return;
}
ND_PRINT("\"");
}
/* Decode the vendor buffer */
- ND_TCHECK_LEN(bp->bp_vend, 4);
+ ND_TCHECK_4(bp->bp_vend);
if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
sizeof(uint32_t)) == 0)
rfc1048_print(ndo, bp->bp_vend);
return;
trunc:
- ND_PRINT("%s", tstr);
+ nd_print_trunc(ndo);
}
/*
* 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)
ND_PRINT(", occurs %u", ntag);
}
- if (!ND_TTEST_LEN(bp, len)) {
- ND_PRINT("[|rfc1048 %u]", len);
- return;
- }
+ 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)));
case 'a':
/* ASCII strings */
ND_PRINT("\"");
- if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
+ if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
ND_PRINT("\"");
goto trunc;
}
ND_PRINT("%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(bp + 1));
bp += 2;
ND_PRINT("\"");
- if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
+ if (nd_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
ND_PRINT("\"");
goto trunc;
}
len--;
if (type == 0) {
ND_PRINT("\"");
- if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
+ if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
ND_PRINT("\"");
goto trunc;
}
case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
case AGENT_SUBOPTION_REMOTE_ID:
case AGENT_SUBOPTION_SUBSCRIBER_ID:
- if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
+ if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
goto trunc;
break;
break;
}
ND_PRINT("\"");
- if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
+ if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
ND_PRINT("\"");
goto trunc;
}
}
return;
trunc:
- ND_PRINT("|[rfc1048]");
+ nd_print_trunc(ndo);
}
-#define PRINTCMUADDR(m, s) { ND_TCHECK(cmu->m); \
- if (cmu->m.s_addr != 0) \
- ND_PRINT(" %s:%s", s, ipaddr_string(ndo, &cmu->m.s_addr)); }
+#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)); }
static void
cmu_print(netdissect_options *ndo,
return;
trunc:
- ND_PRINT("%s", tstr);
+ nd_print_trunc(ndo);
}
#undef PRINTCMUADDR
projects / tcpdump / blobdiff