Guy suggested that the dcerpc opnum value_string code could be simplified
authortpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 4 Aug 2003 02:49:04 +0000 (02:49 +0000)
committertpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 4 Aug 2003 02:49:04 +0000 (02:49 +0000)
somewhat.  Now the dynamic initialisation of the value_string is contained
in the value_string_from_subdissectors() function instead of being
distributed amongst the dcerpc dissectors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8123 f5534014-38df-0310-8fa8-9805f1628bb7

49 files changed:
packet-dcerpc-afs4int.c
packet-dcerpc-atsvc.c
packet-dcerpc-bossvr.c
packet-dcerpc-browser.c
packet-dcerpc-cds_clerkserver.c
packet-dcerpc-cds_solicit.c
packet-dcerpc-conv.c
packet-dcerpc-cprpc_server.c
packet-dcerpc-dfs.c
packet-dcerpc-dnsserver.c
packet-dcerpc-dtsprovider.c
packet-dcerpc-dtsstime_req.c
packet-dcerpc-epm.c
packet-dcerpc-fldb.c
packet-dcerpc-ftserver.c
packet-dcerpc-krb5rpc.c
packet-dcerpc-lsa-ds.c
packet-dcerpc-lsa.c
packet-dcerpc-mapi.c
packet-dcerpc-messenger.c
packet-dcerpc-mgmt.c
packet-dcerpc-netlogon.c
packet-dcerpc-oxid.c
packet-dcerpc-reg.c
packet-dcerpc-remact.c
packet-dcerpc-rep_proc.c
packet-dcerpc-roverride.c
packet-dcerpc-rpriv.c
packet-dcerpc-rs_acct.c
packet-dcerpc-rs_attr.c
packet-dcerpc-rs_misc.c
packet-dcerpc-rs_pgo.c
packet-dcerpc-rs_repadm.c
packet-dcerpc-rs_replist.c
packet-dcerpc-rs_unix.c
packet-dcerpc-rsec_login.c
packet-dcerpc-samr.c
packet-dcerpc-secidmap.c
packet-dcerpc-spoolss.c
packet-dcerpc-srvsvc.c
packet-dcerpc-svcctl.c
packet-dcerpc-tapi.c
packet-dcerpc-tkn4int.c
packet-dcerpc-ubikdisk.c
packet-dcerpc-ubikvote.c
packet-dcerpc-update.c
packet-dcerpc-wkssvc.c
packet-dcerpc.c
packet-dcerpc.h

index 1521c66e406f55526b56fd92aea0a195ac2b2bbf..afe438e98101a00fde52207bdc94445d8f546a11 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/afs4int.idl
  *
- * $Id: packet-dcerpc-afs4int.c,v 1.3 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-afs4int.c,v 1.4 2003/08/04 02:49:04 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -107,14 +107,6 @@ proto_register_afs4int (void)
 void
 proto_reg_handoff_afs4int (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_afs4int, ett_afs4int, &uuid_afs4int, ver_afs4int, afs4int_dissectors, hf_afs4int_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_afs4int_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               afs4int_dissectors, array_length(afs4int_dissectors));
 }
index 972965ee4284b57ac63d149c55aa395b50b249df..e8477d72be4af13e55285fec61386bdbc02ef905 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \pipe\atsvc packet disassembly
  * Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr>
  *
- * $Id: packet-dcerpc-atsvc.c,v 1.3 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-atsvc.c,v 1.4 2003/08/04 02:49:04 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -674,18 +674,9 @@ proto_register_dcerpc_atsvc(void)
 void
 proto_reg_handoff_dcerpc_atsvc(void)
 {
-       header_field_info *hf_info;
-
        /* register protocol as dcerpc */
 
        dcerpc_init_uuid(
                proto_dcerpc_atsvc, ett_dcerpc_atsvc, &uuid_dcerpc_atsvc,
                ver_dcerpc_atsvc, dcerpc_atsvc_dissectors, hf_atsvc_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_atsvc_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_atsvc_dissectors, array_length(dcerpc_atsvc_dissectors));
-
 }
index bae439cd3d9191029a86ab898662fabf0945e6ac..9256b873918e766632c3ef445c8226ae834650e9 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/bosserver/bbos_ncs_interface.idl
  *
- * $Id: packet-dcerpc-bossvr.c,v 1.3 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-bossvr.c,v 1.4 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -111,14 +111,6 @@ proto_register_bossvr (void)
 void
 proto_reg_handoff_bossvr (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_bossvr, ett_bossvr, &uuid_bossvr, ver_bossvr, bossvr_dissectors, hf_bossvr_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_bossvr_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               bossvr_dissectors, array_length(bossvr_dissectors));
 }
index 3153fc09c83ccdb76e6f5185258b299b515ed9dd..210508c94621dcd1a458ab0201f5e0769c6c6f4b 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for DCERPC Browser packet disassembly
  * Copyright 2001, Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-browser.c,v 1.11 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-browser.c,v 1.12 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1163,17 +1163,9 @@ static hf_register_info hf[] = {
 void
 proto_reg_handoff_dcerpc_browser(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_browser, ett_dcerpc_browser,
                          &uuid_dcerpc_browser, ver_dcerpc_browser,
                          dcerpc_browser_dissectors, hf_browser_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_browser_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_browser_dissectors, array_length(dcerpc_browser_dissectors));
 }
index b7397c6018a71c255c823eb7b5c795675940ab72..953c99409c6b91518305a6c611891f18e2a99960 100644 (file)
@@ -6,7 +6,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_clerkserver.idl
  *      
- * $Id: packet-dcerpc-cds_clerkserver.c,v 1.3 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-cds_clerkserver.c,v 1.4 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -106,14 +106,6 @@ proto_register_cds_clerkserver (void)
 void
 proto_reg_handoff_cds_clerkserver (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_cds_clerkserver, ett_cds_clerkserver, &uuid_cds_clerkserver, ver_cds_clerkserver, cds_clerkserver_dissectors, hf_cds_clerkserver_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_cds_clerkserver_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               cds_clerkserver_dissectors, array_length(cds_clerkserver_dissectors));
 }
index be4bc0c2e6d95d0c6a181d95673ff1644fc8f642..7c357c545f39feb99b4a2576c06ebc603877462b 100644 (file)
@@ -4,7 +4,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cds_solicit.idl
  *      
- * $Id: packet-dcerpc-cds_solicit.c,v 1.3 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-cds_solicit.c,v 1.4 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -78,14 +78,6 @@ proto_register_cds_solicit (void)
 void
 proto_reg_handoff_cds_solicit (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_cds_solicit, ett_cds_solicit, &uuid_cds_solicit, ver_cds_solicit, cds_solicit_dissectors, hf_cds_solicit_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_cds_solicit_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               cds_solicit_dissectors, array_length(cds_solicit_dissectors));
 }
index c189966290fc41a38ed87e35421a19094065c902..3a2cb64086bbd8ded6211e9f2bacf77e9d703fa1 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for dcerpc conv dissection
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc-conv.c,v 1.7 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-conv.c,v 1.8 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -206,15 +206,7 @@ proto_register_conv (void)
 void
 proto_reg_handoff_conv (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_conv, ett_conv, &uuid_conv, ver_conv, conv_dissectors, hf_conv_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_conv_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               conv_dissectors, array_length(conv_dissectors));
 }
 
index d7e9b00df557c3715753ee8b487b46036cb32726..c3d3c831e155938a6a4bb94037bfd7d80a7fb679 100644 (file)
@@ -4,7 +4,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/directory.tar.gz directory/cds/stubs/cprpc_server.idl
  *      
- * $Id: packet-dcerpc-cprpc_server.c,v 1.3 2003/06/26 04:30:26 tpot Exp $
+ * $Id: packet-dcerpc-cprpc_server.c,v 1.4 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -77,14 +77,6 @@ proto_register_cprpc_server (void)
 void
 proto_reg_handoff_cprpc_server (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_cprpc_server, ett_cprpc_server, &uuid_cprpc_server, ver_cprpc_server, cprpc_server_dissectors, hf_cprpc_server_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_cprpc_server_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               cprpc_server_dissectors, array_length(cprpc_server_dissectors));
 }
index f6dec86238ddaa2e679f89eac07c991639f98d7d..32b49f81af08ad90f281706532095ec7e77bb014 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \\PIPE\\netdfs packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-dfs.c,v 1.6 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-dfs.c,v 1.7 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -78,16 +78,8 @@ proto_register_dcerpc_dfs(void)
 void
 proto_reg_handoff_dcerpc_dfs(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_dfs, ett_dcerpc_dfs, &uuid_dcerpc_dfs,
                          ver_dcerpc_dfs, dcerpc_dfs_dissectors, hf_dfs_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_dfs_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_dfs_dissectors, array_length(dcerpc_dfs_dissectors));
 }
index 07321c39acc9135bd6d21460ca1dc2882ed730f5..b18493900b8732dbf54b9e4b5855262e602df23f 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\DNSSERVER packet disassembly
  * Copyright 2001, 2002 Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-dnsserver.c,v 1.2 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-dnsserver.c,v 1.3 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -90,17 +90,9 @@ proto_register_dcerpc_dnsserver(void)
 void
 proto_reg_handoff_dcerpc_dnsserver(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(
                proto_dcerpc_dnsserver, ett_dnsserver, &uuid_dcerpc_dnsserver,
                ver_dcerpc_dnsserver, dcerpc_dnsserver_dissectors, hf_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_dnsserver_dissectors, array_length(dcerpc_dnsserver_dissectors));
 }
index d07c92103d8aed9d1e7096085d452cb18ada4d4a..ab9c125e9c242299da5980618bd93441249d48aa 100644 (file)
@@ -4,7 +4,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsprovider.idl
  *
- * $Id: packet-dcerpc-dtsprovider.c,v 1.5 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-dtsprovider.c,v 1.6 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -82,14 +82,6 @@ proto_register_dtsprovider (void)
 void
 proto_reg_handoff_dtsprovider (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_dtsprovider, ett_dtsprovider, &uuid_dtsprovider, ver_dtsprovider, dtsprovider_dissectors, hf_dtsprovider_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_dtsprovider_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dtsprovider_dissectors, array_length(dtsprovider_dissectors));
 }
index d4b7187c42388e5ae516c6ab8b495f74fe78dbf1..f80b65a92b84b6e28cbdf652d9a7bb131498f6a9 100644 (file)
@@ -4,7 +4,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/time.tar.gz time/service/dtsstime_req.idl
  *           
- * $Id: packet-dcerpc-dtsstime_req.c,v 1.4 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-dtsstime_req.c,v 1.5 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -77,14 +77,6 @@ proto_register_dtsstime_req (void)
 void
 proto_reg_handoff_dtsstime_req (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_dtsstime_req, ett_dtsstime_req, &uuid_dtsstime_req, ver_dtsstime_req, dtsstime_req_dissectors, hf_dtsstime_req_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_dtsstime_req_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dtsstime_req_dissectors, array_length(dtsstime_req_dissectors));
 }
index 7b35248a8f04ce73ee5f81c8eb758143774c6b92..45b0d418f3c708dcf85dc84ec73533d4301bb80a 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for dcerpc endpoint mapper dissection
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc-epm.c,v 1.20 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-epm.c,v 1.21 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -689,14 +689,6 @@ proto_register_epm (void)
 void
 proto_reg_handoff_epm (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_epm, ett_epm, &uuid_epm, ver_epm, epm_dissectors, hf_epm_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_epm_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               epm_dissectors, array_length(epm_dissectors));
 }
index 0800fabc4f4f2d1c5cede02db10ce109ea398ccc..231dc532635b3961e92cb34fc53a03649292c84e 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/flserver/afsvl_proc.idl
  *
- * $Id: packet-dcerpc-fldb.c,v 1.3 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-fldb.c,v 1.4 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -107,14 +107,6 @@ proto_register_fldb (void)
 void
 proto_reg_handoff_fldb (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_fldb, ett_fldb, &uuid_fldb, ver_fldb, fldb_dissectors, hf_fldb_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_fldb_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               fldb_dissectors, array_length(fldb_dissectors));
 }
index f4c518648635b148567ef5c2f0df0566331d577d..a67867d8844eefa35e8c03661d285b16378f5e1b 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tgz file/ftserver/ftserver_proc.idl
  *
- * $Id: packet-dcerpc-ftserver.c,v 1.3 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-ftserver.c,v 1.4 2003/08/04 02:49:03 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -99,14 +99,6 @@ proto_register_ftserver (void)
 void
 proto_reg_handoff_ftserver (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_ftserver, ett_ftserver, &uuid_ftserver, ver_ftserver, ftserver_dissectors, hf_ftserver_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_ftserver_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               ftserver_dissectors, array_length(ftserver_dissectors));
 }
index c658787c1730f0c3c8ae20da544c57898052e888..41b8475992605acad7ade8bc7c7ad9fbd3ed7250 100644 (file)
@@ -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/krb5rpc.idl
  *
- * $Id: packet-dcerpc-krb5rpc.c,v 1.5 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-krb5rpc.c,v 1.6 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -205,16 +205,7 @@ proto_register_krb5rpc (void)
 void
 proto_reg_handoff_krb5rpc (void)
 {
-  header_field_info *hf_info;
-
   /* Register the protocol as dcerpc */
   dcerpc_init_uuid (proto_krb5rpc, ett_krb5rpc, &uuid_krb5rpc, ver_krb5rpc,
                    krb5rpc_dissectors, hf_krb5rpc_opnum);
-  
-  /* Set opnum strings from subdissector list */
-
-  hf_info = proto_registrar_get_nth(hf_krb5rpc_opnum);
-  hf_info->strings = value_string_from_subdissectors(
-         krb5rpc_dissectors, array_length(krb5rpc_dissectors));
-
 }
index f96c4e7d723619a02b4cc9332f109a28b71f2734..889099fb8db6f4f3c928dc824f82f720382825d0 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2002-2003, Tim Potter <tpot@samba.org>
  * Copyright 2002, Jim McDonough <jmcd@samba.org>
  *
- * $Id: packet-dcerpc-lsa-ds.c,v 1.11 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-lsa-ds.c,v 1.12 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -340,17 +340,9 @@ static dcerpc_sub_dissector lsa_ds_dissectors[] = {
 void
 proto_reg_handoff_dcerpc_lsa_ds(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_lsa_ds, ett_dcerpc_lsa_ds, 
                         &uuid_dcerpc_lsa_ds, ver_dcerpc_lsa_ds, 
                         lsa_ds_dissectors, hf_lsa_ds_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_lsa_ds_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               lsa_ds_dissectors, array_length(lsa_ds_dissectors));
 }
index 5c9fc6aa5e308e677574b76345b48379a41e667d..215dee2893a0b8f4e5597e3137acfe875b9dc3cd 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *  2002  Added LSA command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-lsa.c,v 1.86 2003/06/26 04:30:27 tpot Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.87 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -4501,16 +4501,8 @@ static guint16 ver_dcerpc_lsa = 0;
 void
 proto_reg_handoff_dcerpc_lsa(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_lsa, ett_dcerpc_lsa, &uuid_dcerpc_lsa,
                          ver_dcerpc_lsa, dcerpc_lsa_dissectors, hf_lsa_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_lsa_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_lsa_dissectors, array_length(dcerpc_lsa_dissectors));
 }
index f1e894259af9db29b87c5ec6a1cac81e87074415..0a9ebd1305035cc72b6e354dd31754dd0eb648eb 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for MS Exchange MAPI
  * Copyright 2002, Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-mapi.c,v 1.23 2003/06/26 04:30:28 tpot Exp $
+ * $Id: packet-dcerpc-mapi.c,v 1.24 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -460,17 +460,9 @@ static hf_register_info hf[] = {
 void
 proto_reg_handoff_dcerpc_mapi(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_mapi, ett_dcerpc_mapi,
                          &uuid_dcerpc_mapi, ver_dcerpc_mapi,
                          dcerpc_mapi_dissectors, hf_mapi_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_mapi_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_mapi_dissectors, array_length(dcerpc_mapi_dissectors));
 }
index ec361682cfdc78c57abfa8000171b2d3e85a9585..d8ed92f5f14c412bb9e7acd79296e54da7e56c71 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\messenger packet disassembly
  * Copyright 2003 Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-messenger.c,v 1.3 2003/06/26 10:31:18 sahlberg Exp $
+ * $Id: packet-dcerpc-messenger.c,v 1.4 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -134,16 +134,8 @@ proto_register_dcerpc_messenger(void)
 void
 proto_reg_handoff_dcerpc_messenger(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_messenger, ett_dcerpc_messenger, &uuid_dcerpc_messenger,
                          ver_dcerpc_messenger, dcerpc_messenger_dissectors, hf_messenger_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_messenger_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_messenger_dissectors, array_length(dcerpc_messenger_dissectors));
 }
index 3562fb5802bc31ebc720e9b74a5dffb68f162ca1..5c5153e7c4e4c9c0e11546890367af11340c3e4f 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for dcerpc mgmt dissection
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc-mgmt.c,v 1.6 2003/06/26 04:30:28 tpot Exp $
+ * $Id: packet-dcerpc-mgmt.c,v 1.7 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -75,14 +75,6 @@ proto_register_mgmt (void)
 void
 proto_reg_handoff_mgmt (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_mgmt, ett_mgmt, &uuid_mgmt, ver_mgmt, mgmt_dissectors, hf_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               mgmt_dissectors, array_length(mgmt_dissectors));
 }
index 984a596ef46fbbcbe4e76594b722bc83604dc654..25ba82f9ebbf6ee0bcefc24e3844f477b14ba194 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *  2002 structure and command dissectors by Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-netlogon.c,v 1.86 2003/07/18 05:48:39 guy Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.87 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -7080,20 +7080,12 @@ static dcerpc_auth_subdissector_fns secchan_auth_fns = {
 void
 proto_reg_handoff_dcerpc_netlogon(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_netlogon, ett_dcerpc_netlogon,
                          &uuid_dcerpc_netlogon, ver_dcerpc_netlogon,
                          dcerpc_netlogon_dissectors, hf_netlogon_opnum);
 
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_netlogon_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_netlogon_dissectors, array_length(dcerpc_netlogon_dissectors));
-
        register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_INTEGRITY,
                                          DCE_C_RPC_AUTHN_PROTOCOL_SEC_CHAN,
                                          &secchan_auth_fns);   
index e213c3309c3cb872af85a940c41344afdab2685d..3a31a8744a7057bd9eee11cf4f2f64929d342327 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for DCOM OXID Resolver
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc-oxid.c,v 1.6 2003/06/26 04:30:28 tpot Exp $
+ * $Id: packet-dcerpc-oxid.c,v 1.7 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -70,14 +70,6 @@ proto_register_oxid (void)
 void
 proto_reg_handoff_oxid (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_oxid, ett_oxid, &uuid_oxid, ver_oxid, oxid_dissectors, hf_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               oxid_dissectors, array_length(oxid_dissectors));
 }
index c59f63e136fee44bbb37abffb4401a404242bb33..f986fd0c6e14ac6f667ff7d8f87f8d4a4c18d336 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\winreg packet disassembly
  * Copyright 2001-2003 Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-reg.c,v 1.20 2003/06/26 04:30:28 tpot Exp $
+ * $Id: packet-dcerpc-reg.c,v 1.21 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -797,16 +797,8 @@ proto_register_dcerpc_reg(void)
 void
 proto_reg_handoff_dcerpc_reg(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_reg, ett_dcerpc_reg, &uuid_dcerpc_reg,
                          ver_dcerpc_reg, dcerpc_reg_dissectors, hf_reg_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_reg_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_reg_dissectors, array_length(dcerpc_reg_dissectors));
 }
index 14b39030a344a3d1b1aecbb5436d120762b36848..2967c65c9252708446ef4ccad6de4a7ad7117a4b 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for DCOM Remote Activation
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  *
- * $Id: packet-dcerpc-remact.c,v 1.7 2003/06/26 04:30:28 tpot Exp $
+ * $Id: packet-dcerpc-remact.c,v 1.8 2003/08/04 02:49:02 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -72,14 +72,6 @@ proto_register_remact (void)
 void
 proto_reg_handoff_remact (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_remact, ett_remact, &uuid_remact, ver_remact, remact_dissectors, hf_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               remact_dissectors, array_length(remact_dissectors));
 }
index 88f66b14beff38b61914a4919baac39fe719b957..0ab029571be07d465f69ce700d8819497b0efff7 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tgz  file/fsint/rep_proc.idl
  *
- * $Id: packet-dcerpc-rep_proc.c,v 1.3 2003/06/26 04:30:28 tpot Exp $
+ * $Id: packet-dcerpc-rep_proc.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -88,14 +88,6 @@ proto_register_rep_proc (void)
 void
 proto_reg_handoff_rep_proc (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rep_proc, ett_rep_proc, &uuid_rep_proc, ver_rep_proc, rep_proc_dissectors, hf_rep_proc_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rep_proc_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rep_proc_dissectors, array_length(rep_proc_dissectors));
 }
index 4666055ec2406ef3481eb3fcefc9defe8be02a75..ba1ed596a440822982ac62b65de1aa460c598bc7 100644 (file)
@@ -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/roverride.idl
  *
- * $Id: packet-dcerpc-roverride.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-roverride.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -83,14 +83,6 @@ proto_register_roverride (void)
 void
 proto_reg_handoff_roverride (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_roverride, ett_roverride, &uuid_roverride, ver_roverride, roverride_dissectors, hf_roverride_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_roverride_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               roverride_dissectors, array_length(roverride_dissectors));
 }
index 6343120d0b03ce49e85a7b87044b7dfeee9736d7..ccda61b78ad36019fa5208b59ed0a32b0bd2b80c 100644 (file)
@@ -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/rpriv.idl
  *
- * $Id: packet-dcerpc-rpriv.c,v 1.4 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rpriv.c,v 1.5 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -149,14 +149,6 @@ proto_register_rpriv (void)
 void
 proto_reg_handoff_rpriv (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rpriv, ett_rpriv, &uuid_rpriv, ver_rpriv, rpriv_dissectors, hf_rpriv_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rpriv_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rpriv_dissectors, array_length(rpriv_dissectors));
 }
index 4941038643144149c21f654857e4520746addbf3..1eb8beb9b0e6a728a4081a940ac03e5539aa9da5 100644 (file)
@@ -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/rs_acct.idl
  *      
- * $Id: packet-dcerpc-rs_acct.c,v 1.4 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_acct.c,v 1.5 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -163,15 +163,6 @@ proto_register_rs_acct (void)
 void
 proto_reg_handoff_rs_acct (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_acct, ett_rs_acct, &uuid_rs_acct, ver_rs_acct, rs_acct_dissectors, hf_rs_acct_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_acct_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_acct_dissectors, array_length(rs_acct_dissectors));
-
 }
index c36687e9b64632877b66234baad167cb5b56604b..3085015920a4b010e319c5bd79a513630715adba 100644 (file)
@@ -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/rs_attr.idl
  *      
- * $Id: packet-dcerpc-rs_attr.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_attr.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -85,14 +85,6 @@ proto_register_rs_attr (void)
 void
 proto_reg_handoff_rs_attr (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_attr, ett_rs_attr, &uuid_rs_attr, ver_rs_attr, rs_attr_dissectors, hf_rs_attr_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_attr_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_attr_dissectors, array_length(rs_attr_dissectors));
 }
index e7858ea9622451884262b6ddaebadbcf6306a0d4..d2cc2947b6af9911b1c28012180b49e5bf645574 100644 (file)
@@ -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/rs_misc.idl
  *      
- * $Id: packet-dcerpc-rs_misc.c,v 1.4 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_misc.c,v 1.5 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -126,15 +126,6 @@ proto_register_rs_misc (void)
 void
 proto_reg_handoff_rs_misc (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_misc, ett_rs_misc, &uuid_rs_misc, ver_rs_misc, rs_misc_dissectors, hf_rs_misc_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_misc_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_misc_dissectors, array_length(rs_misc_dissectors));
-
 }
index 9bb1bd51e61fbed4af7e9f84176a76bc20156b15..d68109a6d04c66cb2f0a52795f86d9508e177dea 100644 (file)
@@ -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/rs_pgo.idl
  *      
- * $Id: packet-dcerpc-rs_pgo.c,v 1.4 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_pgo.c,v 1.5 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -266,14 +266,6 @@ proto_register_rs_pgo (void)
 void
 proto_reg_handoff_rs_pgo (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_pgo, ett_rs_pgo, &uuid_rs_pgo, ver_rs_pgo, rs_pgo_dissectors, hf_rs_pgo_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_pgo_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_pgo_dissectors, array_length(rs_pgo_dissectors));
 }
index ba0d648ae0be6c6c26f4528e5c090a6acdc86e8a..7d7d0f9088c28d070a1d23b040497ec9ac1cab98 100644 (file)
@@ -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/rs_repadm.idl
  *
- * $Id: packet-dcerpc-rs_repadm.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_repadm.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -91,14 +91,6 @@ proto_register_rs_repadm (void)
 void
 proto_reg_handoff_rs_repadm (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_repadm, ett_rs_repadm, &uuid_rs_repadm, ver_rs_repadm, rs_repadm_dissectors, hf_rs_repadm_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_repadm_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_repadm_dissectors, array_length(rs_repadm_dissectors));
 }
index 1970e5e1e43fab5f6a25a9c1baf790b9f43947d7..9c1f088e0e5db2755f59496c43467a5fa4e95ef6 100644 (file)
@@ -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/rs_repadm.idl
  *      
- * $Id: packet-dcerpc-rs_replist.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_replist.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -87,14 +87,6 @@ proto_register_rs_replist (void)
 void
 proto_reg_handoff_rs_replist (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_replist, ett_rs_replist, &uuid_rs_replist, ver_rs_replist, rs_replist_dissectors, hf_rs_replist_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_replist_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_replist_dissectors, array_length(rs_replist_dissectors));
 }
index f49d3ec002ba49476b8527470a7dec53f86a9220..c68d1abb20d8ea7fc6ad947e24c0f8bbc821991d 100644 (file)
@@ -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/rs_unix.idl
  *
- * $Id: packet-dcerpc-rs_unix.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rs_unix.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -77,14 +77,6 @@ proto_register_rs_unix (void)
 void
 proto_reg_handoff_rs_unix (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rs_unix, ett_rs_unix, &uuid_rs_unix, ver_rs_unix, rs_unix_dissectors, hf_rs_unix_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rs_unix_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rs_unix_dissectors, array_length(rs_unix_dissectors));
 }
index 223bfbdd50eca34d418121f1390901f54b846907..bf19d4eb6b024eed3ae3a6697612035e5d09e007 100644 (file)
@@ -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/rsec_login.idl
  *      
- * $Id: packet-dcerpc-rsec_login.c,v 1.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-rsec_login.c,v 1.4 2003/08/04 02:49:01 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -76,14 +76,6 @@ proto_register_rsec_login (void)
 void
 proto_reg_handoff_rsec_login (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_rsec_login, ett_rsec_login, &uuid_rsec_login, ver_rsec_login, rsec_login_dissectors, hf_rsec_login_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_rsec_login_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               rsec_login_dissectors, array_length(rsec_login_dissectors));
 }
index b8d95c2c986fd26bb7f5bd5f8e0b8995ac934284..9ef1ed40faef4fea25f1b3269c8acb9ace88f37e 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *   2002 Added all command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-samr.c,v 1.99 2003/07/24 20:33:22 guy Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.100 2003/08/04 02:49:00 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -5676,16 +5676,8 @@ proto_register_dcerpc_samr(void)
 void
 proto_reg_handoff_dcerpc_samr(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_samr, ett_dcerpc_samr, &uuid_dcerpc_samr,
                          ver_dcerpc_samr, dcerpc_samr_dissectors, hf_samr_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_samr_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_samr_dissectors, array_length(dcerpc_samr_dissectors));
 }
index 087a880ab38f9bc3fb9b75d6c3d69251460b7a45..f3f4deda937fa42471c02b6f656c8d941bbe590e 100644 (file)
@@ -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.3 2003/06/26 04:30:29 tpot Exp $
+ * $Id: packet-dcerpc-secidmap.c,v 1.4 2003/08/04 02:49:00 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,15 +81,7 @@ 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));
 }
                           
index d143f23597419ae19b1fad1869ffa34a7897c9da..a2455fef1c8466a67ccbd01581ce16342821c08d 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\spoolss packet disassembly
  * Copyright 2001-2003, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-spoolss.c,v 1.103 2003/07/14 04:46:48 tpot Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.104 2003/08/04 02:49:00 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -8221,17 +8221,10 @@ static guint16 ver_dcerpc_spoolss = 1;
 void
 proto_reg_handoff_dcerpc_spoolss(void)
 {
-       header_field_info *hf_info;
 
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_spoolss, ett_dcerpc_spoolss,
                          &uuid_dcerpc_spoolss, ver_dcerpc_spoolss,
                          dcerpc_spoolss_dissectors, hf_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_spoolss_dissectors, array_length(dcerpc_spoolss_dissectors));
 }
