- Add rfc number comments on not-yet-decoded options

- Decode autoconfigure option

svn path=/trunk/; revision=29325

1 files changed, 24 insertions, 17 deletions

diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index d734bbc40b..4035dfafca 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -236,6 +236,13 @@ static const value_string altitude_type_values[] = {
 	{ 0,	NULL }
 };
 
+/* AutoConfigure (RFC 2563) */
+static const value_string dhcp_autoconfig[] = {
+	{0,	"DoNotAutoConfigure"},
+	{1,	"AutoConfigure"},
+	{0,	NULL }
+};
+
 /* Error Types for RFC 3825 coordinate location decoding */
 static const value_string rfc3825_error_types[] = {
 	{1,	"Latitude is out of range [-90,90]"},
@@ -562,25 +569,25 @@ static struct opt_info default_bootp_opt[BOOTP_OPT_NUM] = {
 /*  80 */ { "Rapid commit",				opaque, NULL },
 /*  81 */ { "Client Fully Qualified Domain Name",	special, NULL },
 /*  82 */ { "Agent Information Option",                 special, NULL },
-/*  83 */ { "iSNS [TODO]",				opaque, NULL },
+/*  83 */ { "iSNS [TODO:RFC4174]",			opaque, NULL },
 /*  84 */ { "Removed/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 */ { "BCMCS Controller Domain Name [TODO]",	opaque, NULL },
-/*  89 */ { "BCMCS Controller IPv4 address [TODO]",	opaque, NULL },
+/*  88 */ { "BCMCS Controller Domain Name [TODO:RFC4280]",	opaque, NULL },
+/*  89 */ { "BCMCS Controller IPv4 address [TODO:RFC4280]",	opaque, NULL },
 /*  90 */ { "Authentication",				special, NULL },
-/*  91 */ { "Client last transaction time [TODO]",	opaque, NULL },
-/*  92 */ { "associated ip option [TODO]",		opaque, NULL },
+/*  91 */ { "Client last transaction time [TODO:RFC4388]",	opaque, NULL },
+/*  92 */ { "associated ip option [TODO:RFC4388]",	opaque, NULL },
 /*  93 */ { "Client System Architecture",		val_u_short, VALS(bootp_client_arch) },
 /*  94 */ { "Client Network Device Interface",		special, NULL },
-/*  95 */ { "LDAP [TODO]",				opaque, NULL },
+/*  95 */ { "LDAP [TODO:RFC3679]",			opaque, NULL },
 /*  96 */ { "Removed/Unassigend",			opaque, NULL },
 /*  97 */ { "UUID/GUID-based Client Identifier",	special, NULL },
-/*  98 */ { "Open Group's User Authentication [TODO]",	opaque, NULL },
+/*  98 */ { "Open Group's User Authentication [TODO:RFC2485]",	opaque, NULL },
 /*  99 */ { "Civic Addresses Configuration",		special, NULL },
-/* 100 */ { "PCode [TODO]",				opaque, NULL },
-/* 101 */ { "TCode [TODO]",				opaque, NULL },
+/* 100 */ { "PCode [TODO:RFC4833]",			opaque, NULL },
+/* 101 */ { "TCode [TODO:RFC4833]",			opaque, NULL },
 /* 102 */ { "Removed/unassigned",			opaque, NULL },
 /* 103 */ { "Removed/unassigned",			opaque, NULL },
 /* 104 */ { "Removed/unassigned",			opaque, NULL },
@@ -593,17 +600,17 @@ static struct opt_info default_bootp_opt[BOOTP_OPT_NUM] = {
 /* 111 */ { "Unassigned",				opaque, NULL },
 /* 112 */ { "NetInfo Parent Server Address",		ipv4_list, NULL },
 /* 113 */ { "NetInfo Parent Server Tag",		string, NULL },
-/* 114 */ { "URL [TODO]",				opaque, NULL },
+/* 114 */ { "URL [TODO:RFC3679]",			opaque, NULL },
 /* 115 */ { "Removed/Unassigend",			opaque, NULL },
-/* 116 */ { "DHCP Auto-Configuration [TODO]",		opaque, NULL },
-/* 117 */ { "Name Service Search [TODO]",	       	opaque, NULL },
+/* 116 */ { "DHCP Auto-Configuration",			val_u_byte, VALS(dhcp_autoconfig) },
+/* 117 */ { "Name Service Search [TODO:RFC2937]",      	opaque, NULL },
 /* 118 */ { "Subnet Selection Option",		       	ipv4_list, NULL },
-/* 119 */ { "Domain Search [TODO]",			opaque, NULL },
-/* 120 */ { "SIP Servers [TODO]",			opaque, NULL },
+/* 119 */ { "Domain Search [TODO:RFC3397]",		opaque, NULL },
+/* 120 */ { "SIP Servers [TODO:RFC3361]",		opaque, NULL },
 /* 121 */ { "Classless Static Route",		       	special, NULL },
-/* 122 */ { "CableLabs Client Configuration [TODO]",		opaque, NULL },
+/* 122 */ { "CableLabs Client Configuration [TODO:RFC3495]",	opaque, NULL },
 /* 123 */ { "Coordinate-based Location Configuration",	special, NULL },
-/* 124 */ { "V-I Vendor Class [TODO]",			opaque, NULL },
+/* 124 */ { "V-I Vendor Class [TODO:RFC3925]",		opaque, NULL },
 /* 125 */ { "V-I Vendor-specific Information",		special, NULL },
 /* 126 */ { "Removed/Unassigned",			opaque, NULL },
 /* 127 */ { "Removed/Unassigend",			opaque, NULL },
@@ -615,7 +622,7 @@ static struct opt_info default_bootp_opt[BOOTP_OPT_NUM] = {
 /* 133 */ { "PXE - undefined (vendor specific)",	opaque, NULL },
 /* 134 */ { "PXE - undefined (vendor specific)",	opaque, NULL },
 /* 135 */ { "PXE - undefined (vendor specific)",	opaque, NULL },
-/* 136 */ { "OPTION_PANA_AGENT [TODO]",			opaque, NULL },
+/* 136 */ { "OPTION_PANA_AGENT [TODO:RFC5192]",		opaque, NULL },
 /* 137 */ { "LoST Server Domain Name",			string, NULL },
 /* 138 */ { "CAPWAP Access Controllers",		ipv4_list, NULL },
 /* 139 */ { "Unassigned",				opaque, NULL },