add Jaap K's extensions

also change one (of several:-( )  arrays to be accessed through accessor functions so proper bounds checking is done.


there are many other inbstances of arrays in this dissector that are accessed with no proper bounds checking and the same thing should be done for them




svn path=/trunk/; revision=16891

1 files changed, 412 insertions, 349 deletions

diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index ff43b82fc1..0c39d625ae 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -275,6 +275,299 @@ static const true_false_string yes_no_tfs = {
 	"No"
 };
 
+static const value_string bootp_nbnt_vals[] = {
+    {0x1,   "B-node" },
+    {0x2,   "P-node" },
+    {0x4,   "M-node" },
+    {0x8,   "H-node" },
+    {0,     NULL     } 
+};
+
+
+static struct opt_info bootp_opt[] = {
+/*   0 */ { "Padding",					none, NULL },
+/*   1 */ { "Subnet Mask",				ipv4, NULL },
+/*   2 */ { "Time Offset",				time_in_secs, NULL },
+/*   3 */ { "Router",					ipv4_list, NULL },
+/*   4 */ { "Time Server",				ipv4_list, NULL },
+/*   5 */ { "Name Server",				ipv4_list, NULL },
+/*   6 */ { "Domain Name Server",			ipv4_list, NULL },
+/*   7 */ { "Log Server",				ipv4_list, NULL },
+/*   8 */ { "Cookie Server",				ipv4_list, NULL },
+/*   9 */ { "LPR Server",				ipv4_list, NULL },
+/*  10 */ { "Impress Server",				ipv4_list, NULL },
+/*  11 */ { "Resource Location Server",			ipv4_list, NULL },
+/*  12 */ { "Host Name",				string, NULL },
+/*  13 */ { "Boot File Size",				val_u_short, NULL },
+/*  14 */ { "Merit Dump File",				string, NULL },
+/*  15 */ { "Domain Name",				string, NULL },
+/*  16 */ { "Swap Server",				ipv4, NULL },
+/*  17 */ { "Root Path",				string, NULL },
+/*  18 */ { "Extensions Path",				string, NULL },
+/*  19 */ { "IP Forwarding",				val_boolean, TFS(&toggle_tfs) },
+/*  20 */ { "Non-Local Source Routing",			val_boolean, TFS(&toggle_tfs) },
+/*  21 */ { "Policy Filter",				special, NULL },
+/*  22 */ { "Maximum Datagram Reassembly Size",		val_u_short, NULL },
+/*  23 */ { "Default IP Time-to-Live",			val_u_byte, NULL },
+/*  24 */ { "Path MTU Aging Timeout",			time_in_secs, NULL },
+/*  25 */ { "Path MTU Plateau Table",			val_u_short_list, NULL },
+/*  26 */ { "Interface MTU",				val_u_short, NULL },
+/*  27 */ { "All Subnets are Local",			val_boolean, TFS(&yes_no_tfs) },
+/*  28 */ { "Broadcast Address",			ipv4, NULL },
+/*  29 */ { "Perform Mask Discovery",			val_boolean, TFS(&toggle_tfs) },
+/*  30 */ { "Mask Supplier",				val_boolean, TFS(&yes_no_tfs) },
+/*  31 */ { "Perform Router Discover",			val_boolean, TFS(&toggle_tfs) },
+/*  32 */ { "Router Solicitation Address",		ipv4, NULL },
+/*  33 */ { "Static Route",				special, NULL },
+/*  34 */ { "Trailer Encapsulation",			val_boolean, TFS(&toggle_tfs) },
+/*  35 */ { "ARP Cache Timeout",			time_in_secs, NULL },
+/*  36 */ { "Ethernet Encapsulation",			val_boolean, TFS(&toggle_tfs) },
+/*  37 */ { "TCP Default TTL", 				val_u_byte, NULL },
+/*  38 */ { "TCP Keepalive Interval",			time_in_secs, NULL },
+/*  39 */ { "TCP Keepalive Garbage",			val_boolean, TFS(&toggle_tfs) },
+/*  40 */ { "Network Information Service Domain",	string, NULL },
+/*  41 */ { "Network Information Service Servers",	ipv4_list, NULL },
+/*  42 */ { "Network Time Protocol Servers",		ipv4_list, NULL },
+/*  43 */ { "Vendor-Specific Information",		special, NULL },
+/*  44 */ { "NetBIOS over TCP/IP Name Server",		ipv4_list, NULL },
+/*  45 */ { "NetBIOS over TCP/IP Datagram Distribution Name Server", ipv4_list, NULL },
+/*  46 */ { "NetBIOS over TCP/IP Node Type",		val_u_byte, VALS(bootp_nbnt_vals) },
+/*  47 */ { "NetBIOS over TCP/IP Scope",		string, NULL },
+/*  48 */ { "X Window System Font Server",		ipv4_list, NULL },
+/*  49 */ { "X Window System Display Manager",		ipv4_list, NULL },
+/*  50 */ { "Requested IP Address",			ipv4, NULL },
+/*  51 */ { "IP Address Lease Time",			time_in_secs, NULL },
+/*  52 */ { "Option Overload",				special, NULL },
+/*  53 */ { "DHCP Message Type",			special, NULL },
+/*  54 */ { "Server Identifier",			ipv4, NULL },
+/*  55 */ { "Parameter Request List",			special, NULL },
+/*  56 */ { "Message",					string, NULL },
+/*  57 */ { "Maximum DHCP Message Size",		val_u_short, NULL },
+/*  58 */ { "Renewal Time Value",			time_in_secs, NULL },
+/*  59 */ { "Rebinding Time Value",			time_in_secs, NULL },
+/*  60 */ { "Vendor class identifier",			special, NULL },
+/*  61 */ { "Client identifier",			special, NULL },
+/*  62 */ { "Novell/Netware IP domain",			string, NULL },
+/*  63 */ { "Novell Options",				special, NULL },
+/*  64 */ { "Network Information Service+ Domain",	string, NULL },
+/*  65 */ { "Network Information Service+ Servers",	ipv4_list, NULL },
+/*  66 */ { "TFTP Server Name",				string, NULL },
+/*  67 */ { "Bootfile name",				string, NULL },
+/*  68 */ { "Mobile IP Home Agent",			ipv4_list, NULL },
+/*  69 */ { "SMTP Server",				ipv4_list, NULL },
+/*  70 */ { "POP3 Server",				ipv4_list, NULL },
+/*  71 */ { "NNTP Server",				ipv4_list, NULL },
+/*  72 */ { "Default WWW Server",			ipv4_list, NULL },
+/*  73 */ { "Default Finger Server",			ipv4_list, NULL },
+/*  74 */ { "Default IRC Server",			ipv4_list, NULL },
+/*  75 */ { "StreetTalk Server",			ipv4_list, NULL },
+/*  76 */ { "StreetTalk Directory Assistance Server",	ipv4_list, NULL },
+/*  77 */ { "User Class Information",			opaque, NULL },
+/*  78 */ { "Directory Agent Information",		special, NULL },
+/*  79 */ { "Service Location Agent Scope",		special, NULL },
+/*  80 */ { "Naming Authority",				opaque, NULL },
+/*  81 */ { "Client Fully Qualified Domain Name",	special, NULL },
+/*  82 */ { "Agent Information Option",                 special, NULL },
+/*  83 */ { "Unassigned",				opaque, NULL },
+/*  84 */ { "Unassigned",				opaque, NULL },
+/*  85 */ { "Novell Directory Services Servers",	special, NULL },
+/*  86 */ { "Novell Directory Services Tree Name",	string, NULL },
+/*  87 */ { "Novell Directory Services Context",	string, NULL },
+/*  88 */ { "IEEE 1003.1 POSIX Timezone",		opaque, NULL },
+/*  89 */ { "Fully Qualified Domain Name",		opaque, NULL },
+/*  90 */ { "Authentication",				special, NULL },
+/*  91 */ { "Vines TCP/IP Server Option",		opaque, NULL },
+/*  92 */ { "Server Selection Option",			opaque, NULL },
+/*  93 */ { "Client System Architecture",		opaque, NULL },
+/*  94 */ { "Client Network Device Interface",		opaque, NULL },
+/*  95 */ { "Lightweight Directory Access Protocol",	opaque, NULL },
+/*  96 */ { "IPv6 Transitions",				opaque, NULL },
+/*  97 */ { "UUID/GUID-based Client Identifier",	opaque, NULL },
+/*  98 */ { "Open Group's User Authentication",		opaque, NULL },
+/*  99 */ { "Unassigned",				opaque, NULL },
+/* 100 */ { "Printer Name",				opaque, NULL },
+/* 101 */ { "MDHCP multicast address",			opaque, NULL },
+/* 102 */ { "Removed/unassigned",			opaque, NULL },
+/* 103 */ { "Removed/unassigned",			opaque, NULL },
+/* 104 */ { "Removed/unassigned",			opaque, NULL },
+/* 105 */ { "Removed/unassigned",			opaque, NULL },
+/* 106 */ { "Removed/unassigned",			opaque, NULL },
+/* 107 */ { "Removed/unassigned",			opaque, NULL },
+/* 108 */ { "Swap Path Option",				opaque, NULL },
+/* 109 */ { "Unassigned",				opaque, NULL },
+/* 110 */ { "IPX Compability",				opaque, NULL },
+/* 111 */ { "Unassigned",				opaque, NULL },
+/* 112 */ { "NetInfo Parent Server Address",		ipv4_list, NULL },
+/* 113 */ { "NetInfo Parent Server Tag",		string, NULL },
+/* 114 */ { "URL",					opaque, NULL },
+/* 115 */ { "DHCP Failover Protocol",			opaque, NULL },
+/* 116 */ { "DHCP Auto-Configuration",			opaque, NULL },
+/* 117 */ { "Name Service Search",		       	opaque, NULL },
+/* 118 */ { "Subnet Selection Option",		       	ipv4_list, NULL },
+/* 119 */ { "Domain Search",				opaque, NULL },
+/* 120 */ { "SIP Servers",				opaque, NULL },
+/* 121 */ { "Classless Static Route",		       	opaque, NULL },
+/* 122 */ { "CableLabs Client Configuration",		opaque, NULL },
+/* 123 */ { "Unassigned",				opaque, NULL },
+/* 124 */ { "Unassigned",				opaque, NULL },
+/* 125 */ { "Unassigned",				opaque, NULL },
+/* 126 */ { "Extension",				opaque, NULL },
+/* 127 */ { "Extension",				opaque, NULL },
+/* 128 */ { "Private",					opaque, NULL },
+/* 129 */ { "Private",					opaque, NULL },
+/* 130 */ { "Private",					opaque, NULL },
+/* 131 */ { "Private",					opaque, NULL },
+/* 132 */ { "Private",					opaque, NULL },
+/* 133 */ { "Private",					opaque, NULL },
+/* 134 */ { "Private",					opaque, NULL },
+/* 135 */ { "Private",					opaque, NULL },
+/* 136 */ { "Private",					opaque, NULL },
+/* 137 */ { "Private",					opaque, NULL },
+/* 138 */ { "Private",					opaque, NULL },
+/* 139 */ { "Private",					opaque, NULL },
+/* 140 */ { "Private",					opaque, NULL },
+/* 141 */ { "Private",					opaque, NULL },
+/* 142 */ { "Private",					opaque, NULL },
+/* 143 */ { "Private",					opaque, NULL },
+/* 144 */ { "Private",					opaque, NULL },
+/* 145 */ { "Private",					opaque, NULL },
+/* 146 */ { "Private",					opaque, NULL },
+/* 147 */ { "Private",					opaque, NULL },
+/* 148 */ { "Private",					opaque, NULL },
+/* 149 */ { "Private",					opaque, NULL },
+/* 150 */ { "Private",					opaque, NULL },
+/* 151 */ { "Private",					opaque, NULL },
+/* 152 */ { "Private",					opaque, NULL },
+/* 153 */ { "Private",					opaque, NULL },
+/* 154 */ { "Private",					opaque, NULL },
+/* 155 */ { "Private",					opaque, NULL },
+/* 156 */ { "Private",					opaque, NULL },
+/* 157 */ { "Private",					opaque, NULL },
+/* 158 */ { "Private",					opaque, NULL },
+/* 159 */ { "Private",					opaque, NULL },
+/* 160 */ { "Private",					opaque, NULL },
+/* 161 */ { "Private",					opaque, NULL },
+/* 162 */ { "Private",					opaque, NULL },
+/* 163 */ { "Private",					opaque, NULL },
+/* 164 */ { "Private",					opaque, NULL },
+/* 165 */ { "Private",					opaque, NULL },
+/* 166 */ { "Private",					opaque, NULL },
+/* 167 */ { "Private",					opaque, NULL },
+/* 168 */ { "Private",					opaque, NULL },
+/* 169 */ { "Private",					opaque, NULL },
+/* 170 */ { "Private",					opaque, NULL },
+/* 171 */ { "Private",					opaque, NULL },
+/* 172 */ { "Private",					opaque, NULL },
+/* 173 */ { "Private",					opaque, NULL },
+/* 174 */ { "Private",					opaque, NULL },
+/* 175 */ { "Private",					opaque, NULL },
+/* 176 */ { "Private",					opaque, NULL },
+/* 177 */ { "Private",					opaque, NULL },
+/* 178 */ { "Private",					opaque, NULL },
+/* 179 */ { "Private",					opaque, NULL },
+/* 180 */ { "Private",					opaque, NULL },
+/* 181 */ { "Private",					opaque, NULL },
+/* 182 */ { "Private",					opaque, NULL },
+/* 183 */ { "Private",					opaque, NULL },
+/* 184 */ { "Private",					opaque, NULL },
+/* 185 */ { "Private",					opaque, NULL },
+/* 186 */ { "Private",					opaque, NULL },
+/* 187 */ { "Private",					opaque, NULL },
+/* 188 */ { "Private",					opaque, NULL },
+/* 189 */ { "Private",					opaque, NULL },
+/* 190 */ { "Private",					opaque, NULL },
+/* 191 */ { "Private",					opaque, NULL },
+/* 192 */ { "Private",					opaque, NULL },
+/* 193 */ { "Private",					opaque, NULL },
+/* 194 */ { "Private",					opaque, NULL },
+/* 195 */ { "Private",					opaque, NULL },
+/* 196 */ { "Private",					opaque, NULL },
+/* 197 */ { "Private",					opaque, NULL },
+/* 198 */ { "Private",					opaque, NULL },
+/* 199 */ { "Private",					opaque, NULL },
+/* 200 */ { "Private",					opaque, NULL },
+/* 201 */ { "Private",					opaque, NULL },
+/* 202 */ { "Private",					opaque, NULL },
+/* 203 */ { "Private",					opaque, NULL },
+/* 204 */ { "Private",					opaque, NULL },
+/* 205 */ { "Private",					opaque, NULL },
+/* 206 */ { "Private",					opaque, NULL },
+/* 207 */ { "Private",					opaque, NULL },
+/* 208 */ { "Private",					opaque, NULL },
+/* 209 */ { "Private",					opaque, NULL },
+/* 210 */ { "Authentication",				special, NULL },
+/* 211 */ { "Private",					opaque, NULL },
+/* 212 */ { "Private",					opaque, NULL },
+/* 213 */ { "Private",					opaque, NULL },
+/* 214 */ { "Private",					opaque, NULL },
+/* 215 */ { "Private",					opaque, NULL },
+/* 216 */ { "Private",					opaque, NULL },
+/* 217 */ { "Private",					opaque, NULL },
+/* 218 */ { "Private",					opaque, NULL },
+/* 219 */ { "Private",					opaque, NULL },
+/* 220 */ { "Private",					opaque, NULL },
+/* 221 */ { "Private",					opaque, NULL },
+/* 222 */ { "Private",					opaque, NULL },
+/* 223 */ { "Private",					opaque, NULL },
+/* 224 */ { "Private",					opaque, NULL },
+/* 225 */ { "Private",					opaque, NULL },
+/* 226 */ { "Private",					opaque, NULL },
+/* 227 */ { "Private",					opaque, NULL },
+/* 228 */ { "Private",					opaque, NULL },
+/* 229 */ { "Private",					opaque, NULL },
+/* 230 */ { "Private",					opaque, NULL },
+/* 231 */ { "Private",					opaque, NULL },
+/* 232 */ { "Private",					opaque, NULL },
+/* 233 */ { "Private",					opaque, NULL },
+/* 234 */ { "Private",					opaque, NULL },
+/* 235 */ { "Private",					opaque, NULL },
+/* 236 */ { "Private",					opaque, NULL },
+/* 237 */ { "Private",					opaque, NULL },
+/* 238 */ { "Private",					opaque, NULL },
+/* 239 */ { "Private",					opaque, NULL },
+/* 240 */ { "Private",					opaque, NULL },
+/* 241 */ { "Private",					opaque, NULL },
+/* 242 */ { "Private",					opaque, NULL },
+/* 243 */ { "Private",					opaque, NULL },
+/* 244 */ { "Private",					opaque, NULL },
+/* 245 */ { "Private",					opaque, NULL },
+/* 246 */ { "Private",					opaque, NULL },
+/* 247 */ { "Private",					opaque, NULL },
+/* 248 */ { "Private",					opaque, NULL },
+/* 249 */ { "Classless static routes",			opaque, NULL },
+/* 250 */ { "Private",					opaque, NULL },
+/* 251 */ { "Private",					opaque, NULL },
+/* 252 */ { "Proxy autodiscovery",			string, NULL },
+/* 253 */ { "Private",					opaque, NULL },
+/* 254 */ { "Private",					opaque, NULL },
+/* 255 */ { "Private",					opaque, NULL }
+};
+
+static const char *
+bootp_get_opt_text(unsigned int index)
+{
+	if(index>=(sizeof(bootp_opt)/sizeof(struct opt_info)))
+		return "unknown";
+	return bootp_opt[index].text;
+}
+
+static const void *
+bootp_get_opt_data(unsigned int index)
+{
+	if(index>=(sizeof(bootp_opt)/sizeof(struct opt_info)))
+		return NULL;
+	return bootp_opt[index].data;
+}
+
+static enum field_type
+bootp_get_opt_ftype(unsigned int index)
+{
+	if(index>=(sizeof(bootp_opt)/sizeof(struct opt_info)))
+		return none;
+	return bootp_opt[index].ftype;
+}
+
+
 /* Returns the number of bytes consumed by this option. */
 static int
 bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
@@ -301,13 +594,6 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 	gboolean		o52at_end;
 	gboolean		skip_opaque = FALSE;
 
-	static const value_string nbnt_vals[] = {
-	    {0x1,   "B-node" },
-	    {0x2,   "P-node" },
-	    {0x4,   "M-node" },
-	    {0x8,   "H-node" },
-	    {0,     NULL     } };
-
 	static const value_string slpda_vals[] = {
 	    {0x00,   "Dynamic Discovery" },
 	    {0x01,   "Static Discovery" },
@@ -338,220 +624,6 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 	    { OPT_OVERLOAD_BOTH,  "Boot file and server host names hold options" },
 	    { 0,                  NULL                                           } };
 
-	static struct opt_info opt[] = {
-		/*   0 */ { "Padding",					none, NULL },
-		/*   1 */ { "Subnet Mask",				ipv4, NULL },
-		/*   2 */ { "Time Offset",				time_in_secs, NULL },
-		/*   3 */ { "Router",					ipv4_list, NULL },
-		/*   4 */ { "Time Server",				ipv4_list, NULL },
-		/*   5 */ { "Name Server",				ipv4_list, NULL },
-		/*   6 */ { "Domain Name Server",			ipv4_list, NULL },
-		/*   7 */ { "Log Server",				ipv4_list, NULL },
-		/*   8 */ { "Cookie Server",				ipv4_list, NULL },
-		/*   9 */ { "LPR Server",				ipv4_list, NULL },
-		/*  10 */ { "Impress Server",				ipv4_list, NULL },
-		/*  11 */ { "Resource Location Server",			ipv4_list, NULL },
-		/*  12 */ { "Host Name",				string, NULL },
-		/*  13 */ { "Boot File Size",				val_u_short, NULL },
-		/*  14 */ { "Merit Dump File",				string, NULL },
-		/*  15 */ { "Domain Name",				string, NULL },
-		/*  16 */ { "Swap Server",				ipv4, NULL },
-		/*  17 */ { "Root Path",				string, NULL },
-		/*  18 */ { "Extensions Path",				string, NULL },
-		/*  19 */ { "IP Forwarding",				val_boolean, TFS(&toggle_tfs) },
-		/*  20 */ { "Non-Local Source Routing",			val_boolean, TFS(&toggle_tfs) },
-		/*  21 */ { "Policy Filter",				special, NULL },
-		/*  22 */ { "Maximum Datagram Reassembly Size",		val_u_short, NULL },
-		/*  23 */ { "Default IP Time-to-Live",			val_u_byte, NULL },
-		/*  24 */ { "Path MTU Aging Timeout",			time_in_secs, NULL },
-		/*  25 */ { "Path MTU Plateau Table",			val_u_short_list, NULL },
-		/*  26 */ { "Interface MTU",				val_u_short, NULL },
-		/*  27 */ { "All Subnets are Local",			val_boolean, TFS(&yes_no_tfs) },
-		/*  28 */ { "Broadcast Address",			ipv4, NULL },
-		/*  29 */ { "Perform Mask Discovery",			val_boolean, TFS(&toggle_tfs) },
-		/*  30 */ { "Mask Supplier",				val_boolean, TFS(&yes_no_tfs) },
-		/*  31 */ { "Perform Router Discover",			val_boolean, TFS(&toggle_tfs) },
-		/*  32 */ { "Router Solicitation Address",		ipv4, NULL },
-		/*  33 */ { "Static Route",				special, NULL },
-		/*  34 */ { "Trailer Encapsulation",			val_boolean, TFS(&toggle_tfs) },
-		/*  35 */ { "ARP Cache Timeout",			time_in_secs, NULL },
-		/*  36 */ { "Ethernet Encapsulation",			val_boolean, TFS(&toggle_tfs) },
-		/*  37 */ { "TCP Default TTL", 				val_u_byte, NULL },
-		/*  38 */ { "TCP Keepalive Interval",			time_in_secs, NULL },
-		/*  39 */ { "TCP Keepalive Garbage",			val_boolean, TFS(&toggle_tfs) },
-		/*  40 */ { "Network Information Service Domain",	string, NULL },
-		/*  41 */ { "Network Information Service Servers",	ipv4_list, NULL },
-		/*  42 */ { "Network Time Protocol Servers",		ipv4_list, NULL },
-		/*  43 */ { "Vendor-Specific Information",		special, NULL },
-		/*  44 */ { "NetBIOS over TCP/IP Name Server",		ipv4_list, NULL },
-		/*  45 */ { "NetBIOS over TCP/IP Datagram Distribution Name Server", ipv4_list, NULL },
-		/*  46 */ { "NetBIOS over TCP/IP Node Type",		val_u_byte, VALS(nbnt_vals) },
-		/*  47 */ { "NetBIOS over TCP/IP Scope",		string, NULL },
-		/*  48 */ { "X Window System Font Server",		ipv4_list, NULL },
-		/*  49 */ { "X Window System Display Manager",		ipv4_list, NULL },
-		/*  50 */ { "Requested IP Address",			ipv4, NULL },
-		/*  51 */ { "IP Address Lease Time",			time_in_secs, NULL },
-		/*  52 */ { "Option Overload",				special, NULL },
-		/*  53 */ { "DHCP Message Type",			special, NULL },
-		/*  54 */ { "Server Identifier",			ipv4, NULL },
-		/*  55 */ { "Parameter Request List",			special, NULL },
-		/*  56 */ { "Message",					string, NULL },
-		/*  57 */ { "Maximum DHCP Message Size",		val_u_short, NULL },
-		/*  58 */ { "Renewal Time Value",			time_in_secs, NULL },
-		/*  59 */ { "Rebinding Time Value",			time_in_secs, NULL },
-		/*  60 */ { "Vendor class identifier",			special, NULL },
-		/*  61 */ { "Client identifier",			special, NULL },
-		/*  62 */ { "Novell/Netware IP domain",			string, NULL },
-		/*  63 */ { "Novell Options",				special, NULL },
-		/*  64 */ { "Network Information Service+ Domain",	string, NULL },
-		/*  65 */ { "Network Information Service+ Servers",	ipv4_list, NULL },
-		/*  66 */ { "TFTP Server Name",				string, NULL },
-		/*  67 */ { "Bootfile name",				string, NULL },
-		/*  68 */ { "Mobile IP Home Agent",			ipv4_list, NULL },
-		/*  69 */ { "SMTP Server",				ipv4_list, NULL },
-		/*  70 */ { "POP3 Server",				ipv4_list, NULL },
-		/*  71 */ { "NNTP Server",				ipv4_list, NULL },
-		/*  72 */ { "Default WWW Server",			ipv4_list, NULL },
-		/*  73 */ { "Default Finger Server",			ipv4_list, NULL },
-		/*  74 */ { "Default IRC Server",			ipv4_list, NULL },
-		/*  75 */ { "StreetTalk Server",			ipv4_list, NULL },
-		/*  76 */ { "StreetTalk Directory Assistance Server",	ipv4_list, NULL },
-		/*  77 */ { "User Class Information",			opaque, NULL },
-		/*  78 */ { "Directory Agent Information",		special, NULL },
-		/*  79 */ { "Service Location Agent Scope",		special, NULL },
-		/*  80 */ { "Naming Authority",				opaque, NULL },
-		/*  81 */ { "Client Fully Qualified Domain Name",	special, NULL },
-		/*  82 */ { "Agent Information Option",                 special, NULL },
-		/*  83 */ { "Unassigned",				opaque, NULL },
-		/*  84 */ { "Unassigned",				opaque, NULL },
-		/*  85 */ { "Novell Directory Services Servers",	special, NULL },
-		/*  86 */ { "Novell Directory Services Tree Name",	string, NULL },
-		/*  87 */ { "Novell Directory Services Context",	string, NULL },
-		/*  88 */ { "IEEE 1003.1 POSIX Timezone",		opaque, NULL },
-		/*  89 */ { "Fully Qualified Domain Name",		opaque, NULL },
-		/*  90 */ { "Authentication",				special, NULL },
-		/*  91 */ { "Vines TCP/IP Server Option",		opaque, NULL },
-		/*  92 */ { "Server Selection Option",			opaque, NULL },
-		/*  93 */ { "Client System Architecture",		opaque, NULL },
-		/*  94 */ { "Client Network Device Interface",		opaque, NULL },
-		/*  95 */ { "Lightweight Directory Access Protocol",	opaque, NULL },
-		/*  96 */ { "IPv6 Transitions",				opaque, NULL },
-		/*  97 */ { "UUID/GUID-based Client Identifier",	opaque, NULL },
-		/*  98 */ { "Open Group's User Authentication",		opaque, NULL },
-		/*  99 */ { "Unassigned",				opaque, NULL },
-		/* 100 */ { "Printer Name",				opaque, NULL },
-		/* 101 */ { "MDHCP multicast address",			opaque, NULL },
-		/* 102 */ { "Removed/unassigned",			opaque, NULL },
-		/* 103 */ { "Removed/unassigned",			opaque, NULL },
-		/* 104 */ { "Removed/unassigned",			opaque, NULL },
-		/* 105 */ { "Removed/unassigned",			opaque, NULL },
-		/* 106 */ { "Removed/unassigned",			opaque, NULL },
-		/* 107 */ { "Removed/unassigned",			opaque, NULL },
-		/* 108 */ { "Swap Path Option",				opaque, NULL },
-		/* 109 */ { "Unassigned",				opaque, NULL },
-		/* 110 */ { "IPX Compability",				opaque, NULL },
-		/* 111 */ { "Unassigned",				opaque, NULL },
-		/* 112 */ { "NetInfo Parent Server Address",		ipv4_list, NULL },
-		/* 113 */ { "NetInfo Parent Server Tag",		string, NULL },
-		/* 114 */ { "URL",					opaque, NULL },
-		/* 115 */ { "DHCP Failover Protocol",			opaque, NULL },
-		/* 116 */ { "DHCP Auto-Configuration",			opaque, NULL },
-		/* 117 */ { "Name Service Search",		       	opaque, NULL },
-		/* 118 */ { "Subnet Selection Option",		       	ipv4_list, NULL },
-		/* 119 */ { "Domain Search",				opaque, NULL },
-		/* 120 */ { "SIP Servers",				opaque, NULL },
-		/* 121 */ { "Classless Static Route",		       	opaque, NULL },
-		/* 122 */ { "CableLabs Client Configuration",		opaque, NULL },
-		/* 123 */ { "Unassigned",				opaque, NULL },
-		/* 124 */ { "Unassigned",				opaque, NULL },
-		/* 125 */ { "Unassigned",				opaque, NULL },
-		/* 126 */ { "Extension",				opaque, NULL },
-		/* 127 */ { "Extension",				opaque, NULL },
-		/* 128 */ { "Private",					opaque, NULL },
-		/* 129 */ { "Private",					opaque, NULL },
-		/* 130 */ { "Private",					opaque, NULL },
-		/* 131 */ { "Private",					opaque, NULL },
-		/* 132 */ { "Private",					opaque, NULL },
-		/* 133 */ { "Private",					opaque, NULL },
-		/* 134 */ { "Private",					opaque, NULL },
-		/* 135 */ { "Private",					opaque, NULL },
-		/* 136 */ { "Private",					opaque, NULL },
-		/* 137 */ { "Private",					opaque, NULL },
-		/* 138 */ { "Private",					opaque, NULL },
-		/* 139 */ { "Private",					opaque, NULL },
-		/* 140 */ { "Private",					opaque, NULL },
-		/* 141 */ { "Private",					opaque, NULL },
-		/* 142 */ { "Private",					opaque, NULL },
-		/* 143 */ { "Private",					opaque, NULL },
-		/* 144 */ { "Private",					opaque, NULL },
-		/* 145 */ { "Private",					opaque, NULL },
-		/* 146 */ { "Private",					opaque, NULL },
-		/* 147 */ { "Private",					opaque, NULL },
-		/* 148 */ { "Private",					opaque, NULL },
-		/* 149 */ { "Private",					opaque, NULL },
-		/* 150 */ { "Private",					opaque, NULL },
-		/* 151 */ { "Private",					opaque, NULL },
-		/* 152 */ { "Private",					opaque, NULL },
-		/* 153 */ { "Private",					opaque, NULL },
-		/* 154 */ { "Private",					opaque, NULL },
-		/* 155 */ { "Private",					opaque, NULL },
-		/* 156 */ { "Private",					opaque, NULL },
-		/* 157 */ { "Private",					opaque, NULL },
-		/* 158 */ { "Private",					opaque, NULL },
-		/* 159 */ { "Private",					opaque, NULL },
-		/* 160 */ { "Private",					opaque, NULL },
-		/* 161 */ { "Private",					opaque, NULL },
-		/* 162 */ { "Private",					opaque, NULL },
-		/* 163 */ { "Private",					opaque, NULL },
-		/* 164 */ { "Private",					opaque, NULL },
-		/* 165 */ { "Private",					opaque, NULL },
-		/* 166 */ { "Private",					opaque, NULL },
-		/* 167 */ { "Private",					opaque, NULL },
-		/* 168 */ { "Private",					opaque, NULL },
-		/* 169 */ { "Private",					opaque, NULL },
-		/* 170 */ { "Private",					opaque, NULL },
-		/* 171 */ { "Private",					opaque, NULL },
-		/* 172 */ { "Private",					opaque, NULL },
-		/* 173 */ { "Private",					opaque, NULL },
-		/* 174 */ { "Private",					opaque, NULL },
-		/* 175 */ { "Private",					opaque, NULL },
-		/* 176 */ { "Private",					opaque, NULL },
-		/* 177 */ { "Private",					opaque, NULL },
-		/* 178 */ { "Private",					opaque, NULL },
-		/* 179 */ { "Private",					opaque, NULL },
-		/* 180 */ { "Private",					opaque, NULL },
-		/* 181 */ { "Private",					opaque, NULL },
-		/* 182 */ { "Private",					opaque, NULL },
-		/* 183 */ { "Private",					opaque, NULL },
-		/* 184 */ { "Private",					opaque, NULL },
-		/* 185 */ { "Private",					opaque, NULL },
-		/* 186 */ { "Private",					opaque, NULL },
-		/* 187 */ { "Private",					opaque, NULL },
-		/* 188 */ { "Private",					opaque, NULL },
-		/* 189 */ { "Private",					opaque, NULL },
-		/* 190 */ { "Private",					opaque, NULL },
-		/* 191 */ { "Private",					opaque, NULL },
-		/* 192 */ { "Private",					opaque, NULL },
-		/* 193 */ { "Private",					opaque, NULL },
-		/* 194 */ { "Private",					opaque, NULL },
-		/* 195 */ { "Private",					opaque, NULL },
-		/* 196 */ { "Private",					opaque, NULL },
-		/* 197 */ { "Private",					opaque, NULL },
-		/* 198 */ { "Private",					opaque, NULL },
-		/* 199 */ { "Private",					opaque, NULL },
-		/* 200 */ { "Private",					opaque, NULL },
-		/* 201 */ { "Private",					opaque, NULL },
-		/* 202 */ { "Private",					opaque, NULL },
-		/* 203 */ { "Private",					opaque, NULL },
-		/* 204 */ { "Private",					opaque, NULL },
-		/* 205 */ { "Private",					opaque, NULL },
-		/* 206 */ { "Private",					opaque, NULL },
-		/* 207 */ { "Private",					opaque, NULL },
-		/* 208 */ { "Private",					opaque, NULL },
-		/* 209 */ { "Private",					opaque, NULL },
-		/* 210 */ { "Authentication",				special, NULL }
-	};
-
 	/* Options whose length isn't "optlen + 2". */
 	switch (code) {
 
@@ -659,7 +731,7 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 
 	optoff = voff+2;
 
-	text = opt[code].text;
+	text = bootp_get_opt_text(code);
 	/* Special cases */
 	switch (code) {
 
@@ -818,13 +890,8 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 		v_tree = proto_item_add_subtree(vti, ett_bootp_option);
 		for (i = 0; i < optlen; i++) {
 			byte = tvb_get_guint8(tvb, optoff+i);
-			if (byte < array_length(opt)) {
-				proto_tree_add_text(v_tree, tvb, optoff+i, 1, "%d = %s",
-						byte, opt[byte].text);
-			} else {
-				proto_tree_add_text(vti, tvb, optoff+i, 1,
-					"Unknown Option Code: %d", byte);
-			}
+			proto_tree_add_text(v_tree, tvb, optoff+i, 1, "%d = %s",
+					byte, bootp_get_opt_text(byte));
 		}
 		break;
 
@@ -1151,157 +1218,153 @@ bootp_option(tvbuff_t *tvb, proto_tree *bp_tree, int voff, int eoff,
 	}
 
 	/* Normal cases */
-	if (code < array_length(opt)) {
-		text = opt[code].text;
-		ftype = opt[code].ftype;
+	text = bootp_get_opt_text(code);
+	ftype = bootp_get_opt_ftype(code);
 
-		if (ftype == special)
+	if (ftype == special)
+		return consumed;
+	if (ftype == opaque) {
+		if (skip_opaque) /* Currently used by PacketCable CCC */
 			return consumed;
-		if (ftype == opaque) {
-			if (skip_opaque) /* Currently used by PacketCable CCC */
-				return consumed;
-		}
+	}
 
-		vti = proto_tree_add_text(bp_tree, tvb, voff, consumed,
-		    "Option %d: %s", code, text);
-		switch (ftype) {
+	vti = proto_tree_add_text(bp_tree, tvb, voff, consumed,
+	    "Option %d: %s", code, text);
+	switch (ftype) {
+	case ipv4:
+		if (optlen != 4) {
+			proto_item_append_text(vti,
+			    " - length isn't 4");
+			break;
+		}
+		proto_item_append_text(vti, " = %s",
+			ip_to_str(tvb_get_ptr(tvb, optoff, 4)));
+		break;
 
-		case ipv4:
-			if (optlen != 4) {
-				proto_item_append_text(vti,
-				    " - length isn't 4");
-				break;
-			}
+	case ipv4_list:
+		if (optlen == 4) {
+			/* one IP address */
 			proto_item_append_text(vti, " = %s",
 				ip_to_str(tvb_get_ptr(tvb, optoff, 4)));
-			break;
-
-		case ipv4_list:
-			if (optlen == 4) {
-				/* one IP address */
-				proto_item_append_text(vti, " = %s",
-					ip_to_str(tvb_get_ptr(tvb, optoff, 4)));
-			} else {
-				/* > 1 IP addresses. Let's make a sub-tree */
-				v_tree = proto_item_add_subtree(vti, ett_bootp_option);
-				for (i = optoff, optleft = optlen; optleft > 0;
-				    i += 4, optleft -= 4) {
-					if (optleft < 4) {
-						proto_tree_add_text(v_tree, tvb, i, voff + consumed - i,
-						    "Option length isn't a multiple of 4");
-						break;
-					}
-					proto_tree_add_text(v_tree, tvb, i, 4, "IP Address: %s",
-						ip_to_str(tvb_get_ptr(tvb, i, 4)));
+		} else {
+			/* > 1 IP addresses. Let's make a sub-tree */
+			v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+			for (i = optoff, optleft = optlen; optleft > 0;
+			    i += 4, optleft -= 4) {
+				if (optleft < 4) {
+					proto_tree_add_text(v_tree, tvb, i, voff + consumed - i,
+					    "Option length isn't a multiple of 4");
+					break;
 				}
+				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:
-			/* Fix for non null-terminated string supplied by
-			 * John Lines <John.Lines[AT]aeat.co.uk>
-			 */
-			proto_item_append_text(vti, " = \"%s\"",
-					tvb_format_stringzpad(tvb, optoff, consumed-2));
-			break;
+	case string:
+		/* Fix for non null-terminated string supplied by
+		 * John Lines <John.Lines[AT]aeat.co.uk>
+		 */
+		proto_item_append_text(vti, " = \"%s\"",
+				tvb_format_stringzpad(tvb, optoff, consumed-2));
+		break;
 
-		case opaque:
-			proto_item_append_text(vti, " (%d bytes)", optlen);
-			break;
+	case opaque:
+		proto_item_append_text(vti, " (%d bytes)", optlen);
+		break;
 
-		case val_boolean:
-			if (optlen != 1) {
-				proto_item_append_text(vti,
-				    " - length isn't 1");
-				break;
-			}
-			tfs = (const struct true_false_string *) opt[code].data;
+	case val_boolean:
+		if (optlen != 1) {
+			proto_item_append_text(vti,
+			    " - length isn't 1");
+			break;
+		}
+		tfs = (const struct true_false_string *) bootp_get_opt_data(code);
+		if(tfs){
 			i = tvb_get_guint8(tvb, optoff);
 			if (i != 0 && i != 1) {
 				proto_item_append_text(vti,
 				    " = Invalid Value %d", i);
 			} else {
 				proto_item_append_text(vti, " = %s",
-				    i == 0 ? tfs->false_string : tfs->true_string);
+			    		i == 0 ? tfs->false_string : tfs->true_string);
 			}
+		}
+		break;
+
+	case val_u_byte:
+		if (optlen != 1) {
+			proto_item_append_text(vti,
+			    " - length isn't 1");
 			break;
+		}
+		vs = (const value_string *) bootp_get_opt_data(code);
+		byte = tvb_get_guint8(tvb, optoff);
+		if (vs != NULL) {
+			proto_item_append_text(vti, " = %s",
+			    val_to_str(byte, vs, "Unknown (%u)"));
+		} else
+			proto_item_append_text(vti, " = %u", byte);
+		break;
 
-		case val_u_byte:
-			if (optlen != 1) {
-				proto_item_append_text(vti,
-				    " - length isn't 1");
-				break;
-			}
-			vs = (const value_string *) opt[code].data;
-			byte = tvb_get_guint8(tvb, optoff);
-			if (vs != NULL) {
-				proto_item_append_text(vti, " = %s",
-				    val_to_str(byte, vs, "Unknown (%u)"));
-			} else
-				proto_item_append_text(vti, " = %u", byte);
+	case val_u_short:
+		if (optlen != 2) {
+			proto_item_append_text(vti,
+			    " - length isn't 2");
 			break;
+		}
+		proto_item_append_text(vti, " = %u",
+		    tvb_get_ntohs(tvb, optoff));
+		break;
 
-		case val_u_short:
-			if (optlen != 2) {
-				proto_item_append_text(vti,
-				    " - length isn't 2");
-				break;
-			}
+	case val_u_short_list:
+		if (optlen == 2) {
+			/* one gushort */
 			proto_item_append_text(vti, " = %u",
 			    tvb_get_ntohs(tvb, optoff));
-			break;
-
-		case val_u_short_list:
-			if (optlen == 2) {
-				/* one gushort */
-				proto_item_append_text(vti, " = %u",
-				    tvb_get_ntohs(tvb, optoff));
-			} else {
-				/* > 1 gushort */
-				v_tree = proto_item_add_subtree(vti, ett_bootp_option);
-				for (i = optoff, optleft = optlen; optleft > 0;
-				    i += 2, optleft -= 2) {
-					if (optleft < 2) {
-						proto_tree_add_text(v_tree, tvb, i, voff + consumed - i,
-						    "Option length isn't a multiple of 2");
-						break;
-					}
-					proto_tree_add_text(v_tree, tvb, i, 4, "Value: %u",
-						tvb_get_ntohs(tvb, i));
+		} else {
+			/* > 1 gushort */
+			v_tree = proto_item_add_subtree(vti, ett_bootp_option);
+			for (i = optoff, optleft = optlen; optleft > 0;
+			    i += 2, optleft -= 2) {
+				if (optleft < 2) {
+					proto_tree_add_text(v_tree, tvb, i, voff + consumed - i,
+					    "Option length isn't a multiple of 2");
+					break;
 				}
+				proto_tree_add_text(v_tree, tvb, i, 4, "Value: %u",
+					tvb_get_ntohs(tvb, i));
 			}
-			break;
-
-		case val_u_long:
-			if (optlen != 4) {
-				proto_item_append_text(vti,
-				    " - length isn't 4");
-				break;
-			}
-			proto_item_append_text(vti, " = %u",
-			    tvb_get_ntohl(tvb, optoff));
-			break;
+		}
+		break;
 
-		case time_in_secs:
-			if (optlen != 4) {
-				proto_item_append_text(vti,
-				    " - length isn't 4");
-				break;
-			}
-			time_secs = tvb_get_ntohl(tvb, optoff);
-			proto_item_append_text(vti, " = %s",
-			    ((time_secs == 0xffffffff) ?
-			      "infinity" :
-			      time_secs_to_str(time_secs)));
+	case val_u_long:
+		if (optlen != 4) {
+			proto_item_append_text(vti,
+			    " - length isn't 4");
 			break;
+		}
+		proto_item_append_text(vti, " = %u",
+		    tvb_get_ntohl(tvb, optoff));
+		break;
 
-		default:
-			proto_item_append_text(vti, " (%d bytes)", optlen);
+	case time_in_secs:
+		if (optlen != 4) {
+			proto_item_append_text(vti,
+			    " - length isn't 4");
 			break;
 		}
-	} else {
-		proto_tree_add_text(bp_tree, tvb, voff, consumed,
-				"Unknown Option Code: %d (%d bytes)", code, optlen);
+		time_secs = tvb_get_ntohl(tvb, optoff);
+		proto_item_append_text(vti, " = %s",
+		    ((time_secs == 0xffffffff) ?
+		      "infinity" :
+		      time_secs_to_str(time_secs)));
+		break;
+
+	default:
+		proto_item_append_text(vti, " (%d bytes)", optlen);
+		break;
 	}
 
 	return consumed;