index 7a130918a290260448555b85c4534a67d1c169c5..7cdd87be8d067b0061e1e742171c231cb08a1662 100644 (file)
@@ -9,7 +9,7 @@
  * 2002, some share information levels implemented based on samba
  * sources.
  *
- * $Id: packet-dcerpc-srvsvc.c,v 1.58 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-srvsvc.c,v 1.59 2003/08/04 02:49:00 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -7360,17 +7360,9 @@ proto_register_dcerpc_srvsvc(void)
 void
 proto_reg_handoff_dcerpc_srvsvc(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_srvsvc, ett_dcerpc_srvsvc,
                          &uuid_dcerpc_srvsvc, ver_dcerpc_srvsvc,
                          dcerpc_srvsvc_dissectors, hf_srvsvc_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_srvsvc_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_srvsvc_dissectors, array_length(dcerpc_srvsvc_dissectors));
 }
index 048ed5cfce94420a66da10cdc106445689fa9132..0990c047417be5e434a909a027912dd6f3e5b868 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2003, Tim Potter <tpot@samba.org>
  * Copyright 2003, Ronnie Sahlberg,  added function dissectors
  *
- * $Id: packet-dcerpc-svcctl.c,v 1.10 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-svcctl.c,v 1.11 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -560,17 +560,9 @@ proto_register_dcerpc_svcctl(void)
 void
 proto_reg_handoff_dcerpc_svcctl(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_svcctl, ett_dcerpc_svcctl,
                          &uuid_dcerpc_svcctl, ver_dcerpc_svcctl,
                          dcerpc_svcctl_dissectors, hf_svcctl_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_svcctl_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_svcctl_dissectors, array_length(dcerpc_svcctl_dissectors));
 }
index 59a4036887ba107e229fcf739daefc19d453e346..40d955ef0eaae198045076a9730e9f28a2d7ec37 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for DCERPC TAPI packet disassembly
  * Copyright 2002, Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-tapi.c,v 1.6 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-tapi.c,v 1.7 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -240,17 +240,9 @@ static hf_register_info hf[] = {
 void
 proto_reg_handoff_dcerpc_tapi(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_tapi, ett_dcerpc_tapi,
                          &uuid_dcerpc_tapi, ver_dcerpc_tapi,
                          dcerpc_tapi_dissectors, hf_tapi_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_tapi_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_tapi_dissectors, array_length(dcerpc_tapi_dissectors));
 }
index 6ff6ad433473808f0bcba7f24ce5d45c87a1a8a6..854ac09110fdb4b6f615156941b2be533d3cf441 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/fsint/tkn4int.idl
  *     
- * $Id: packet-dcerpc-tkn4int.c,v 1.3 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-tkn4int.c,v 1.4 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -87,14 +87,6 @@ proto_register_tkn4int (void)
 void
 proto_reg_handoff_tkn4int (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_tkn4int, ett_tkn4int, &uuid_tkn4int, ver_tkn4int, tkn4int_dissectors, hf_tkn4int_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_tkn4int_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               tkn4int_dissectors, array_length(tkn4int_dissectors));
 }
index aebe3b8e40292420a451cfdac79e9ddf08138fee..d50970fe3f07763fc91c3cbd806c4b8edc1dd58b 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/ncsubik/ubikdisk_proc.idl
  *
- * $Id: packet-dcerpc-ubikdisk.c,v 1.3 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-ubikdisk.c,v 1.4 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -90,14 +90,6 @@ proto_register_ubikdisk (void)
 void
 proto_reg_handoff_ubikdisk (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_ubikdisk, ett_ubikdisk, &uuid_ubikdisk, ver_ubikdisk, ubikdisk_dissectors, hf_ubikdisk_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_ubikdisk_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               ubikdisk_dissectors, array_length(ubikdisk_dissectors));
 }
index 6714dc3c3bfb34e0ff7792b676c0914817f63f44..b34533b5b5e9da362a923403d57881ffe2026f90 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/ncsubik/ubikvote_proc.idl
  *
- * $Id: packet-dcerpc-ubikvote.c,v 1.3 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-ubikvote.c,v 1.4 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -85,14 +85,6 @@ proto_register_ubikvote (void)
 void
 proto_reg_handoff_ubikvote (void)
 {
-       header_field_info *hf_info;
-
        /* Register the protocol as dcerpc */
        dcerpc_init_uuid (proto_ubikvote, ett_ubikvote, &uuid_ubikvote, ver_ubikvote, ubikvote_dissectors, hf_ubikvote_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_ubikvote_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               ubikvote_dissectors, array_length(ubikvote_dissectors));
 }
index fd9010b474f8566fd538ad896d56943b7a37fe5d..fe734b8de7683200870f5ce989e989e057231669 100644 (file)
@@ -5,7 +5,7 @@
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/file.tar.gz file/update/update.idl
  *
