* Routines for BOOTP/DHCP packet disassembly
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-bootp.c,v 1.25 2000/01/22 06:22:12 guy Exp $
+ * $Id: packet-bootp.c,v 1.42 2000/11/19 08:53:55 guy Exp $
*
* The information used comes from:
- * RFC 2132: DHCP Options and BOOTP Vendor Extensions
+ * RFC 951: Bootstrap Protocol
* RFC 1542: Clarifications and Extensions for the Bootstrap Protocol
* RFC 2131: Dynamic Host Configuration Protocol
+ * RFC 2132: DHCP Options and BOOTP Vendor Extensions
+ * RFC 2489: Procedure for Defining New DHCP Options
+ * BOOTP and DHCP Parameters
+ * http://www.isi.edu/in-notes/iana/assignments/bootp-dhcp-parameters
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
# include <sys/types.h>
#endif
+#include <string.h>
#include <glib.h>
#include "packet.h"
#include "packet-arp.h"
static int hf_bootp_server = -1;
static int hf_bootp_file = -1;
static int hf_bootp_cookie = -1;
+static int hf_bootp_dhcp = -1;
static guint ett_bootp = -1;
static guint ett_bootp_option = -1;
+#define UDP_PORT_BOOTPS 67
+
enum field_type { none, ipv4, string, toggle, yes_no, special, opaque,
time_in_secs,
val_u_byte, val_u_short, val_u_long,
enum field_type ftype;
};
-#define NUM_OPT_INFOS 77
+#define NUM_OPT_INFOS 128
+#define NUM_O63_SUBOPTS 11
-/* returns the number of bytes consumed by this option */
-static int
-bootp_option(const u_char *pd, proto_tree *bp_tree, int voff, int eoff)
-{
- char *text;
- enum field_type ftype;
- u_char code = pd[voff];
- int vlen = pd[voff+1];
- u_char byte;
- int i, consumed = vlen + 2;
- u_long time_secs;
- proto_tree *v_tree;
- proto_item *vti;
+static int dissect_netware_ip_suboption(proto_tree *v_tree, const u_char *pd,
+ int optp);
+static const char *
+get_dhcp_type(guint8 byte)
+{
static const char *opt53_text[] = {
"Unknown Message Type",
"Discover",
"Release",
"Inform"
};
+ int i;
+
+ if (byte > 0 && byte < (sizeof opt53_text / sizeof opt53_text[0]))
+ i = byte;
+ else
+ i = 0;
+ return opt53_text[i];
+}
+
+/* Returns the number of bytes consumed by this option. */
+static int
+bootp_option(const u_char *pd, proto_tree *bp_tree, int voff, int eoff)
+{
+ char *text;
+ enum field_type ftype;
+ u_char code = pd[voff];
+ int vlen = pd[voff+1];
+ u_char byte;
+ int i,optp, consumed = vlen + 2;
+ u_long time_secs;
+ proto_tree *v_tree;
+ proto_item *vti;
+
static const value_string nbnt_vals[] = {
{0x1, "B-node" },
{0x2, "P-node" },
/* 59 */ { "Rebinding Time Value", time_in_secs },
/* 60 */ { "Vendor class identifier", opaque },
/* 61 */ { "Client identifier", special },
+ /* 62 */ { "Novell/Netware IP domain", string },
+ /* 63 */ { "Novell Options", special },
/* 64 */ { "Network Information Service+ Domain", string },
/* 65 */ { "Network Information Service+ Servers", ipv4 },
/* 66 */ { "TFTP Server Name", string },
/* 73 */ { "Default Finger Server", ipv4 },
/* 74 */ { "Default IRC Server", ipv4 },
/* 75 */ { "StreetTalk Server", ipv4 },
- /* 76 */ { "StreetTalk Directory Assistance Server", ipv4 }
+ /* 76 */ { "StreetTalk Directory Assistance Server", ipv4 },
+ /* 77 */ { "User Class Information", opaque },
+ /* 78 */ { "Directory Agent Information", opaque },
+ /* 79 */ { "Service Location Agent Scope", opaque },
+ /* 80 */ { "Naming Authority", opaque },
+ /* 81 */ { "Client Fully Qualified Domain Name", opaque },
+ /* 82 */ { "Agent Circuit ID", opaque },
+ /* 83 */ { "Agent Remote ID", opaque },
+ /* 84 */ { "Agent Subnet Mask", opaque },
+ /* 85 */ { "Novell Directory Services Servers", opaque },
+ /* 86 */ { "Novell Directory Services Tree Name", opaque },
+ /* 87 */ { "Novell Directory Services Context", opaque },
+ /* 88 */ { "IEEE 1003.1 POSIX Timezone", opaque },
+ /* 89 */ { "Fully Qualified Domain Name", opaque },
+ /* 90 */ { "Authentication", opaque },
+ /* 91 */ { "Vines TCP/IP Server Option", opaque },
+ /* 92 */ { "Server Selection Option", opaque },
+ /* 93 */ { "Client System Architecture", opaque },
+ /* 94 */ { "Client Network Device Interface", opaque },
+ /* 95 */ { "Lightweight Directory Access Protocol", opaque },
+ /* 96 */ { "IPv6 Transitions", opaque },
+ /* 97 */ { "UUID/GUID-based Client Identifier", opaque },
+ /* 98 */ { "Open Group's User Authentication", opaque },
+ /* 99 */ { "Unassigned", opaque },
+ /* 100 */ { "Printer Name", opaque },
+ /* 101 */ { "MDHCP multicast address", opaque },
+ /* 102 */ { "Removed/unassigned", opaque },
+ /* 103 */ { "Removed/unassigned", opaque },
+ /* 104 */ { "Removed/unassigned", opaque },
+ /* 105 */ { "Removed/unassigned", opaque },
+ /* 106 */ { "Removed/unassigned", opaque },
+ /* 107 */ { "Removed/unassigned", opaque },
+ /* 108 */ { "Swap Path Option", opaque },
+ /* 109 */ { "Unassigned", opaque },
+ /* 110 */ { "IPX Compability", opaque },
+ /* 111 */ { "Unassigned", opaque },
+ /* 112 */ { "Netinfo Parent Server Address", opaque },
+ /* 113 */ { "Netinfo Parent Server Tag", opaque },
+ /* 114 */ { "URL", opaque },
+ /* 115 */ { "DHCP Failover Protocol", opaque },
+ /* 116 */ { "DHCP Auto-Configuration", opaque },
+ /* 117 */ { "Unassigned", opaque },
+ /* 118 */ { "Unassigned", opaque },
+ /* 119 */ { "Unassigned", opaque },
+ /* 120 */ { "Unassigned", opaque },
+ /* 121 */ { "Unassigned", opaque },
+ /* 122 */ { "Unassigned", opaque },
+ /* 123 */ { "Unassigned", opaque },
+ /* 124 */ { "Unassigned", opaque },
+ /* 125 */ { "Unassigned", opaque },
+ /* 126 */ { "Extension", opaque },
+ /* 127 */ { "Extension", opaque }
};
+ /* Options whose length isn't "vlen + 2". */
+ switch (code) {
+
+ case 0: /* Padding */
+ /* check how much padding we have */
+ for (i = voff + 1; i < eoff; i++ ) {
+ if (pd[i] != 0) {
+ break;
+ }
+ }
+ i = i - voff;
+ if (bp_tree != NULL)
+ proto_tree_add_text(bp_tree, NullTVB, voff, i, "Padding");
+ consumed = i;
+ return consumed;
+ break;
+
+ case 255: /* End Option */
+ if (bp_tree != NULL)
+ proto_tree_add_text(bp_tree, NullTVB, voff, 1, "End Option");
+ consumed = 1;
+ return consumed;
+ }
+
+ if (bp_tree == NULL) {
+ /* Don't put anything in the protocol tree. */
+ return consumed;
+ }
+
text = opt[code].text;
/* Special cases */
switch (code) {
- /* Padding */
- case 0:
- /* check how much padding we have */
- for (i = voff + 1; i < eoff; i++ ) {
- if (pd[i] != 0) {
- break;
- }
- }
- i = i - voff;
- proto_tree_add_text(bp_tree, voff, i, "Padding");
- consumed = i;
- return consumed;
- /* Policy Filter */
- case 21:
+ case 21: /* Policy Filter */
+ if (vlen == 8) {
/* one IP address pair */
- if (vlen == 8) {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s/%s", code, text,
- ip_to_str((guint8*)&pd[voff+2]),
- ip_to_str((guint8*)&pd[voff+6]));
- }
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s/%s", code, text,
+ ip_to_str((guint8*)&pd[voff+2]),
+ ip_to_str((guint8*)&pd[voff+6]));
+ } else {
/* > 1 IP address pair. Let's make a sub-tree */
- else {
-
- vti = proto_tree_add_text(bp_tree, voff,
- consumed, "Option %d: %s", code, text);
- v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- for (i = voff + 2; i < voff + consumed; i += 8) {
- proto_tree_add_text(v_tree, i, 8, "IP Address/Mask: %s/%s",
- ip_to_str((guint8*)&pd[i]),
- ip_to_str((guint8*)&pd[i+4]));
- }
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ consumed, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (i = voff + 2; i < voff + consumed; i += 8) {
+ proto_tree_add_text(v_tree, NullTVB, i, 8, "IP Address/Mask: %s/%s",
+ ip_to_str((guint8*)&pd[i]),
+ ip_to_str((guint8*)&pd[i+4]));
}
- break;
+ }
+ break;
- /* Static Route */
- case 33:
+ case 33: /* Static Route */
+ if (vlen == 8) {
/* one IP address pair */
- if (vlen == 8) {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s/%s", code, text,
- ip_to_str((guint8*)&pd[voff+2]),
- ip_to_str((guint8*)&pd[voff+6]));
- }
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s/%s", code, text,
+ ip_to_str((guint8*)&pd[voff+2]),
+ ip_to_str((guint8*)&pd[voff+6]));
+ } else {
/* > 1 IP address pair. Let's make a sub-tree */
- else {
-
- vti = proto_tree_add_text(bp_tree, voff,
- consumed, "Option %d: %s", code, text);
- v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- for (i = voff + 2; i < voff + consumed; i += 8) {
- proto_tree_add_text(v_tree, i, 8,
- "Destination IP Address/Router: %s/%s",
- ip_to_str((guint8*)&pd[i]),
- ip_to_str((guint8*)&pd[i+4]));
- }
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ consumed, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (i = voff + 2; i < voff + consumed; i += 8) {
+ proto_tree_add_text(v_tree, NullTVB, i, 8,
+ "Destination IP Address/Router: %s/%s",
+ ip_to_str((guint8*)&pd[i]),
+ ip_to_str((guint8*)&pd[i+4]));
}
- break;
-
- /* Vendor-Specific Info */
- case 43:
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s", code, text);
- break;
-
- /* NetBIOS-over-TCP/IP Node Type */
- case 46:
- byte = pd[voff+2];
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- val_to_str(byte, nbnt_vals,
- "Unknown (0x%02x)"));
- break;
+ }
+ break;
+
+ case 43: /* Vendor-Specific Info */
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s", code, text);
+ break;
+
+ case 46: /* NetBIOS-over-TCP/IP Node Type */
+ byte = pd[voff+2];
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ val_to_str(byte, nbnt_vals,
+ "Unknown (0x%02x)"));
+ break;
- /* DHCP Message Type */
- case 53:
- byte = pd[voff+2];
- if (byte > 0 && byte < 9) {
- i = byte;
+ case 53: /* DHCP Message Type */
+ proto_tree_add_text(bp_tree, NullTVB, voff, 3, "Option %d: %s = DHCP %s",
+ code, text, get_dhcp_type(pd[voff+2]));
+ break;
+
+ case 55: /* Parameter Request List */
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ vlen + 2, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (i = 0; i < vlen; i++) {
+ byte = pd[voff+2+i];
+ if (byte < NUM_OPT_INFOS) {
+ proto_tree_add_text(v_tree, NullTVB, voff+2+i, 1, "%d = %s",
+ byte, opt[byte].text);
+ } else {
+ proto_tree_add_text(vti, NullTVB, voff+2+i, 1,
+ "Unknown Option Code: %d", byte);
}
- else {
- i = 0;
- }
- proto_tree_add_text(bp_tree, voff, 3, "Option %d: %s = DHCP %s",
- code, text, opt53_text[i]);
- break;
-
- /* Parameter Request List */
- case 55:
- vti = proto_tree_add_text(bp_tree, voff,
- vlen + 2, "Option %d: %s", code, text);
+ }
+ break;
+
+ case 61: /* Client Identifier */
+ /* We *MAY* use hwtype/hwaddr. If we have 7 bytes, I'll
+ guess that the first is the hwtype, and the last 6
+ are the hw addr */
+ if (vlen == 7) {
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ consumed, "Option %d: %s", code, text);
v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- for (i = 0; i < vlen; i++) {
- byte = pd[voff+2+i];
- if (byte < NUM_OPT_INFOS) {
- proto_tree_add_text(v_tree, voff+2+i, 1, "%d = %s",
- byte, opt[byte].text);
- }
- else {
- proto_tree_add_text(vti, voff+2+i, 1,
- "Unknown Option Code: %d", byte);
- }
- }
- break;
-
- /* Client Identifier */
- case 61:
- /* We *MAY* use hwtype/hwaddr. If we have 7 bytes, I'll
- guess that the first is the hwtype, and the last 6 are
- the hw addr */
- if (vlen == 7) {
- vti = proto_tree_add_text(bp_tree, voff,
- consumed, "Option %d: %s", code, text);
- v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- proto_tree_add_text(v_tree, voff+2, 1,
- "Hardware type: %s",
- arphrdtype_to_str(pd[voff+2],
- "Unknown (0x%02x)"));
- proto_tree_add_text(v_tree, voff+3, 6,
- "Client hardware address: %s",
- arphrdaddr_to_str((guint8*)&pd[voff+3],
- 6, pd[voff+2]));
- }
+ proto_tree_add_text(v_tree, NullTVB, voff+2, 1,
+ "Hardware type: %s",
+ arphrdtype_to_str(pd[voff+2],
+ "Unknown (0x%02x)"));
+ proto_tree_add_text(v_tree, NullTVB, voff+3, 6,
+ "Client hardware address: %s",
+ arphrdaddr_to_str((guint8*)&pd[voff+3],
+ 6, pd[voff+2]));
+ } else {
/* otherwise, it's opaque data */
- else {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s (%d bytes)", code, text, vlen);
- }
- break;
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s (%d bytes)", code, text, vlen);
+ }
+ break;
- /* End Option */
- case 255:
- proto_tree_add_text(bp_tree, voff, 1, "End Option");
- consumed = 1;
- return consumed;
+ case 63: /* NetWare/IP options */
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ consumed, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- default:
- /* nothing */
- break;
+ optp = voff+2;
+ while (optp < voff+consumed)
+ optp = dissect_netware_ip_suboption(v_tree, pd, optp);
+ break;
+
+ default: /* not special */
+ break;
}
/* Normal cases */
ftype = opt[code].ftype;
switch (ftype) {
- case special:
- return consumed;
- case ipv4:
+ case special:
+ return consumed;
+
+ case ipv4:
+ if (vlen == 4) {
/* one IP address */
- if (vlen == 4) {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- ip_to_str((guint8*)&pd[voff+2]));
- }
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ ip_to_str((guint8*)&pd[voff+2]));
+ } else {
/* > 1 IP addresses. Let's make a sub-tree */
- else {
-
- vti = proto_tree_add_text(bp_tree, voff,
- consumed, "Option %d: %s", code, text);
- v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- for (i = voff + 2; i < voff + consumed; i += 4) {
- proto_tree_add_text(v_tree, i, 4, "IP Address: %s",
- ip_to_str((guint8*)&pd[i]));
- }
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ consumed, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (i = voff + 2; i < voff + consumed; i += 4) {
+ proto_tree_add_text(v_tree, NullTVB, i, 4, "IP Address: %s",
+ ip_to_str((guint8*)&pd[i]));
}
- break;
+ }
+ break;
- case string:
- /* Fix for non null-terminated string supplied by
- * John Lines <John.Lines@aeat.co.uk>
- */
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %.*s", code, text, vlen, &pd[voff+2]);
- break;
+ case string:
+ /* Fix for non null-terminated string supplied by
+ * John Lines <John.Lines@aeat.co.uk>
+ */
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %.*s", code, text, vlen, &pd[voff+2]);
+ break;
- case opaque:
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s (%d bytes)",
- code, text, vlen);
- break;
+ case opaque:
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s (%d bytes)",
+ code, text, vlen);
+ break;
- case val_u_short:
- /* one IP address */
- if (vlen == 2) {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %d", code, text,
- pntohs(&pd[voff+2]));
- }
+ case val_u_short:
+ if (vlen == 2) {
+ /* one u_short */
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %d", code, text,
+ pntohs(&pd[voff+2]));
+ } else {
/* > 1 u_short */
- else {
- vti = proto_tree_add_text(bp_tree, voff,
- consumed, "Option %d: %s", code, text);
- v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- for (i = voff + 2; i < voff + consumed; i += 2) {
- proto_tree_add_text(v_tree, i, 4, "Value: %d",
- pntohs(&pd[i]));
- }
+ vti = proto_tree_add_text(bp_tree, NullTVB, voff,
+ consumed, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (i = voff + 2; i < voff + consumed; i += 2) {
+ proto_tree_add_text(v_tree, NullTVB, i, 4, "Value: %d",
+ pntohs(&pd[i]));
}
- break;
+ }
+ break;
- case val_u_long:
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %d", code, text,
- pntohl(&pd[voff+2]));
- break;
+ case val_u_long:
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %d", code, text,
+ pntohl(&pd[voff+2]));
+ break;
- case val_u_byte:
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %d", code, text, pd[voff+2]);
- break;
+ case val_u_byte:
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %d", code, text, pd[voff+2]);
+ break;
- case toggle:
- i = pd[voff+2];
- if (i != 0 && i != 1) {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = Invalid Value %d", code, text,
- pd[voff+2]);
- }
- else {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- pd[voff+2] == 0 ? "Disabled" : "Enabled");
- }
- break;
+ case toggle:
+ i = pd[voff+2];
+ if (i != 0 && i != 1) {
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = Invalid Value %d", code, text,
+ pd[voff+2]);
+ } else {
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ pd[voff+2] == 0 ? "Disabled" : "Enabled");
+ }
+ break;
- case yes_no:
- i = pd[voff+2];
- if (i != 0 && i != 1) {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = Invalid Value %d", code, text,
- pd[voff+2]);
- }
- else {
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- pd[voff+2] == 0 ? "No" : "Yes");
- }
- break;
+ case yes_no:
+ i = pd[voff+2];
+ if (i != 0 && i != 1) {
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = Invalid Value %d", code, text,
+ pd[voff+2]);
+ } else {
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ pd[voff+2] == 0 ? "No" : "Yes");
+ }
+ break;
- case time_in_secs:
- time_secs = pntohl(&pd[voff+2]);
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- ((time_secs == 0xffffffff) ?
- "infinity" :
- time_secs_to_str(time_secs)));
- break;
+ case time_in_secs:
+ time_secs = pntohl(&pd[voff+2]);
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ ((time_secs == 0xffffffff) ?
+ "infinity" :
+ time_secs_to_str(time_secs)));
+ break;
- default:
- proto_tree_add_text(bp_tree, voff, consumed,
- "Option %d: %s (%d bytes)", code, text, vlen);
+ default:
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
+ "Option %d: %s (%d bytes)", code, text, vlen);
}
- }
- else {
- proto_tree_add_text(bp_tree, voff, consumed,
+ } else {
+ proto_tree_add_text(bp_tree, NullTVB, voff, consumed,
"Unknown Option Code: %d (%d bytes)", code, vlen);
}
return consumed;
}
-void
+static int
+dissect_netware_ip_suboption(proto_tree *v_tree, const u_char *pd, int optp)
+{
+ int slask;
+ proto_tree *o63_v_tree;
+ proto_item *vti;
+
+ struct o63_opt_info {
+ char *truet;
+ char *falset;
+ enum field_type ft;
+ };
+
+ static struct o63_opt_info o63_opt[]= {
+ /* 0 */ {"","",none},
+ /* 1 */ {"NWIP does not exist on subnet","",string},
+ /* 2 */ {"NWIP exist in options area","",string},
+ /* 3 */ {"NWIP exists in sname/file","",string},
+ /* 4 */ {"NWIP exists, but too big","",string},
+ /* 5 */ {"Broadcast for nearest Netware server","Do NOT Broadcast for nearest Netware server",yes_no},
+ /* 6 */ {"Preferred DSS server","",ipv4},
+ /* 7 */ {"Nearest NWIP server","",ipv4},
+ /* 8 */ {"Autoretries","",val_u_short},
+ /* 9 */ {"Autoretry delay, secs ","",val_u_short},
+ /* 10*/ {"Support NetWare/IP v1.1","Do NOT support NetWare/IP v1.1",yes_no},
+ /* 11*/ {"Primary DSS ", "" , special}
+ };
+
+ if (pd[optp] > NUM_O63_SUBOPTS) {
+ proto_tree_add_text(v_tree, NullTVB,optp,1,"Unknown suboption %d", pd[optp]);
+ optp++;
+ } else {
+ switch (o63_opt[pd[optp]].ft) {
+
+ case string:
+ proto_tree_add_text(v_tree, NullTVB, optp, 2, "Suboption %d: %s", pd[optp], o63_opt[pd[optp]].truet);
+ optp+=2;
+ break;
+
+ case yes_no:
+ if (pd[optp+2]==1) {
+ proto_tree_add_text(v_tree, NullTVB, optp, 3, "Suboption %d: %s", pd[optp], o63_opt[pd[optp]].truet);
+ } else {
+ proto_tree_add_text(v_tree, NullTVB, optp, 3, "Suboption %d: %s" , pd[optp], o63_opt[pd[optp]].falset);
+ }
+ optp+=3;
+ break;
+
+ case special:
+ proto_tree_add_text(v_tree, NullTVB, optp, 6,
+ "Suboption %d: %s = %s" ,
+ pd[optp], o63_opt[pd[optp]].truet,
+ ip_to_str((guint8*)&pd[optp+2]));
+ optp=optp+6;
+ break;
+
+ case val_u_short:
+ proto_tree_add_text(v_tree, NullTVB, optp, 3, "Suboption %d: %s = %d",pd[optp], o63_opt[pd[optp]].truet, pd[optp+2]);
+ optp+=3;
+ break;
+
+ case ipv4:
+ if (pd[optp+1] == 4) {
+ /* one IP address */
+ proto_tree_add_text(v_tree, NullTVB, optp, 6,
+ "Suboption %d : %s = %s",
+ pd[optp], o63_opt[pd[optp]].truet,
+ ip_to_str((guint8*)&pd[optp+2]));
+ optp=optp+6;
+ } else {
+ /* > 1 IP addresses. Let's make a sub-tree */
+ vti = proto_tree_add_text(v_tree, NullTVB, optp,
+ pd[optp+1]+2, "Suboption %d: %s",
+ pd[optp], o63_opt[pd[optp]].truet);
+ o63_v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (slask = optp + 2 ; slask < optp+pd[optp+1]; slask += 4) {
+ proto_tree_add_text(o63_v_tree, NullTVB, slask, 4, "IP Address: %s",
+ ip_to_str((guint8*)&pd[slask]));
+ }
+ optp=slask;
+ }
+ break;
+ default:
+ proto_tree_add_text(v_tree, NullTVB,optp,1,"Unknown suboption %d", pd[optp]);
+ optp++;
+ break;
+ }
+ }
+ return optp;
+}
+
+static void
dissect_bootp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
{
- proto_tree *bp_tree;
+ proto_tree *bp_tree = NULL;
proto_item *ti;
- int voff, eoff; /* vender offset, end offset */
+ int voff, eoff; /* vender offset, end offset */
guint32 ip_addr;
+ const char *dhcp_type;
+
+ OLD_CHECK_DISPLAY_AS_DATA(proto_bootp, pd, offset, fd, tree);
+
+ dhcp_type = NULL;
if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "BOOTP");
+ col_set_str(fd, COL_PROTOCOL, "BOOTP");
if (check_col(fd, COL_INFO)) {
if (pd[offset] == 1) {
pd[offset+2], pd[offset+1]));
}
else {
- col_add_str(fd, COL_INFO, "Boot Reply");
+ col_set_str(fd, COL_INFO, "Boot Reply");
}
}
if (tree) {
- ti = proto_tree_add_item(tree, proto_bootp, offset, END_OF_FRAME, NULL);
+ ti = proto_tree_add_item(tree, proto_bootp, NullTVB, offset, END_OF_FRAME, FALSE);
bp_tree = proto_item_add_subtree(ti, ett_bootp);
- proto_tree_add_item_format(bp_tree, hf_bootp_type,
+ proto_tree_add_uint_format(bp_tree, hf_bootp_type, NullTVB,
offset, 1,
pd[offset],
pd[offset] == 1 ?
"Boot Request" : "Boot Reply");
- proto_tree_add_item_format(bp_tree, hf_bootp_hw_type,
+ proto_tree_add_uint_format(bp_tree, hf_bootp_hw_type, NullTVB,
offset + 1, 1,
pd[offset+1],
"Hardware type: %s",
arphrdtype_to_str(pd[offset+1],
"Unknown (0x%02x)"));
- proto_tree_add_item(bp_tree, hf_bootp_hw_len,
+ proto_tree_add_uint(bp_tree, hf_bootp_hw_len, NullTVB,
offset + 2, 1, pd[offset+2]);
- proto_tree_add_item(bp_tree, hf_bootp_hops,
+ proto_tree_add_uint(bp_tree, hf_bootp_hops, NullTVB,
offset + 3, 1, pd[offset+3]);
- proto_tree_add_item(bp_tree, hf_bootp_id,
+ proto_tree_add_uint(bp_tree, hf_bootp_id, NullTVB,
offset + 4, 4, pntohl(&pd[offset+4]));
- proto_tree_add_item(bp_tree, hf_bootp_secs,
+ proto_tree_add_uint(bp_tree, hf_bootp_secs, NullTVB,
offset + 8, 2, pntohs(&pd[offset+8]));
- proto_tree_add_item(bp_tree, hf_bootp_flag,
- offset + 10, 2, pd[offset+10] & 1);
+ proto_tree_add_uint(bp_tree, hf_bootp_flag, NullTVB,
+ offset + 10, 2, pntohs(&pd[offset+10]) & 0x8000);
memcpy(&ip_addr, &pd[offset+12], sizeof(ip_addr));
- proto_tree_add_item(bp_tree, hf_bootp_ip_client,
+ proto_tree_add_ipv4(bp_tree, hf_bootp_ip_client, NullTVB,
offset + 12, 4, ip_addr);
memcpy(&ip_addr, &pd[offset+16], sizeof(ip_addr));
- proto_tree_add_item(bp_tree, hf_bootp_ip_your,
+ proto_tree_add_ipv4(bp_tree, hf_bootp_ip_your, NullTVB,
offset + 16, 4, ip_addr);
memcpy(&ip_addr, &pd[offset+20], sizeof(ip_addr));
- proto_tree_add_item(bp_tree, hf_bootp_ip_server,
+ proto_tree_add_ipv4(bp_tree, hf_bootp_ip_server, NullTVB,
offset + 20, 4, ip_addr);
memcpy(&ip_addr, &pd[offset+24], sizeof(ip_addr));
- proto_tree_add_item(bp_tree, hf_bootp_ip_relay,
+ proto_tree_add_ipv4(bp_tree, hf_bootp_ip_relay, NullTVB,
offset + 24, 4, ip_addr);
- proto_tree_add_item_format(bp_tree, hf_bootp_hw_addr,
- offset + 28, pd[offset+2],
- &pd[offset+28],
- "Client hardware address: %s",
- arphrdaddr_to_str((guint8*)&pd[offset+28],
- pd[offset+2], pd[offset+1]));
+ if (pd[offset+2] > 0) {
+ proto_tree_add_bytes_format(bp_tree, hf_bootp_hw_addr, NullTVB,
+ offset + 28, pd[offset+2],
+ &pd[offset+28],
+ "Client hardware address: %s",
+ arphrdaddr_to_str((guint8*)&pd[offset+28],
+ pd[offset+2], pd[offset+1]));
+ }
+ else {
+ proto_tree_add_text(bp_tree, NullTVB,
+ offset + 28, 0, "Client address not given");
+ }
/* The server host name is optional */
if (pd[offset+44]) {
- proto_tree_add_item_format(bp_tree, hf_bootp_server,
+ proto_tree_add_string_format(bp_tree, hf_bootp_server, NullTVB,
offset + 44, 64,
&pd[offset+44],
"Server host name: %s",
&pd[offset+44]);
}
else {
- proto_tree_add_item_format(bp_tree, hf_bootp_server,
+ proto_tree_add_string_format(bp_tree, hf_bootp_server, NullTVB,
offset + 44, 64,
&pd[offset+44],
"Server host name not given");
/* Boot file */
if (pd[offset+108]) {
- proto_tree_add_item_format(bp_tree, hf_bootp_file,
+ proto_tree_add_string_format(bp_tree, hf_bootp_file, NullTVB,
offset + 108, 128,
&pd[offset+108],
"Boot file name: %s",
&pd[offset+108]);
}
else {
- proto_tree_add_item_format(bp_tree, hf_bootp_file,
+ proto_tree_add_string_format(bp_tree, hf_bootp_file, NullTVB,
offset + 108, 128,
&pd[offset+108],
"Boot file name not given");
}
+ memcpy(&ip_addr, &pd[offset + 236], sizeof(ip_addr));
if (pntohl(&pd[offset+236]) == 0x63825363) {
- proto_tree_add_item_format(bp_tree, hf_bootp_cookie,
- offset + 236, 4,
- pd[offset+236],
- "Magic cookie: (OK)");
+ proto_tree_add_ipv4_format(bp_tree, hf_bootp_cookie, NullTVB,
+ offset + 236, 4, ip_addr,
+ "Magic cookie: (OK)");
}
else {
- memcpy(&ip_addr, &pd[offset + 236], sizeof(ip_addr));
- proto_tree_add_item(bp_tree, hf_bootp_cookie,
+ proto_tree_add_ipv4(bp_tree, hf_bootp_cookie, NullTVB,
offset + 236, 4, ip_addr);
}
+ }
- voff = offset+240;
- eoff = pi.captured_len;
-
- while (voff < eoff) {
- voff += bootp_option(pd, bp_tree, voff, eoff);
- }
+ voff = offset+240;
+ eoff = pi.captured_len;
+ while (voff < eoff) {
+ /* Handle the DHCP option specially here, so that we
+ can flag DHCP packets as such. */
+ if (pd[voff] == 53)
+ dhcp_type = get_dhcp_type(pd[voff+2]);
+ voff += bootp_option(pd, bp_tree, voff, eoff);
+ }
+ if (dhcp_type != NULL ) {
+ if (check_col(fd, COL_PROTOCOL))
+ col_set_str(fd, COL_PROTOCOL, "DHCP");
+ if (check_col(fd, COL_INFO))
+ col_add_fstr(fd, COL_INFO, "DHCP %-8s - Transaction ID 0x%x",
+ dhcp_type, pntohl(&pd[offset+4]));
+ if (tree)
+ proto_tree_add_boolean_hidden(bp_tree, hf_bootp_dhcp,
+ NullTVB, 0, 0, 1);
}
}
proto_register_bootp(void)
{
static hf_register_info hf[] = {
+ { &hf_bootp_dhcp,
+ { "Frame is DHCP", "bootp.dhcp", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "" }},
+
{ &hf_bootp_type,
{ "Message type", "bootp.type", FT_UINT8, BASE_NONE, NULL, 0x0,
"" }},
"" }},
{ &hf_bootp_flag,
- { "Broadcast flag", "bootp.flag", FT_UINT16, BASE_DEC, NULL, 0x0,
+ { "Broadcast flag", "bootp.flag", FT_UINT16, BASE_HEX, NULL, 0x0,
"" }},
{ &hf_bootp_ip_client,
proto_register_field_array(proto_bootp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_bootp(void)
+{
+ old_dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp);
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff