Change each DCERPC dissector to pass in a hf value on initialisation

for a value_string that corresponds to that dissectors opnums.  Pass
in -1 if no such table is available.


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

1 files changed, 72 insertions, 2 deletions

diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index 9306ea4dff..454c35f843 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -3,7 +3,7 @@
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *  2002  Added LSA command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-lsa.c,v 1.51 2002/06/21 02:17:32 tpot Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.52 2002/06/24 00:03:17 tpot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -40,6 +40,7 @@
 
 static int proto_dcerpc_lsa = -1;
 
+static int hf_lsa_opnum = -1;
 static int hf_lsa_rc = -1;
 static int hf_lsa_hnd = -1;
 static int hf_lsa_server = -1;
@@ -3977,10 +3978,79 @@ static dcerpc_sub_dissector dcerpc_lsa_dissectors[] = {
 	{0, NULL, NULL, NULL}
 };
 
+static const value_string lsa_opnum_vals[] = {
+	{ LSA_LSACLOSE, "Close" },
+	{ LSA_LSADELETE, "Delete" },
+	{ LSA_LSAENUMERATEPRIVILEGES, "EnumPrivs" },
+	{ LSA_LSAQUERYSECURITYOBJECT, "QuerySecObject" },
+	{ LSA_LSASETSECURITYOBJECT, "SetSecObject" },
+	{ LSA_LSACHANGEPASSWORD, "ChangePassword" },
+	{ LSA_LSAOPENPOLICY, "OpenPolicy" },
+	{ LSA_LSAQUERYINFORMATIONPOLICY, "QueryInfoPolicy" },
+	{ LSA_LSASETINFORMATIONPOLICY, "SetInfoPolicy" },
+	{ LSA_LSACLEARAUDITLOG, "ClearAuditLog" },
+	{ LSA_LSACREATEACCOUNT, "CreateAccount" },
+	{ LSA_LSAENUMERATEACCOUNTS, "EnumAccounts" },
+	{ LSA_LSACREATETRUSTEDDOMAIN, "CreateTrustedDomain" },
+	{ LSA_LSAENUMERATETRUSTEDDOMAINS, "EnumTrustedDomains" },
+	{ LSA_LSALOOKUPNAMES, "LookupNames" },
+	{ LSA_LSALOOKUPSIDS, "LookupSIDs" },
+	{ LSA_LSACREATESECRET, "CreateSecret" },
+	{ LSA_LSAOPENACCOUNT, "OpenAccount" },
+	{ LSA_LSAENUMERATEPRIVILEGESACCOUNT, "EnumPrivsAccount" },
+	{ LSA_LSAADDPRIVILEGESTOACCOUNT, "AddPrivsToAccount" },
+	{ LSA_LSAREMOVEPRIVILEGESFROMACCOUNT, "MovePrivsFromAccount" },
+	{ LSA_LSAGETQUOTASFORACCOUNT, "GetQuotasForAccount" },
+	{ LSA_LSASETQUOTASFORACCOUNT, "SetQuotasForAccount" },
+	{ LSA_LSAGETSYSTEMACCESSACCOUNT, "GetSystemAccessAccount" },
+	{ LSA_LSASETSYSTEMACCESSACCOUNT, "SetSystemAccessAccount" },
+	{ LSA_LSAOPENTRUSTEDDOMAIN, "OpenTrustedDomain" },
+	{ LSA_LSAQUERYINFOTRUSTEDDOMAIN, "QueryInfoTrustedDomain" },
+	{ LSA_LSASETINFORMATIONTRUSTEDDOMAIN, "SetInfoTrustedDomain" },
+	{ LSA_LSAOPENSECRET, "OpenSecret" },
+	{ LSA_LSASETSECRET, "SetSecret" },
+	{ LSA_LSAQUERYSECRET, "QuerySecret" },
+	{ LSA_LSALOOKUPPRIVILEGEVALUE, "LookupPrivValue" },
+	{ LSA_LSALOOKUPPRIVILEGENAME, "LookupPrivName" },
+	{ LSA_LSALOOKUPPRIVILEGEDISPLAYNAME, "LookupPrivDispName" },
+	{ LSA_LSADELETEOBJECT, "DeleteObject" },
+	{ LSA_LSAENUMERATEACCOUNTSWITHUSERRIGHT, "EnumAccountsWithUserRight" },
+	{ LSA_LSAENUMERATEACCOUNTRIGHTS, "EnumAccountRights" },
+	{ LSA_LSAADDACCOUNTRIGHTS, "AddAccountRights" },
+	{ LSA_LSAREMOVEACCOUNTRIGHTS, "RemoveAccountRights" },
+	{ LSA_LSAQUERYTRUSTEDDOMAININFO, "QueryTrustedDomainInfo" },
+	{ LSA_LSASETTRUSTEDDOMAININFO, "SetTrustedDomainInfo" },
+	{ LSA_LSADELETETRUSTEDDOMAIN, "DeleteTrsutedDomain" },
+	{ LSA_LSASTOREPRIVATEDATA, "StorePrivateData" },
+	{ LSA_LSARETRIEVEPRIVATEDATA, "RetrievePrivateData" },
+	{ LSA_LSAOPENPOLICY2, "OpenPolicy2" },
+	{ LSA_LSAGETUSERNAME, "GetUsername" },
+	{ LSA_LSAFUNCTION_2E, "LSAFUNCTION_2E" },
+	{ LSA_LSAFUNCTION_2F, "LSAFUNCTION_2F" },
+	{ LSA_LSAQUERYTRUSTEDDOMAININFOBYNAME, "QueryTrustedDomainInfoByName" },
+	{ LSA_LSASETTRUSTEDDOMAININFOBYNAME, "SetTrustedDomainInfoByName" },
+	{ LSA_LSAENUMERATETRUSTEDDOMAINSEX, "EnumTrustedDomainsEx" },
+	{ LSA_LSACREATETRUSTEDDOMAINEX, "CreateTrustedDomainEx" },
+	{ LSA_LSACLOSETRUSTEDDOMAINEX, "CloseTrustedDomainEx" },
+	{ LSA_LSAQUERYDOMAININFORMATIONPOLICY, "QueryDomainInfoPolicy" },
+	{ LSA_LSASETDOMAININFORMATIONPOLICY, "SetDomainInfoPolicy" },
+	{ LSA_LSAOPENTRUSTEDDOMAINBYNAME, "OpenTrustedDomainByName" },
+	{ LSA_LSAFUNCTION_38, "LSAFUNCTION_38" },
+	{ LSA_LSALOOKUPSIDS2, "LookupSIDs2" },
+	{ LSA_LSALOOKUPNAMES2, "LookupNames2" },
+	{ LSA_LSAFUNCTION_3B, "LSAFUNCTION_3B" },
+	{ 0, NULL }
+};
+
 void 
 proto_register_dcerpc_lsa(void)
 {
         static hf_register_info hf[] = {
+
+        { &hf_lsa_opnum,
+	  { "Operation", "lsa.opnum", FT_UINT16, BASE_DEC,
+	    VALS(lsa_opnum_vals), 0x0, "Operation", HFILL }},
+
 	{ &hf_lsa_unknown_string,
 		{ "Unknown string", "lsa.unknown_string", FT_STRING, BASE_NONE,
 		NULL, 0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }},
@@ -4351,5 +4421,5 @@ proto_reg_handoff_dcerpc_lsa(void)
         /* Register protocol as dcerpc */
 
         dcerpc_init_uuid(proto_dcerpc_lsa, ett_dcerpc_lsa, &uuid_dcerpc_lsa,
-                         ver_dcerpc_lsa, dcerpc_lsa_dissectors);
+                         ver_dcerpc_lsa, dcerpc_lsa_dissectors, hf_lsa_opnum);
 }