- * $Id: packet-dcerpc-update.c,v 1.3 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-update.c,v 1.4 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -84,16 +84,8 @@ proto_register_dce_update (void)
 void
 proto_reg_handoff_dce_update (void)
 {
-  header_field_info *hf_info;
-
   /* Register the protocol as dcerpc */
   dcerpc_init_uuid (proto_dce_update, ett_dce_update, &uuid_dce_update,
                    ver_dce_update, dce_update_dissectors,
                    hf_dce_update_opnum);
-
-  /* Set opnum strings from subdissector list */
-
-  hf_info = proto_registrar_get_nth(hf_dce_update_opnum);
-  hf_info->strings = value_string_from_subdissectors(
-         dce_update_dissectors, array_length(dce_update_dissectors));
 }
index e8cb9497c884c829d621c01928bb5d4c7d9f1f16..81f14c31e269b1ba8eea6c1965c2b9c98c3c7d74 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2001, Tim Potter <tpot@samba.org>
  * Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com>
  *
- * $Id: packet-dcerpc-wkssvc.c,v 1.26 2003/06/26 04:30:30 tpot Exp $
+ * $Id: packet-dcerpc-wkssvc.c,v 1.27 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1257,17 +1257,9 @@ proto_register_dcerpc_wkssvc(void)
 void
 proto_reg_handoff_dcerpc_wkssvc(void)
 {
-       header_field_info *hf_info;
-
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_wkssvc, ett_dcerpc_wkssvc,
                          &uuid_dcerpc_wkssvc, ver_dcerpc_wkssvc,
                          dcerpc_wkssvc_dissectors, hf_wkssvc_opnum);
-
-       /* Set opnum strings from subdissector list */
-
-       hf_info = proto_registrar_get_nth(hf_wkssvc_opnum);
-       hf_info->strings = value_string_from_subdissectors(
-               dcerpc_wkssvc_dissectors, array_length(dcerpc_wkssvc_dissectors));
 }
index 381abc09775b2833b47a1dcc9dbfa59872877f6a..42e480a35e897bff13dc59dbc79a36903fba81b0 100644 (file)
@@ -3,7 +3,7 @@
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  * Copyright 2003, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc.c,v 1.137 2003/07/21 09:10:00 guy Exp $
+ * $Id: packet-dcerpc.c,v 1.138 2003/08/04 02:48:59 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -592,6 +592,7 @@ dcerpc_init_uuid (int proto, int ett, e_uuid_t *uuid, guint16 ver,
 {
     dcerpc_uuid_key *key = g_malloc (sizeof (*key));
     dcerpc_uuid_value *value = g_malloc (sizeof (*value));
+    header_field_info *hf_info;
 
     key->uuid = *uuid;
     key->ver = ver;
@@ -603,6 +604,9 @@ dcerpc_init_uuid (int proto, int ett, e_uuid_t *uuid, guint16 ver,
     value->opnum_hf = opnum_hf;
 
     g_hash_table_insert (dcerpc_uuids, key, value);
+
+    hf_info = proto_registrar_get_nth(opnum_hf);
+    hf_info->strings = value_string_from_subdissectors(procs);
 }
 
 /* Function to find the name of a registered protocol
@@ -625,21 +629,27 @@ dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver)
 /* Create a value_string consisting of DCERPC opnum and name from a
    subdissector array. */
 
-value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd, 
-                                             int num_sds)
+value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd)
 {
-       value_string *vs;
-       int i;
-
-       vs = g_malloc((num_sds + 1) * sizeof(value_string));
+       value_string *vs = NULL;
+       int i, num_sd = 0;
+
+ again:
+       for (i = 0; sd[i].name; i++) {
+               if (vs) {
+                       vs[i].value = sd[i].num;
+                       vs[i].strptr = sd[i].name;
+               } else
+                       num_sd++;
+       }
 
-       for (i = 0; i < num_sds; i++) {
-               vs[i].value = sd[i].num;
-               vs[i].strptr = sd[i].name;
+       if (!vs) {
+               vs = g_malloc((num_sd + 1) * sizeof(value_string));
+               goto again;
        }
 
-       vs[num_sds].value = 0;
-       vs[num_sds].strptr = NULL;
+       vs[num_sd].value = 0;
+       vs[num_sd].strptr = NULL;
 
        return vs;
 }
index c12579d680824686b04dcbedde9fd0845f35d6db..2ecc7b35a2c783ef6ae0a443427e53f54fe0e12c 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright 2001, Todd Sabin <tas@webspan.net>
  * Copyright 2003, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc.h,v 1.33 2003/07/16 04:20:32 tpot Exp $
+ * $Id: packet-dcerpc.h,v 1.34 2003/08/04 02:48:58 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -215,7 +215,7 @@ dcerpc_sub_dissector *dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver
 
 /* Create a opnum, name value_string from a subdissector list */
 
-value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd, int num_sds);
+value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd);
 
 /* Private data structure to pass to DCERPC dissector. This is used to
    pass transport specific information down to the dissector from the