/* packet-bootp.c
* Routines for BOOTP/DHCP packet disassembly
- * Gilbert Ramirez <gram@verdict.uthscsa.edu>
+ * Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-bootp.c,v 1.13 1998/11/20 04:34:37 gram Exp $
+ * $Id: packet-bootp.c,v 1.52 2001/05/24 19:21:15 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
+ * RFC 3046: DHCP Relay Agent Information Option
+ * BOOTP and DHCP Parameters
+ * http://www.isi.edu/in-notes/iana/assignments/bootp-dhcp-parameters
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@unicom.net>
+ * By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
*
# include "config.h"
#endif
-#include <gtk/gtk.h>
-
-#include <stdio.h>
-
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
+#include <string.h>
+#include <glib.h>
+#include "packet.h"
+#include "packet-arp.h"
+static int proto_bootp = -1;
+static int hf_bootp_type = -1;
+static int hf_bootp_hw_type = -1;
+static int hf_bootp_hw_len = -1;
+static int hf_bootp_hops = -1;
+static int hf_bootp_id = -1;
+static int hf_bootp_secs = -1;
+static int hf_bootp_flag = -1;
+static int hf_bootp_ip_client = -1;
+static int hf_bootp_ip_your = -1;
+static int hf_bootp_ip_server = -1;
+static int hf_bootp_ip_relay = -1;
+static int hf_bootp_hw_addr = -1;
+static int hf_bootp_server = -1;
+static int hf_bootp_file = -1;
+static int hf_bootp_cookie = -1;
+static int hf_bootp_dhcp = -1;
-#include "ethereal.h"
-#include "packet.h"
-#include "etypes.h"
+static guint ett_bootp = -1;
+static guint ett_bootp_option = -1;
+
+static const guint8 *vendor_class_id = NULL;
+
+#define UDP_PORT_BOOTPS 67
enum field_type { none, ipv4, string, toggle, yes_no, special, opaque,
- val_u_byte, val_u_short, val_u_long,
+ time_in_secs,
+ val_u_byte, val_u_short, val_u_le_short, val_u_long,
val_s_long };
struct opt_info {
enum field_type ftype;
};
-#define NUM_OPT_INFOS 77
+#define NUM_OPT_INFOS 211
+#define NUM_O63_SUBOPTS 11
-/* returns the number of bytes consumed by this option */
-int
-bootp_option(const u_char *pd, GtkWidget *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 = 1; /* if code is unknown, consume 1 byte */
- GtkWidget *vti, *v_tree;
+static int dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb,
+ int optp);
+static int dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb,
+ int optp);
+static int bootp_dhcp_decode_agent_info(proto_tree *v_tree, tvbuff_t *tvb,
+ int optp);
- char *opt53_text[] = {
+static const char *
+get_dhcp_type(guint8 byte)
+{
+ static const char *opt53_text[] = {
"Unknown Message Type",
"Discover",
"Offer",
"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(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff)
+{
+ char *text;
+ enum field_type ftype;
+ u_char code = tvb_get_guint8(tvb, voff);
+ int vlen;
+ u_char byte;
+ int i,optp, consumed;
+ u_long time_secs;
+ proto_tree *v_tree;
+ proto_item *vti;
+ const char *md5_ptr;
+ char md5_str[50];
+
+ static const value_string nbnt_vals[] = {
+ {0x1, "B-node" },
+ {0x2, "P-node" },
+ {0x4, "M-node" },
+ {0x8, "H-node" },
+ {0, NULL } };
static struct opt_info opt[] = {
/* 0 */ { "Padding", none },
/* 21 */ { "Policy Filter", special },
/* 22 */ { "Maximum Datagram Reassembly Size", val_u_short },
/* 23 */ { "Default IP Time-to-Live", val_u_byte },
- /* 24 */ { "Path MTU Aging Timeout", val_u_long },
+ /* 24 */ { "Path MTU Aging Timeout", time_in_secs },
/* 25 */ { "Path MTU Plateau Table", val_u_short },
/* 26 */ { "Interface MTU", val_u_short },
/* 27 */ { "All Subnets are Local", yes_no },
/* 32 */ { "Router Solicitation Address", ipv4 },
/* 33 */ { "Static Route", special },
/* 34 */ { "Trailer Encapsulation", toggle },
- /* 35 */ { "ARP Cache Timeout", val_u_long },
+ /* 35 */ { "ARP Cache Timeout", time_in_secs },
/* 36 */ { "Ethernet Encapsulation", toggle },
/* 37 */ { "TCP Default TTL", val_u_byte },
- /* 38 */ { "TCP Keepalive Interval", val_u_long },
+ /* 38 */ { "TCP Keepalive Interval", time_in_secs },
/* 39 */ { "TCP Keepalive Garbage", toggle },
/* 40 */ { "Network Information Service Domain", string },
/* 41 */ { "Network Information Service Servers", ipv4 },
/* 48 */ { "X Window System Font Server", ipv4 },
/* 49 */ { "X Window System Display Manager", ipv4 },
/* 50 */ { "Requested IP Address", ipv4 },
- /* 51 */ { "IP Address Lease Time", val_u_long },
+ /* 51 */ { "IP Address Lease Time", time_in_secs },
/* 52 */ { "Option Overload", special },
/* 53 */ { "DHCP Message Type", special },
/* 54 */ { "Server Identifier", ipv4 },
/* 55 */ { "Parameter Request List", special },
/* 56 */ { "Message", string },
/* 57 */ { "Maximum DHCP Message Size", val_u_short },
- /* 58 */ { "Renewal Time Value", val_u_long },
- /* 59 */ { "Rebinding Time Value", val_u_long },
- /* 60 */ { "Vendor class identifier", opaque },
+ /* 58 */ { "Renewal Time Value", time_in_secs },
+ /* 59 */ { "Rebinding Time Value", time_in_secs },
+ /* 60 */ { "Vendor class identifier", special },
/* 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 Information Option", special },
+ /* 83 */ { "Unassigned", opaque },
+ /* 84 */ { "Unassigned", 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 },
+ /* 128 */ { "Private", opaque },
+ /* 129 */ { "Private", opaque },
+ /* 130 */ { "Private", opaque },
+ /* 131 */ { "Private", opaque },
+ /* 132 */ { "Private", opaque },
+ /* 133 */ { "Private", opaque },
+ /* 134 */ { "Private", opaque },
+ /* 135 */ { "Private", opaque },
+ /* 136 */ { "Private", opaque },
+ /* 137 */ { "Private", opaque },
+ /* 138 */ { "Private", opaque },
+ /* 139 */ { "Private", opaque },
+ /* 140 */ { "Private", opaque },
+ /* 141 */ { "Private", opaque },
+ /* 142 */ { "Private", opaque },
+ /* 143 */ { "Private", opaque },
+ /* 144 */ { "Private", opaque },
+ /* 145 */ { "Private", opaque },
+ /* 146 */ { "Private", opaque },
+ /* 147 */ { "Private", opaque },
+ /* 148 */ { "Private", opaque },
+ /* 149 */ { "Private", opaque },
+ /* 150 */ { "Private", opaque },
+ /* 151 */ { "Private", opaque },
+ /* 152 */ { "Private", opaque },
+ /* 153 */ { "Private", opaque },
+ /* 154 */ { "Private", opaque },
+ /* 155 */ { "Private", opaque },
+ /* 156 */ { "Private", opaque },
+ /* 157 */ { "Private", opaque },
+ /* 158 */ { "Private", opaque },
+ /* 159 */ { "Private", opaque },
+ /* 160 */ { "Private", opaque },
+ /* 161 */ { "Private", opaque },
+ /* 162 */ { "Private", opaque },
+ /* 163 */ { "Private", opaque },
+ /* 164 */ { "Private", opaque },
+ /* 165 */ { "Private", opaque },
+ /* 166 */ { "Private", opaque },
+ /* 167 */ { "Private", opaque },
+ /* 168 */ { "Private", opaque },
+ /* 169 */ { "Private", opaque },
+ /* 170 */ { "Private", opaque },
+ /* 171 */ { "Private", opaque },
+ /* 172 */ { "Private", opaque },
+ /* 173 */ { "Private", opaque },
+ /* 174 */ { "Private", opaque },
+ /* 175 */ { "Private", opaque },
+ /* 176 */ { "Private", opaque },
+ /* 177 */ { "Private", opaque },
+ /* 178 */ { "Private", opaque },
+ /* 179 */ { "Private", opaque },
+ /* 180 */ { "Private", opaque },
+ /* 181 */ { "Private", opaque },
+ /* 182 */ { "Private", opaque },
+ /* 183 */ { "Private", opaque },
+ /* 184 */ { "Private", opaque },
+ /* 185 */ { "Private", opaque },
+ /* 186 */ { "Private", opaque },
+ /* 187 */ { "Private", opaque },
+ /* 188 */ { "Private", opaque },
+ /* 189 */ { "Private", opaque },
+ /* 190 */ { "Private", opaque },
+ /* 191 */ { "Private", opaque },
+ /* 192 */ { "Private", opaque },
+ /* 193 */ { "Private", opaque },
+ /* 194 */ { "Private", opaque },
+ /* 195 */ { "Private", opaque },
+ /* 196 */ { "Private", opaque },
+ /* 197 */ { "Private", opaque },
+ /* 198 */ { "Private", opaque },
+ /* 199 */ { "Private", opaque },
+ /* 200 */ { "Private", opaque },
+ /* 201 */ { "Private", opaque },
+ /* 202 */ { "Private", opaque },
+ /* 203 */ { "Private", opaque },
+ /* 204 */ { "Private", opaque },
+ /* 205 */ { "Private", opaque },
+ /* 206 */ { "Private", opaque },
+ /* 207 */ { "Private", opaque },
+ /* 208 */ { "Private", opaque },
+ /* 209 */ { "Private", opaque },
+ /* 210 */ { "Authentication", special }
};
+ /* 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 (tvb_get_guint8(tvb, i) != 0) {
+ break;
+ }
+ }
+ i = i - voff;
+ if (bp_tree != NULL)
+ proto_tree_add_text(bp_tree, tvb, voff, i, "Padding");
+ consumed = i;
+ return consumed;
+ break;
+
+ case 255: /* End Option */
+ if (bp_tree != NULL)
+ proto_tree_add_text(bp_tree, tvb, voff, 1, "End Option");
+ consumed = 1;
+ return consumed;
+ }
+
+ /*
+ * Get the length of the option, and the number of bytes it
+ * consumes (the length doesn't include the option code or
+ * length bytes).
+ */
+ vlen = tvb_get_guint8(tvb, voff+1);
+ consumed = vlen + 2;
+ /* Handling of options we need to scan for first:
+ * 60 (Vendor class identifier)
+ * This is ugly but I don't have any better ideas
+ * -- Joerg Mayer
+ */
+ if ( (code == 60) && (bp_tree == NULL) ) {
+ vendor_class_id = tvb_get_ptr(tvb, voff+2, consumed-2);
+ }
+ 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;
- add_item_to_tree(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) {
- add_item_to_tree(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, tvb, voff, consumed,
+ "Option %d: %s = %s/%s", code, text,
+ ip_to_str(tvb_get_ptr(tvb, voff+2, 4)),
+ ip_to_str(tvb_get_ptr(tvb, voff+6, 4)));
+ } else {
/* > 1 IP address pair. Let's make a sub-tree */
- else {
-
- vti = add_item_to_tree(GTK_WIDGET(bp_tree), voff,
- consumed, "Option %d: %s", code, text);
- v_tree = gtk_tree_new();
- add_subtree(vti, v_tree, ETT_BOOTP_OPTION);
- for (i = voff + 2; i < voff + consumed; i += 8) {
- add_item_to_tree(v_tree, i, 4, "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, tvb, 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, tvb, i, 8, "IP Address/Mask: %s/%s",
+ ip_to_str(tvb_get_ptr(tvb, i, 4)),
+ ip_to_str(tvb_get_ptr(tvb, i+4, 4)));
}
- break;
+ }
+ break;
- /* Static Route */
- case 33:
+ case 33: /* Static Route */
+ if (vlen == 8) {
/* one IP address pair */
- if (vlen == 8) {
- add_item_to_tree(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, tvb, voff, consumed,
+ "Option %d: %s = %s/%s", code, text,
+ ip_to_str(tvb_get_ptr(tvb, voff+2, 4)),
+ ip_to_str(tvb_get_ptr(tvb, voff+6, 4)));
+ } else {
/* > 1 IP address pair. Let's make a sub-tree */
- else {
-
- vti = add_item_to_tree(GTK_WIDGET(bp_tree), voff,
- consumed, "Option %d: %s", code, text);
- v_tree = gtk_tree_new();
- add_subtree(vti, v_tree, ETT_BOOTP_OPTION);
- for (i = voff + 2; i < voff + consumed; i += 8) {
- add_item_to_tree(v_tree, i, 4,
- "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, tvb, 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, tvb, i, 8,
+ "Destination IP Address/Router: %s/%s",
+ ip_to_str(tvb_get_ptr(tvb, i, 4)),
+ ip_to_str(tvb_get_ptr(tvb, i+4, 4)));
}
- break;
+ }
+ break;
- /* DHCP Message Type */
- case 53:
- byte = pd[voff+2];
- if (byte > 0 && byte < 9) {
- i = byte;
- }
- else {
- i = 0;
- }
- add_item_to_tree(bp_tree, voff, 3, "Option %d: %s = DHCP %s",
- code, text, opt53_text[i]);
- break;
+ case 43: /* Vendor-Specific Info */
+ /* PXE protocol 2.1 as described in the intel specs */
+ if (strncmp(vendor_class_id, "PXEClient", strlen("PXEClient")) == 0) {
+ vti = proto_tree_add_text(bp_tree, tvb, voff,
+ consumed, "Option %d: %s (PXEClient)", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
- /* Parameter Request List */
- case 55:
- vti = add_item_to_tree(GTK_WIDGET(bp_tree), voff,
- vlen + 2, "Option %d: %s", code, text);
- v_tree = gtk_tree_new();
- add_subtree(vti, v_tree, ETT_BOOTP_OPTION);
- for (i = 0; i < vlen; i++) {
- byte = pd[voff+2+i];
- if (byte < NUM_OPT_INFOS) {
- add_item_to_tree(v_tree, voff+2+i, 1, "%d = %s",
- byte, opt[byte].text);
- }
- else {
- add_item_to_tree(vti, voff+2+i, 1,
- "Unknown Option Code: %d", byte);
- }
+ optp = voff+2;
+ while (optp < voff+consumed) {
+ optp = dissect_vendor_pxeclient_suboption(v_tree,
+ tvb, optp);
}
- break;
+ } else {
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s (%d bytes)", code, text, vlen);
+ }
+ 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 (pd[voff+1] == 7) {
- vti = add_item_to_tree(GTK_WIDGET(bp_tree), voff,
- consumed, "Option %d: %s", code, text);
- v_tree = gtk_tree_new();
- add_subtree(vti, v_tree, ETT_BOOTP_OPTION);
- add_item_to_tree(v_tree, voff+2, 1,
- "Hardware type: 0x%02x", pd[voff+2]);
- add_item_to_tree(v_tree, voff+3, 6,
- "Client hardware address: %s",
- ether_to_str((guint8*)&pd[voff+3]));
+ case 46: /* NetBIOS-over-TCP/IP Node Type */
+ byte = tvb_get_guint8(tvb, voff+2);
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ val_to_str(byte, nbnt_vals,
+ "Unknown (0x%02x)"));
+ break;
+
+ case 53: /* DHCP Message Type */
+ proto_tree_add_text(bp_tree, tvb, voff, 3, "Option %d: %s = DHCP %s",
+ code, text, get_dhcp_type(tvb_get_guint8(tvb, voff+2)));
+ break;
+
+ case 55: /* Parameter Request List */
+ vti = proto_tree_add_text(bp_tree, tvb, 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 = tvb_get_guint8(tvb, voff+2+i);
+ if (byte < NUM_OPT_INFOS) {
+ proto_tree_add_text(v_tree, tvb, voff+2+i, 1, "%d = %s",
+ byte, opt[byte].text);
+ } else {
+ proto_tree_add_text(vti, tvb, voff+2+i, 1,
+ "Unknown Option Code: %d", byte);
}
+ }
+ break;
+
+ case 60: /* Vendor class identifier */
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = \"%.*s\"", code, text,
+vlen,
+ tvb_get_ptr(tvb, voff+2, consumed-2));
+ 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) {
+ guint8 htype;
+
+ vti = proto_tree_add_text(bp_tree, tvb, voff,
+ consumed, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ htype = tvb_get_guint8(tvb, voff+2);
+ proto_tree_add_text(v_tree, tvb, voff+2, 1,
+ "Hardware type: %s",
+ arphrdtype_to_str(htype,
+ "Unknown (0x%02x)"));
+ proto_tree_add_text(v_tree, tvb, voff+3, 6,
+ "Client hardware address: %s",
+ arphrdaddr_to_str(tvb_get_ptr(tvb, voff+3, 6),
+ 6, htype));
+ } else {
/* otherwise, it's opaque data */
- else {
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s (%d bytes)", code, text, vlen);
- }
- break;
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s (%d bytes)", code, text, vlen);
+ }
+ break;
- /* End Option */
- case 255:
- add_item_to_tree(bp_tree, voff, 1, "End Option");
- consumed = 1;
- return consumed;
+ case 63: /* NetWare/IP options */
+ vti = proto_tree_add_text(bp_tree, tvb, 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, tvb, optp);
+ break;
+
+ case 82: /* Relay Agent Information Option */
+ vti = proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s (%d bytes)",
+ code, text, vlen);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ optp = voff+2;
+ while (optp < voff+consumed) {
+ optp = bootp_dhcp_decode_agent_info(v_tree, tvb, optp);
+ }
+ break;
+
+ case 210: /* DHCP Authentication */
+ vti = proto_tree_add_text(bp_tree, tvb, voff,
+ vlen + 2, "Option %d: %s", code, text);
+ v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ proto_tree_add_text(v_tree, tvb, voff+2, 1, "Protocol: %d",
+ tvb_get_guint8(tvb, voff+2));
+ proto_tree_add_text(v_tree, tvb, voff+3, 1, "Algorithm: %d",
+ tvb_get_guint8(tvb, voff+3));
+ proto_tree_add_text(v_tree, tvb, voff+4, 1, "Replay Detection Method: %d",
+ tvb_get_guint8(tvb, voff+4));
+ /*
+ * XXX:
+ *
+ * 1) this won't compile if you have a compiler that
+ * doesn't support 64-bit integral quantities;
+ *
+ * 2) there is no standard for the printf format to
+ * be used for 64-bit integral quantities, so
+ * this may not display correctly.
+ *
+ * We need to figure out how to handle 64-bit integral
+ * quantities portably, with some form of fallback if
+ * the compiler doesn't support it, and some way of
+ * handling "%ll{d,o,x}" (most platforms) vs. "%q{d,o.x}"
+ * (FreeBSD, perhaps some versions of other BSDs) vs.
+ * "sorry, we're an LP64 platform, %l{d,o,x} is good enough
+ * for you" (Digital UNIX).
+ */
+ proto_tree_add_text(v_tree, tvb, voff+5, 8, "Replay Detection Value: %0llX",
+ tvb_get_ntohll(tvb, voff+5));
+ if (vlen > 11) {
+ proto_tree_add_text(v_tree, tvb, voff+13, 4, "Secret ID: %0X",
+ tvb_get_ntohl(tvb, voff+13));
+ md5_ptr = tvb_get_ptr(tvb, voff+17, 16);
+ for (i=0; i<16; i++)
+ sprintf(&(md5_str[i*3]), "%02X ", (guint8) md5_ptr[i]);
+ md5_str[48] = 0;
+ proto_tree_add_text(v_tree, tvb, voff+17, 16, "HMAC MD5 Hash: %s", md5_str);
+ }
+ break;
+
+ default: /* not special */
+ break;
}
/* Normal cases */
- consumed = vlen + 2;
if (code < NUM_OPT_INFOS) {
text = opt[code].text;
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) {
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- ip_to_str((guint8*)&pd[voff+2]));
- }
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ ip_to_str(tvb_get_ptr(tvb, voff+2, 4)));
+ } else {
/* > 1 IP addresses. Let's make a sub-tree */
- else {
-
- vti = add_item_to_tree(GTK_WIDGET(bp_tree), voff,
- consumed, "Option %d: %s", code, text);
- v_tree = gtk_tree_new();
- add_subtree(vti, v_tree, ETT_BOOTP_OPTION);
- for (i = voff + 2; i < voff + consumed; i += 4) {
- add_item_to_tree(v_tree, i, 4, "IP Address: %s",
- ip_to_str((guint8*)&pd[i]));
- }
+ vti = proto_tree_add_text(bp_tree, tvb, 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, tvb, i, 4, "IP Address: %s",
+ ip_to_str(tvb_get_ptr(tvb, i, 4)));
}
- break;
+ }
+ break;
- case string:
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = %.*s", code, text, pd[voff+2], &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, tvb, voff, consumed,
+ "Option %d: %s = \"%.*s\"", code, text, vlen,
+ tvb_get_ptr(tvb, voff+2, consumed-2));
+ break;
- case opaque:
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s (%d bytes)",
- code, text, vlen);
- break;
+ case opaque:
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s (%d bytes)",
+ code, text, vlen);
+ break;
- case val_u_short:
- /* one IP address */
- if (vlen == 2) {
- add_item_to_tree(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, tvb, voff, consumed,
+ "Option %d: %s = %d", code, text,
+ tvb_get_ntohs(tvb, voff+2));
+ } else {
/* > 1 u_short */
- else {
- vti = add_item_to_tree(GTK_WIDGET(bp_tree), voff,
- consumed, "Option %d: %s", code, text);
- v_tree = gtk_tree_new();
- add_subtree(vti, v_tree, ETT_BOOTP_OPTION);
- for (i = voff + 2; i < voff + consumed; i += 2) {
- add_item_to_tree(v_tree, i, 4, "Value: %d",
- pntohs(&pd[i]));
- }
+ vti = proto_tree_add_text(bp_tree, tvb, 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, tvb, i, 4, "Value: %d",
+ tvb_get_ntohs(tvb, i));
}
- break;
+ }
+ break;
- case val_u_long:
- add_item_to_tree(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, tvb, voff, consumed,
+ "Option %d: %s = %d", code, text,
+ tvb_get_ntohl(tvb, voff+2));
+ break;
- case val_u_byte:
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = %d", code, text, pd[voff+2]);
- break;
+ case val_u_byte:
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = %d", code, text,
+ tvb_get_guint8(tvb, voff+2));
+ break;
- case toggle:
- i = pd[voff+2];
- if (i != 0 && i != 1) {
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = Invalid Value %d", code, text,
- pd[voff+2]);
- }
- else {
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- pd[voff+2] == 0 ? "Disabled" : "Enabled");
- }
- break;
+ case toggle:
+ i = tvb_get_guint8(tvb, voff+2);
+ if (i != 0 && i != 1) {
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = Invalid Value %d", code, text,
+ i);
+ } else {
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ i == 0 ? "Disabled" : "Enabled");
+ }
+ break;
- case yes_no:
- i = pd[voff+2];
- if (i != 0 && i != 1) {
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = Invalid Value %d", code, text,
- pd[voff+2]);
- }
- else {
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s = %s", code, text,
- pd[voff+2] == 0 ? "No" : "Yes");
- }
- break;
+ case yes_no:
+ i = tvb_get_guint8(tvb, voff+2);
+ if (i != 0 && i != 1) {
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = Invalid Value %d", code, text,
+ i);
+ } else {
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ i == 0 ? "No" : "Yes");
+ }
+ break;
+
+ case time_in_secs:
+ time_secs = tvb_get_ntohl(tvb, voff+2);
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s = %s", code, text,
+ ((time_secs == 0xffffffff) ?
+ "infinity" :
+ time_secs_to_str(time_secs)));
+ break;
- default:
- add_item_to_tree(bp_tree, voff, consumed,
- "Option %d: %s (%d bytes)", code, text, vlen);
+ default:
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
+ "Option %d: %s (%d bytes)", code, text, vlen);
}
- }
- else {
- add_item_to_tree(bp_tree, voff, consumed,
+ } else {
+ proto_tree_add_text(bp_tree, tvb, voff, consumed,
"Unknown Option Code: %d (%d bytes)", code, vlen);
}
return consumed;
}
-void
-dissect_bootp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree)
+static int
+bootp_dhcp_decode_agent_info(proto_tree *v_tree, tvbuff_t *tvb, int optp)
{
- GtkWidget *bp_tree, *ti;
- int voff, eoff; /* vender offset, end offset */
+ guint8 subopt;
+ guint8 subopt_len;
+
+ subopt = tvb_get_guint8(tvb, optp);
+ subopt_len = tvb_get_guint8(tvb, optp+1);
+ switch (subopt) {
+ case 1:
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len + 2,
+ "Agent Circuit ID (%d bytes)", subopt_len);
+ break;
+ case 2:
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len + 2,
+ "Agent Remote ID (%d bytes)", subopt_len);
+ break;
+ default:
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len + 2,
+ "Unknown agent option: %d", subopt);
+ break;
+ }
+ optp += (subopt_len + 2);
+ return optp;
+}
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "BOOTP");
+static int
+dissect_vendor_pxeclient_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp)
+{
+ guint8 subopt;
+ guint8 subopt_len;
+ int slask;
+ proto_tree *o43pxeclient_v_tree;
+ proto_item *vti;
- if (check_col(fd, COL_INFO)) {
- /* if hwaddr is 6 bytes, assume MAC */
- if (pd[offset] == 1 && pd[offset+2] == 6) {
- col_add_fstr(fd, COL_INFO, "Boot Request from %s",
- ether_to_str((guint8*)&pd[offset+28]));
+ struct o43pxeclient_opt_info {
+ char *text;
+ enum field_type ft;
+ };
+
+ static struct o43pxeclient_opt_info o43pxeclient_opt[]= {
+ /* 0 */ {"nop", special}, /* dummy */
+ /* 1 */ {"PXE mtftp IP", ipv4},
+ /* 2 */ {"PXE mtftp client port", val_u_le_short},
+ /* 3 */ {"PXE mtftp server port",val_u_le_short},
+ /* 4 */ {"PXE mtftp timeout", val_u_byte},
+ /* 5 */ {"PXE mtftp delay", val_u_byte},
+ /* 6 */ {"PXE discovery control", val_u_byte},
+ /*
+ * Correct: b0 (lsb): disable broadcast discovery
+ * b1: disable multicast discovery
+ * b2: only use/accept servers in boot servers
+ * b3: download bootfile without prompt/menu/disc
+ */
+ /* 7 */ {"PXE multicast address", ipv4},
+ /* 8 */ {"PXE boot servers", special},
+ /* 9 */ {"PXE boot menu", special},
+ /* 10 */ {"PXE menu prompt", special},
+ /* 11 */ {"PXE multicast address alloc", special},
+ /* 12 */ {"PXE credential types", special},
+ /* 71 {"PXE boot item", special} */
+ /* 255 {"PXE end options", special} */
+ };
+#define NUM_O43PXECLIENT_SUBOPTS (12)
+
+ subopt = tvb_get_guint8(tvb, optp);
+
+ if (subopt == 0 ) {
+ proto_tree_add_text(v_tree, tvb, optp, 1, "Padding");
+ return (optp+1);
+ } else if (subopt == 255) { /* End Option */
+ proto_tree_add_text(v_tree, tvb, optp, 1, "End PXEClient option");
+ /* Make sure we skip any junk left this option */
+ return (optp+255);
+ }
+
+ subopt_len = tvb_get_guint8(tvb, optp+1);
+
+ if ( subopt == 71 ) { /* 71 {"PXE boot item", special} */
+ /* case special */
+ /* I may need to decode that properly one day */
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2,
+ "Suboption %d: %s (%d byte%s)" ,
+ subopt, "PXE boot item",
+ subopt_len, (subopt_len != 1)?"s":"");
+ } else if ( (subopt < 1 ) || (subopt > NUM_O43PXECLIENT_SUBOPTS) ) {
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2,
+ "Unknown suboption %d (%d byte%s)", subopt, subopt_len,
+ (subopt_len != 1)?"s":"");
+ } else {
+ switch (o43pxeclient_opt[subopt].ft) {
+
+/* XXX case string:
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2,
+ "Suboption %d: %s", subopt, o43pxeclient_opt[subopt].text);
+ break;
+ XXX */
+ case special:
+ /* I may need to decode that properly one day */
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2,
+ "Suboption %d: %s (%d byte%s)" ,
+ subopt, o43pxeclient_opt[subopt].text,
+ subopt_len, (subopt_len != 1)?"s":"");
+ break;
+
+ case val_u_le_short:
+ proto_tree_add_text(v_tree, tvb, optp, 4, "Suboption %d: %s = %u",
+ subopt, o43pxeclient_opt[subopt].text,
+ tvb_get_letohs(tvb, optp+2));
+ break;
+
+ case val_u_byte:
+ proto_tree_add_text(v_tree, tvb, optp, 3, "Suboption %d: %s = %u",
+ subopt, o43pxeclient_opt[subopt].text,
+ tvb_get_guint8(tvb, optp+2));
+ break;
+
+ case ipv4:
+ if (subopt_len == 4) {
+ /* one IP address */
+ proto_tree_add_text(v_tree, tvb, optp, 6,
+ "Suboption %d : %s = %s",
+ subopt, o43pxeclient_opt[subopt].text,
+ ip_to_str(tvb_get_ptr(tvb, optp+2, 4)));
+ } else {
+ /* > 1 IP addresses. Let's make a sub-tree */
+ vti = proto_tree_add_text(v_tree, tvb, optp,
+ subopt_len+2, "Suboption %d: %s",
+ subopt, o43pxeclient_opt[subopt].text);
+ o43pxeclient_v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (slask = optp + 2 ; slask < optp+subopt_len; slask += 4) {
+ proto_tree_add_text(o43pxeclient_v_tree, tvb, slask, 4, "IP Address: %s",
+ ip_to_str(tvb_get_ptr(tvb, slask, 4)));
+ }
+ }
+ break;
+ default:
+ proto_tree_add_text(v_tree, tvb, optp, subopt_len+2,"ERROR, please report: Unknown subopt type handler %d", subopt);
+ break;
}
- else {
- col_add_str(fd, COL_INFO, pd[offset] == 1 ? "Boot Request" :
- "Boot Reply");
+ }
+ optp += (subopt_len + 2);
+ return optp;
+}
+
+static int
+dissect_netware_ip_suboption(proto_tree *v_tree, tvbuff_t *tvb, int optp)
+{
+ guint8 subopt;
+ guint8 subopt_len;
+ 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}
+ };
+
+ subopt = tvb_get_guint8(tvb, optp);
+ if (subopt > NUM_O63_SUBOPTS) {
+ proto_tree_add_text(v_tree, tvb,optp,1,"Unknown suboption %d", subopt);
+ optp++;
+ } else {
+ switch (o63_opt[subopt].ft) {
+
+ case string:
+ proto_tree_add_text(v_tree, tvb, optp, 2, "Suboption %d: %s", subopt, o63_opt[subopt].truet);
+ optp+=2;
+ break;
+
+ case yes_no:
+ if (tvb_get_guint8(tvb, optp+2)==1) {
+ proto_tree_add_text(v_tree, tvb, optp, 3, "Suboption %d: %s", subopt, o63_opt[subopt].truet);
+ } else {
+ proto_tree_add_text(v_tree, tvb, optp, 3, "Suboption %d: %s" , subopt, o63_opt[subopt].falset);
+ }
+ optp+=3;
+ break;
+
+ case special:
+ proto_tree_add_text(v_tree, tvb, optp, 6,
+ "Suboption %d: %s = %s" ,
+ subopt, o63_opt[subopt].truet,
+ ip_to_str(tvb_get_ptr(tvb, optp+2, 4)));
+ optp=optp+6;
+ break;
+
+ case val_u_short:
+ proto_tree_add_text(v_tree, tvb, optp, 3, "Suboption %d: %s = %u",
+ subopt, o63_opt[subopt].truet,
+ tvb_get_guint8(tvb, optp+2)); /* XXX - 1 byte? */
+ optp+=3;
+ break;
+
+ case ipv4:
+ subopt_len = tvb_get_guint8(tvb, optp+1);
+ if (subopt_len == 4) {
+ /* one IP address */
+ proto_tree_add_text(v_tree, tvb, optp, 6,
+ "Suboption %d : %s = %s",
+ subopt, o63_opt[subopt].truet,
+ ip_to_str(tvb_get_ptr(tvb, optp+2, 4)));
+ optp=optp+6;
+ } else {
+ /* > 1 IP addresses. Let's make a sub-tree */
+ vti = proto_tree_add_text(v_tree, tvb, optp,
+ subopt_len+2, "Suboption %d: %s",
+ subopt, o63_opt[subopt].truet);
+ o63_v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+ for (slask = optp + 2 ; slask < optp+subopt_len; slask += 4) {
+ proto_tree_add_text(o63_v_tree, tvb, slask, 4, "IP Address: %s",
+ ip_to_str(tvb_get_ptr(tvb, slask, 4)));
+ }
+ optp=slask;
+ }
+ break;
+ default:
+ proto_tree_add_text(v_tree, tvb,optp,1,"Unknown suboption %d", subopt);
+ optp++;
+ break;
+ }
+ }
+ return optp;
+}
+
+#define BOOTREQUEST 1
+#define BOOTREPLY 2
+
+static const value_string op_vals[] = {
+ { BOOTREQUEST, "Boot Request" },
+ { BOOTREPLY, "Boot Reply" },
+ { 0, NULL }
+};
+
+static void
+dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ proto_tree *bp_tree = NULL;
+ proto_item *ti;
+ guint8 op;
+ guint8 htype, hlen;
+ const guint8 *haddr;
+ int voff, eoff, tmpvoff; /* vender offset, end offset */
+ guint32 ip_addr;
+ gboolean is_dhcp = FALSE;
+ const char *dhcp_type;
+
+ if (check_col(pinfo->fd, COL_PROTOCOL))
+ col_set_str(pinfo->fd, COL_PROTOCOL, "BOOTP");
+ if (check_col(pinfo->fd, COL_INFO)) {
+ /*
+ * In case we throw an exception fetching the opcode, etc.
+ */
+ col_clear(pinfo->fd, COL_INFO);
+ }
+
+ op = tvb_get_guint8(tvb, 0);
+ htype = tvb_get_guint8(tvb, 1);
+ hlen = tvb_get_guint8(tvb, 2);
+ if (check_col(pinfo->fd, COL_INFO)) {
+ switch (op) {
+
+ case BOOTREQUEST:
+ col_add_fstr(pinfo->fd, COL_INFO, "Boot Request from %s",
+ arphrdaddr_to_str(tvb_get_ptr(tvb, 28, hlen),
+ hlen, htype));
+ break;
+
+ case BOOTREPLY:
+ col_set_str(pinfo->fd, COL_INFO, "Boot Reply");
+ break;
+
+ default:
+ col_add_fstr(pinfo->fd, COL_INFO, "Unknown BOOTP message type (%u)",
+ op);
+ break;
}
}
if (tree) {
- ti = add_item_to_tree(GTK_WIDGET(tree), offset, END_OF_FRAME,
- "Bootstrap Protocol");
- bp_tree = gtk_tree_new();
- add_subtree(ti, bp_tree, ETT_BOOTP);
-
- add_item_to_tree(bp_tree, offset, 1, pd[offset] == 1 ?
- "Boot Request" : "Boot Reply");
- add_item_to_tree(bp_tree, offset + 1, 1,
- "Hardware type: 0x%02x", pd[offset+1]);
- add_item_to_tree(bp_tree, offset + 2, 1,
- "Hardware address length: %d", pd[offset+2]);
- add_item_to_tree(bp_tree, offset + 3, 1,
- "Hops: %d", pd[offset+3]);
- add_item_to_tree(bp_tree, offset + 4, 4,
- "Transaction ID: 0x%08x", pntohl(&pd[offset+4]));
- add_item_to_tree(bp_tree, offset + 8, 2,
- "Seconds elapsed: %d", pntohs(&pd[offset+8]));
- add_item_to_tree(bp_tree, offset + 10, 2,
- "Broadcast flag: %d", pd[offset+10] & 1);
- add_item_to_tree(bp_tree, offset + 12, 4,
- "Client IP address: %s", ip_to_str((guint8*)&pd[offset+12]));
- add_item_to_tree(bp_tree, offset + 16, 4,
- "Your (client) IP address: %s", ip_to_str((guint8*)&pd[offset+16]));
- add_item_to_tree(bp_tree, offset + 20, 4,
- "Next server IP address: %s", ip_to_str((guint8*)&pd[offset+20]));
- add_item_to_tree(bp_tree, offset + 24, 4,
- "Relay agent IP address: %s", ip_to_str((guint8*)&pd[offset+24]));
-
- /* If HW address is 6 bytes, assume MAC. */
- if (pd[offset+2] == 6) {
- add_item_to_tree(bp_tree, offset + 28, 6,
- "Client hardware address: %s",
- ether_to_str((guint8*)&pd[offset+28]));
+ ti = proto_tree_add_item(tree, proto_bootp, tvb, 0,
+ tvb_length(tvb), FALSE);
+ bp_tree = proto_item_add_subtree(ti, ett_bootp);
+
+ proto_tree_add_uint(bp_tree, hf_bootp_type, tvb,
+ 0, 1,
+ op);
+ proto_tree_add_uint_format(bp_tree, hf_bootp_hw_type, tvb,
+ 1, 1,
+ htype,
+ "Hardware type: %s",
+ arphrdtype_to_str(htype,
+ "Unknown (0x%02x)"));
+ proto_tree_add_uint(bp_tree, hf_bootp_hw_len, tvb,
+ 2, 1, hlen);
+ proto_tree_add_item(bp_tree, hf_bootp_hops, tvb,
+ 3, 1, FALSE);
+ proto_tree_add_item(bp_tree, hf_bootp_id, tvb,
+ 4, 4, FALSE);
+ proto_tree_add_item(bp_tree, hf_bootp_secs, tvb,
+ 8, 2, FALSE);
+ proto_tree_add_uint(bp_tree, hf_bootp_flag, tvb,
+ 10, 2, tvb_get_ntohs(tvb, 10) & 0x8000);
+
+ proto_tree_add_item(bp_tree, hf_bootp_ip_client, tvb,
+ 12, 4, FALSE);
+ proto_tree_add_item(bp_tree, hf_bootp_ip_your, tvb,
+ 16, 4, FALSE);
+ proto_tree_add_item(bp_tree, hf_bootp_ip_server, tvb,
+ 20, 4, FALSE);
+ proto_tree_add_item(bp_tree, hf_bootp_ip_relay, tvb,
+ 24, 4, FALSE);
+
+ if (hlen > 0) {
+ haddr = tvb_get_ptr(tvb, 28, hlen);
+ proto_tree_add_bytes_format(bp_tree, hf_bootp_hw_addr, tvb,
+ 28, hlen,
+ haddr,
+ "Client hardware address: %s",
+ arphrdaddr_to_str(haddr,
+ hlen,
+ htype));
}
else {
- add_item_to_tree(bp_tree, offset + 28, 16,
- "Client hardware address: %02x:%02x%02x:%02x:%02x:%02x:%02x:%02x%02x:%02x%02x:%02x:%02x:%02x:%02x:%02x",
- pd[offset+28], pd[offset+29], pd[offset+30], pd[offset+31],
- pd[offset+32], pd[offset+33], pd[offset+34], pd[offset+35],
- pd[offset+36], pd[offset+37], pd[offset+38], pd[offset+39],
- pd[offset+40], pd[offset+41], pd[offset+42], pd[offset+43]);
+ proto_tree_add_text(bp_tree, tvb,
+ 28, 0, "Client address not given");
}
/* The server host name is optional */
- if (pd[offset+44]) {
- add_item_to_tree(bp_tree, offset + 44, 64,
- "Server host name: %s", &pd[offset+44]);
+ if (tvb_get_guint8(tvb, 44) != '\0') {
+ proto_tree_add_item(bp_tree, hf_bootp_server, tvb,
+ 44, 64, FALSE);
}
else {
- add_item_to_tree(bp_tree, offset + 44, 64,
- "Server host name not given");
+ proto_tree_add_string_format(bp_tree, hf_bootp_server, tvb,
+ 44, 64,
+ tvb_get_ptr(tvb, 44, 1),
+ "Server host name not given");
}
/* Boot file */
- if (pd[offset+108]) {
- add_item_to_tree(bp_tree, offset + 108, 128,
- "Boot file name: %s", &pd[offset+108]);
+ if (tvb_get_guint8(tvb, 108) != '\0') {
+ proto_tree_add_item(bp_tree, hf_bootp_file, tvb,
+ 108, 128, FALSE);
}
else {
- add_item_to_tree(bp_tree, offset + 108, 128,
- "Boot file name not given");
+ proto_tree_add_string_format(bp_tree, hf_bootp_file, tvb,
+ 108, 128,
+ tvb_get_ptr(tvb, 108, 1),
+ "Boot file name not given");
}
- if (pntohl(&pd[offset+236]) == 0x63538263) {
- add_item_to_tree(bp_tree, offset + 236, 4,
- "Magic cookie: %s (generic)",
- ip_to_str((guint8*)&pd[offset+236]));
+ tvb_memcpy(tvb, (void *)&ip_addr, 236, sizeof(ip_addr));
+ if (tvb_get_ntohl(tvb, 236) == 0x63825363) {
+ proto_tree_add_ipv4_format(bp_tree, hf_bootp_cookie, tvb,
+ 236, 4, ip_addr,
+ "Magic cookie: (OK)");
}
else {
- add_item_to_tree(bp_tree, offset + 236, 4,
- "Magic cookie: %s",
- ip_to_str((guint8*)&pd[offset+236]));
+ proto_tree_add_ipv4(bp_tree, hf_bootp_cookie, tvb,
+ 236, 4, ip_addr);
}
+ }
- voff = offset+240;
- eoff = fd->cap_len;
-
- while (voff < eoff) {
- voff += bootp_option(pd, bp_tree, voff, eoff);
+ voff = 240;
+ eoff = tvb_reported_length(tvb);
+ /*
+ * If we are displaying the details, we need two passes:
+ * the first to find out about vendor specific options,
+ * the second to do the actual decoding (option 60 is needed
+ * to decode option 43 )
+ */
+ tmpvoff = voff;
+ if (bp_tree) {
+ while (tmpvoff < eoff )
+ tmpvoff += bootp_option(tvb, 0, tmpvoff, eoff);
+ }
+ while (voff < eoff) {
+ /* Handle the DHCP option specially here, so that we
+ can flag DHCP packets as such. */
+ if (!is_dhcp && tvb_get_guint8(tvb, voff) == 53) {
+ /*
+ * We haven't already seen a DHCP Type option, and
+ * this is a DHCP Type option, so flag this packet
+ * as DHCP.
+ */
+ dhcp_type = get_dhcp_type(tvb_get_guint8(tvb, voff+2));
+ if (check_col(pinfo->fd, COL_PROTOCOL))
+ col_set_str(pinfo->fd, COL_PROTOCOL, "DHCP");
+ if (check_col(pinfo->fd, COL_INFO))
+ col_add_fstr(pinfo->fd, COL_INFO, "DHCP %-8s - Transaction ID 0x%x",
+ dhcp_type, tvb_get_ntohl(tvb, 4));
+ if (tree)
+ proto_tree_add_boolean_hidden(bp_tree, hf_bootp_dhcp,
+ tvb, 0, 0, 1);
+ is_dhcp = TRUE;
}
+ voff += bootp_option(tvb, bp_tree, voff, eoff);
}
}
+void
+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_DEC, VALS(op_vals), 0x0,
+ "" }},
+
+ { &hf_bootp_hw_type,
+ { "Hardware type", "bootp.hw.type", FT_UINT8,
+ BASE_HEX, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_hw_len,
+ { "Hardware address length", "bootp.hw.len", FT_UINT8,
+ BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_hops,
+ { "Hops", "bootp.hops", FT_UINT8,
+ BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_id,
+ { "Transaction ID", "bootp.id", FT_UINT32,
+ BASE_HEX, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_secs,
+ { "Seconds elapsed", "bootp.secs", FT_UINT16,
+ BASE_DEC, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_flag,
+ { "Broadcast flag", "bootp.flag", FT_UINT16,
+ BASE_HEX, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_ip_client,
+ { "Client IP address", "bootp.ip.client",FT_IPv4,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_ip_your,
+ { "Your (client) IP address", "bootp.ip.your", FT_IPv4,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_ip_server,
+ { "Next server IP address", "bootp.ip.server",FT_IPv4,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_ip_relay,
+ { "Relay agent IP address", "bootp.ip.relay", FT_IPv4,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_hw_addr,
+ { "Client hardware address", "bootp.hw.addr", FT_BYTES,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_server,
+ { "Server host name", "bootp.server", FT_STRING,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_file,
+ { "Boot file name", "bootp.file", FT_STRING,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+
+ { &hf_bootp_cookie,
+ { "Magic cookie", "bootp.cookie", FT_IPv4,
+ BASE_NONE, NULL, 0x0,
+ "" }},
+ };
+ static gint *ett[] = {
+ &ett_bootp,
+ &ett_bootp_option,
+ };
+
+ proto_bootp = proto_register_protocol("Bootstrap Protocol", "BOOTP/DHCP",
+ "bootp");
+ proto_register_field_array(proto_bootp, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_bootp(void)
+{
+ dissector_add("udp.port", UDP_PORT_BOOTPS, dissect_bootp, proto_bootp);
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff