Dynamically create DCERPC opnum value_strings from the subdissector

list rather than duplicating this information in the dissector.  Some
of the opnum strings were starting to get out of date as developers
forgot to update the information in both places.

svn path=/trunk/; revision=7936

1 files changed, 10 insertions, 13 deletions

diff --git a/packet-dcerpc-secidmap.c b/packet-dcerpc-secidmap.c
index b6fb280621..087a880ab3 100644
--- a/packet-dcerpc-secidmap.c
+++ b/packet-dcerpc-secidmap.c
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rsecidmap.idl
  *      
- * $Id: packet-dcerpc-secidmap.c,v 1.2 2002/11/08 19:42:40 guy Exp $
+ * $Id: packet-dcerpc-secidmap.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -61,24 +61,13 @@ static dcerpc_sub_dissector secidmap_dissectors[] = {
         { 0, NULL, NULL, NULL },
 };
 
-
-static const value_string secidmap_opnum_vals[] = {
-	{ 0, "ParseNameRedbox" },
-	{ 1, "GenNameBluebox" },
-	{ 2, "AvoidCnBug" },
-	{ 3, "ParseNameCache" },
-	{ 4, "GenNameCache" },
-        { 0, NULL }
-};
-
-
 void
 proto_register_secidmap (void)
 {
 	static hf_register_info hf[] = {
 	  { &hf_secidmap_opnum,
 	    { "Operation", "secidmap.opnum", FT_UINT16, BASE_DEC,
-	      VALS(secidmap_opnum_vals), 0x0, "Operation", HFILL }}
+	      NULL, 0x0, "Operation", HFILL }}
 	};
 
 	static gint *ett[] = {
@@ -92,7 +81,15 @@ proto_register_secidmap (void)
 void
 proto_reg_handoff_secidmap (void)
 {
+	header_field_info *hf_info;
+
         /* Register the protocol as dcerpc */
         dcerpc_init_uuid (proto_secidmap, ett_secidmap, &uuid_secidmap, ver_secidmap, secidmap_dissectors, hf_secidmap_opnum);
+
+	/* Set opnum strings from subdissector list */
+
+	hf_info = proto_registrar_get_nth(hf_secidmap_opnum);
+	hf_info->strings = value_string_from_subdissectors(
+		secidmap_dissectors, array_length(secidmap_dissectors));
 }