diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-04-21 12:34:14 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-04-21 16:48:17 +0000 |
| commit | 7a1848b95d32e93e8ec97f342ec62a884b115a1b (patch) | |
| tree | 2785d9c3e5e48aa563a266886c9f4bd2455a272b /epan | |
| parent | 48c77d87106216cd3fd7e766bec9cfd791d1dfab (diff) | |
Fix gcc "warning: no previous prototype ... [-Wmissing-prototypes]"; Do some whitespace changes
Change-Id: I8c2e8694223270f1810aa6b13d955f0d08001d30
Reviewed-on: https://code.wireshark.org/review/1239
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan')
55 files changed, 560 insertions, 422 deletions
diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c index a86e438341..45f6af0e79 100644 --- a/epan/dissectors/packet-dcerpc-bossvr.c +++ b/epan/dissectors/packet-dcerpc-bossvr.c @@ -85,7 +85,7 @@ static dcerpc_sub_dissector bossvr_dissectors[] = { }; void -proto_register_bossvr (void) +proto_register_dcerpc_bossvr (void) { static hf_register_info hf[] = { { &hf_bossvr_opnum, @@ -102,7 +102,7 @@ proto_register_bossvr (void) } void -proto_reg_handoff_bossvr (void) +proto_reg_handoff_dcerpc_bossvr (void) { /* Register the protocol as dcerpc */ dcerpc_init_uuid (proto_bossvr, ett_bossvr, &uuid_bossvr, ver_bossvr, bossvr_dissectors, hf_bossvr_opnum); diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c index 7b3de3b0d6..db2706b325 100644 --- a/epan/dissectors/packet-dcerpc-browser.c +++ b/epan/dissectors/packet-dcerpc-browser.c @@ -37,6 +37,9 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" +void proto_register_dcerpc_browser(void); +void proto_reg_handoff_dcerpc_browser(void); + static int proto_dcerpc_browser = -1; static int hf_browser_opnum = -1; static int hf_browser_rc = -1; diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c index 1023738387..f788a60dab 100644 --- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c +++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c @@ -32,6 +32,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_cds_clerkserver (void); +void proto_reg_handoff_cds_clerkserver (void); static int proto_cds_clerkserver = -1; static int hf_cds_clerkserver_opnum = -1; @@ -46,33 +48,33 @@ static guint16 ver_cds_clerkserver = 1; static dcerpc_sub_dissector cds_clerkserver_dissectors[] = { - { 0, "AddReplica", NULL, NULL}, - { 1, "AllowClearinghouses", NULL, NULL}, - { 2, "Combine", NULL, NULL}, - { 3, "CreateChild", NULL, NULL}, - { 4, "CreateDirectory", NULL, NULL}, - { 5, "CreateSoftLink", NULL, NULL}, - { 6, "CreateObject", NULL, NULL}, - { 7, "DeleteChild", NULL, NULL}, - { 8, "DeleteObject", NULL, NULL}, - { 9, "DeleteSoftLink", NULL, NULL}, - { 10, "DeleteDirectory", NULL, NULL}, + { 0, "AddReplica", NULL, NULL}, + { 1, "AllowClearinghouses", NULL, NULL}, + { 2, "Combine", NULL, NULL}, + { 3, "CreateChild", NULL, NULL}, + { 4, "CreateDirectory", NULL, NULL}, + { 5, "CreateSoftLink", NULL, NULL}, + { 6, "CreateObject", NULL, NULL}, + { 7, "DeleteChild", NULL, NULL}, + { 8, "DeleteObject", NULL, NULL}, + { 9, "DeleteSoftLink", NULL, NULL}, + { 10, "DeleteDirectory", NULL, NULL}, { 11, "DisallowClearinghouses", NULL, NULL}, - { 12, "DoUpdate", NULL, NULL}, - { 13, "EnumerateAttributes", NULL, NULL}, - { 14, "EnumerateChildren", NULL, NULL}, - { 15, "EnumerateObjects", NULL, NULL}, - { 16, "EnumerateSoftLinks", NULL, NULL}, - { 17, "LinkReplica", NULL, NULL}, - { 18, "ModifyAttribute", NULL, NULL}, - { 19, "ModifyReplica", NULL, NULL}, - { 20, "NewEpoch", NULL, NULL}, - { 21, "ReadAttribute", NULL, NULL}, - { 22, "RemoveReplica", NULL, NULL}, - { 23, "ResolveName", NULL, NULL}, - { 24, "Skulk", NULL, NULL}, - { 25, "TestAttribute", NULL, NULL}, - { 26, "TestGroup", NULL, NULL}, + { 12, "DoUpdate", NULL, NULL}, + { 13, "EnumerateAttributes", NULL, NULL}, + { 14, "EnumerateChildren", NULL, NULL}, + { 15, "EnumerateObjects", NULL, NULL}, + { 16, "EnumerateSoftLinks", NULL, NULL}, + { 17, "LinkReplica", NULL, NULL}, + { 18, "ModifyAttribute", NULL, NULL}, + { 19, "ModifyReplica", NULL, NULL}, + { 20, "NewEpoch", NULL, NULL}, + { 21, "ReadAttribute", NULL, NULL}, + { 22, "RemoveReplica", NULL, NULL}, + { 23, "ResolveName", NULL, NULL}, + { 24, "Skulk", NULL, NULL}, + { 25, "TestAttribute", NULL, NULL}, + { 26, "TestGroup", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c index 4bb18f1b72..c010b457af 100644 --- a/epan/dissectors/packet-dcerpc-cds_solicit.c +++ b/epan/dissectors/packet-dcerpc-cds_solicit.c @@ -30,6 +30,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_cds_solicit (void); +void proto_reg_handoff_cds_solicit (void); static int proto_cds_solicit = -1; static int hf_cds_solicit_opnum = -1; @@ -43,8 +45,8 @@ static guint16 ver_cds_solicit = 1; static dcerpc_sub_dissector cds_solicit_dissectors[] = { - { 0, "cds_Solicit", NULL, NULL}, - { 1, "cds_Advertise", NULL, NULL}, + { 0, "cds_Solicit", NULL, NULL}, + { 1, "cds_Advertise", NULL, NULL}, { 2, "cds_SolicitServer", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c index 3039825641..b53129faf9 100644 --- a/epan/dissectors/packet-dcerpc-conv.c +++ b/epan/dissectors/packet-dcerpc-conv.c @@ -29,6 +29,8 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" +void proto_register_conv (void); +void proto_reg_handoff_conv (void); static int proto_conv = -1; static int hf_conv_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c index a954c95035..e3ad78d92c 100644 --- a/epan/dissectors/packet-dcerpc-cprpc_server.c +++ b/epan/dissectors/packet-dcerpc-cprpc_server.c @@ -30,6 +30,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_cprpc_server (void); +void proto_reg_handoff_cprpc_server (void); static int proto_cprpc_server = -1; static int hf_cprpc_server_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c index aacd0d13f4..9df1761190 100644 --- a/epan/dissectors/packet-dcerpc-dtsprovider.c +++ b/epan/dissectors/packet-dcerpc-dtsprovider.c @@ -31,6 +31,9 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" +void proto_register_dtsprovider (void); +void proto_reg_handoff_dtsprovider (void); + static int proto_dtsprovider = -1; static int hf_dtsprovider_opnum = -1; /* static int hf_dtsprovider_status = -1; */ diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c index dd994c28be..7822acaa18 100644 --- a/epan/dissectors/packet-dcerpc-dtsstime_req.c +++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c @@ -30,6 +30,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_dtsstime_req (void); +void proto_reg_handoff_dtsstime_req (void); static int proto_dtsstime_req = -1; static int hf_dtsstime_req_opnum = -1; @@ -43,7 +45,7 @@ static guint16 ver_dtsstime_req = 1; static dcerpc_sub_dissector dtsstime_req_dissectors[] = { - { 0, "ClerkRequestTime", NULL, NULL}, + { 0, "ClerkRequestTime", NULL, NULL}, { 1, "ServerRequestTime", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index f90cdaf5d6..f8c04ba12a 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -30,6 +30,8 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" +void proto_register_epm (void); +void proto_reg_handoff_epm (void); static int proto_epm3 = -1; static int proto_epm4 = -1; diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index d472a4c883..56dc75ec52 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -34,6 +34,9 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" +void proto_register_fileexp (void); +void proto_reg_handoff_fileexp (void); + #define AFS_SETMODTIME 1 #define AFS_SETOWNER 2 #define AFS_SETGROUP 4 diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index 77d8662b6b..243af6a519 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -32,6 +32,8 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" +void proto_register_fldb (void); +void proto_reg_handoff_fldb (void); static int proto_fldb = -1; static int hf_fldb_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c index b19eb54f79..221bc382ba 100644 --- a/epan/dissectors/packet-dcerpc-frsapi.c +++ b/epan/dissectors/packet-dcerpc-frsapi.c @@ -29,6 +29,9 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-frsapi.h" +void proto_register_dcerpc_frsapi(void); +void proto_reg_handoff_dcerpc_frsapi(void); + static int proto_dcerpc_frsapi = -1; static int hf_frsapi_opnum = -1; @@ -51,16 +54,16 @@ static guint16 ver_dcerpc_frsapi = 1; static dcerpc_sub_dissector dcerpc_frsapi_dissectors[] = { - { FRSAPI_VERIFY_PROMOTION, "VerifyPromotion", NULL, NULL }, - { FRSAPI_PROMOTION_STATUS, "PromotionStatus", NULL, NULL }, - { FRSAPI_START_DEMOTION, "StartDemotion", NULL, NULL }, - { FRSAPI_COMMIT_DEMOTION, "CommitDemotion", NULL, NULL }, + { FRSAPI_VERIFY_PROMOTION, "VerifyPromotion", NULL, NULL }, + { FRSAPI_PROMOTION_STATUS, "PromotionStatus", NULL, NULL }, + { FRSAPI_START_DEMOTION, "StartDemotion", NULL, NULL }, + { FRSAPI_COMMIT_DEMOTION, "CommitDemotion", NULL, NULL }, { FRSAPI_SET_DS_POLLING_INTERVAL_W, "Set_DsPollingIntervalW", NULL, NULL }, { FRSAPI_GET_DS_POLLING_INTERVAL_W, "Get_DsPollingIntervalW", NULL, NULL }, - { FRSAPI_VERIFY_PROMOTION_W, "VerifyPromotionW", NULL, NULL }, - { FRSAPI_INFO_W, "InfoW", NULL, NULL }, - { FRSAPI_IS_PATH_REPLICATED, "IsPathReplicated", NULL, NULL }, - { FRSAPI_WRITER_COMMAND, "WriterCommand", NULL, NULL }, + { FRSAPI_VERIFY_PROMOTION_W, "VerifyPromotionW", NULL, NULL }, + { FRSAPI_INFO_W, "InfoW", NULL, NULL }, + { FRSAPI_IS_PATH_REPLICATED, "IsPathReplicated", NULL, NULL }, + { FRSAPI_WRITER_COMMAND, "WriterCommand", NULL, NULL }, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c index 1edc476805..d361655946 100644 --- a/epan/dissectors/packet-dcerpc-ftserver.c +++ b/epan/dissectors/packet-dcerpc-ftserver.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_ftserver (void); +void proto_reg_handoff_ftserver (void); static int proto_ftserver = -1; static int hf_ftserver_opnum = -1; @@ -45,27 +47,27 @@ static guint16 ver_ftserver = 4; static dcerpc_sub_dissector ftserver_dissectors[] = { - { 0, "CreateTrans", NULL, NULL }, - { 1, "AbortTrans", NULL, NULL }, - { 2, "DeleteTrans", NULL, NULL }, - { 3, "CreateVolume", NULL, NULL }, - { 4, "DeleteVolume", NULL, NULL }, - { 5, "Dump", NULL, NULL }, - { 6, "Restore", NULL, NULL }, - { 7, "Forward", NULL, NULL }, - { 8, "Clone", NULL, NULL }, - { 9, "ReClone", NULL, NULL }, - { 10, "GetFlags", NULL, NULL }, - { 11, "SetFlags", NULL, NULL }, - { 12, "GetStatus", NULL, NULL }, - { 13, "SetStatus", NULL, NULL }, - { 14, "ListVolumes", NULL, NULL }, - { 15, "ListAggregates", NULL, NULL }, - { 16, "AggregateInfo", NULL, NULL }, - { 17, "Monitor", NULL, NULL }, - { 18, "GetOneVolStatus", NULL, NULL }, + { 0, "CreateTrans", NULL, NULL }, + { 1, "AbortTrans", NULL, NULL }, + { 2, "DeleteTrans", NULL, NULL }, + { 3, "CreateVolume", NULL, NULL }, + { 4, "DeleteVolume", NULL, NULL }, + { 5, "Dump", NULL, NULL }, + { 6, "Restore", NULL, NULL }, + { 7, "Forward", NULL, NULL }, + { 8, "Clone", NULL, NULL }, + { 9, "ReClone", NULL, NULL }, + { 10, "GetFlags", NULL, NULL }, + { 11, "SetFlags", NULL, NULL }, + { 12, "GetStatus", NULL, NULL }, + { 13, "SetStatus", NULL, NULL }, + { 14, "ListVolumes", NULL, NULL }, + { 15, "ListAggregates", NULL, NULL }, + { 16, "AggregateInfo", NULL, NULL }, + { 17, "Monitor", NULL, NULL }, + { 18, "GetOneVolStatus", NULL, NULL }, { 19, "GetServerInterfaces", NULL, NULL }, - { 20, "SwapIDs", NULL, NULL }, + { 20, "SwapIDs", NULL, NULL }, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c index 19903752b1..7ed8c45873 100644 --- a/epan/dissectors/packet-dcerpc-icl_rpc.c +++ b/epan/dissectors/packet-dcerpc-icl_rpc.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_icl_rpc (void); +void proto_reg_handoff_icl_rpc (void); + static int proto_icl_rpc = -1; static int hf_icl_rpc_opnum = -1; @@ -46,9 +49,9 @@ static dcerpc_sub_dissector icl_rpc_dissectors[] = { { 1, "DFSTRACE_SetSetInfo", NULL, NULL }, { 2, "DFSTRACE_GetLogInfo", NULL, NULL }, { 3, "DFSTRACE_SetLogInfo", NULL, NULL }, - { 4, "DFSTRACE_ClearSet", NULL, NULL }, - { 5, "DFSTRACE_ClearLog", NULL, NULL }, - { 6, "DFSTRACE_DumpSet", NULL, NULL }, + { 4, "DFSTRACE_ClearSet", NULL, NULL }, + { 5, "DFSTRACE_ClearLog", NULL, NULL }, + { 6, "DFSTRACE_DumpSet", NULL, NULL }, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index 638a9ef6d4..06592c1e0f 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.c @@ -34,6 +34,9 @@ #include "packet-kerberos.h" #include "packet-dcerpc-dce122.h" +void proto_register_krb5rpc (void); +void proto_reg_handoff_krb5rpc (void); + static int proto_krb5rpc = -1; static gint ett_krb5rpc = -1; diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c index bb779b799b..0988bde5b7 100644 --- a/epan/dissectors/packet-dcerpc-llb.c +++ b/epan/dissectors/packet-dcerpc-llb.c @@ -32,6 +32,8 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" +void proto_register_llb (void); +void proto_reg_handoff_llb (void); static int proto_llb = -1; static int hf_llb_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c index dbada69694..ba692352fa 100644 --- a/epan/dissectors/packet-dcerpc-mgmt.c +++ b/epan/dissectors/packet-dcerpc-mgmt.c @@ -29,6 +29,8 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-nt.h" +void proto_register_mgmt (void); +void proto_reg_handoff_mgmt (void); static int proto_mgmt = -1; static int hf_mgmt_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index db4905a9ed..52527bd2b3 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -48,7 +48,11 @@ #include "packet-kerberos.h" /* for decoding */ +void proto_register_dcerpc_netlogon(void); +void proto_reg_handoff_dcerpc_netlogon(void); + extern const char *gbl_nt_password; + #ifdef DEBUG_NETLOGON #include <stdio.h> #define debugprintf(...) fprintf(stderr,__VA_ARGS__) diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c index 78c9056c6f..e9b2067706 100644 --- a/epan/dissectors/packet-dcerpc-pnp.c +++ b/epan/dissectors/packet-dcerpc-pnp.c @@ -29,6 +29,9 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-pnp.h" +void proto_register_dcerpc_pnp(void); +void proto_reg_handoff_dcerpc_pnp(void); + static int proto_dcerpc_pnp = -1; static int hf_pnp_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c index efdd090718..a01fd52025 100644 --- a/epan/dissectors/packet-dcerpc-rdaclif.c +++ b/epan/dissectors/packet-dcerpc-rdaclif.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rdaclif (void); +void proto_reg_handoff_rdaclif (void); + static int proto_rdaclif = -1; static int hf_rdaclif_opnum = -1; @@ -44,14 +47,14 @@ static guint16 ver_rdaclif = 1; static dcerpc_sub_dissector rdaclif_dissectors[] = { - {0, "lookup", NULL, NULL}, - {1, "replace", NULL, NULL}, - {2, "get_access", NULL, NULL}, - {3, "test_access", NULL, NULL}, - {4, "test_access_on_behalf", NULL, NULL}, - {5, "get_manager_types", NULL, NULL}, - {6, "get_printstring", NULL, NULL}, - {7, "get_referral", NULL, NULL}, + {0, "lookup", NULL, NULL}, + {1, "replace", NULL, NULL}, + {2, "get_access", NULL, NULL}, + {3, "test_access", NULL, NULL}, + {4, "test_access_on_behalf", NULL, NULL}, + {5, "get_manager_types", NULL, NULL}, + {6, "get_printstring", NULL, NULL}, + {7, "get_referral", NULL, NULL}, {8, "get_mgr_types_semantics", NULL, NULL}, {0, NULL, NULL, NULL} }; diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c index 38f85781d7..50663eba74 100644 --- a/epan/dissectors/packet-dcerpc-rep_proc.c +++ b/epan/dissectors/packet-dcerpc-rep_proc.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rep_proc (void); +void proto_reg_handoff_rep_proc (void); static int proto_rep_proc = -1; static int hf_rep_proc_opnum = -1; @@ -44,16 +46,16 @@ static guint16 ver_rep_proc = 4; static dcerpc_sub_dissector rep_proc_dissectors[] = { - { 0, "CheckReplicationConfig", NULL, NULL }, + { 0, "CheckReplicationConfig", NULL, NULL }, { 1, "AllCheckReplicationConfig", NULL, NULL }, - { 2, "KeepFilesAlive", NULL , NULL}, - { 3, "GetVolChangedFiles", NULL, NULL }, - { 4, "GetRepStatus", NULL, NULL}, - { 5, "GetRepServerStatus", NULL, NULL}, - { 6, "UpdateSelf", NULL, NULL}, - { 7, "Probe", NULL, NULL}, - { 8, "GetOneRepStatus", NULL, NULL }, - { 9, "GetServerInterfaces", NULL, NULL}, + { 2, "KeepFilesAlive", NULL , NULL}, + { 3, "GetVolChangedFiles", NULL, NULL }, + { 4, "GetRepStatus", NULL, NULL}, + { 5, "GetRepServerStatus", NULL, NULL}, + { 6, "UpdateSelf", NULL, NULL}, + { 7, "Probe", NULL, NULL}, + { 8, "GetOneRepStatus", NULL, NULL }, + { 9, "GetServerInterfaces", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c index b2f7f089c7..a87471b029 100644 --- a/epan/dissectors/packet-dcerpc-roverride.c +++ b/epan/dissectors/packet-dcerpc-roverride.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_roverride (void); +void proto_reg_handoff_roverride (void); static int proto_roverride = -1; static int hf_roverride_opnum = -1; @@ -44,12 +46,12 @@ static guint16 ver_roverride = 1; static dcerpc_sub_dissector roverride_dissectors[] = { - { 0, "roverride_get_login_info", NULL, NULL}, - { 1, "roverride_check_passwd", NULL, NULL}, - { 2, "roverride_is_passwd_overridden", NULL, NULL}, - { 3, "roverride_get_by_unix_num", NULL, NULL}, - { 4, "roverride_get_group_info", NULL, NULL}, - { 5, "roverride_check_group_passwd", NULL, NULL}, + { 0, "roverride_get_login_info", NULL, NULL}, + { 1, "roverride_check_passwd", NULL, NULL}, + { 2, "roverride_is_passwd_overridden", NULL, NULL}, + { 3, "roverride_get_by_unix_num", NULL, NULL}, + { 4, "roverride_get_group_info", NULL, NULL}, + { 5, "roverride_check_group_passwd", NULL, NULL}, { 6, "roverride_is_grp_pwd_overridden", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 7b18f7844a..a5e17b22e3 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rpriv (void); +void proto_reg_handoff_rpriv (void); static int proto_rpriv = -1; static int hf_rpriv_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c index b2b447a202..f6f7f2d7c7 100644 --- a/epan/dissectors/packet-dcerpc-rras.c +++ b/epan/dissectors/packet-dcerpc-rras.c @@ -29,6 +29,9 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-rras.h" +void proto_register_dcerpc_rras(void); +void proto_reg_handoff_dcerpc_rras(void); + static int proto_dcerpc_rras = -1; static int hf_rras_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c index 05ae6404d0..5f834ee0df 100644 --- a/epan/dissectors/packet-dcerpc-rs_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_acct.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_acct (void); +void proto_reg_handoff_rs_acct (void); static int proto_rs_acct = -1; static int hf_rs_acct_opnum = -1; @@ -104,11 +106,11 @@ rs_acct_dissect_get_projlist_rqst (tvbuff_t *tvb, int offset, static dcerpc_sub_dissector rs_acct_dissectors[] = { - { 0, "add", NULL, NULL}, - { 1, "delete", NULL, NULL}, - { 2, "rename", NULL, NULL}, - { 3, "lookup", rs_acct_dissect_lookup_rqst, NULL}, - { 4, "replace", NULL, NULL}, + { 0, "add", NULL, NULL}, + { 1, "delete", NULL, NULL}, + { 2, "rename", NULL, NULL}, + { 3, "lookup", rs_acct_dissect_lookup_rqst, NULL}, + { 4, "replace", NULL, NULL}, { 5, "get_projlist", rs_acct_dissect_get_projlist_rqst, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c index 23eded6bc9..1b452da9f8 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_attr.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_attr (void); +void proto_reg_handoff_rs_attr (void); static int proto_rs_attr = -1; static int hf_rs_attr_opnum = -1; @@ -44,15 +46,15 @@ static guint16 ver_rs_attr = 0; static dcerpc_sub_dissector rs_attr_dissectors[] = { - { 0, "rs_attr_cursor_init", NULL, NULL}, - { 1, "rs_attr_lookup_by_id", NULL, NULL}, + { 0, "rs_attr_cursor_init", NULL, NULL}, + { 1, "rs_attr_lookup_by_id", NULL, NULL}, { 2, "rs_attr_lookup_no_expand", NULL, NULL}, - { 3, "rs_attr_lookup_by_name", NULL, NULL}, - { 4, "rs_attr_update", NULL, NULL}, - { 5, "rs_attr_test_and_update", NULL, NULL}, - { 6, "rs_attr_delete", NULL, NULL}, - { 7, "rs_attr_get_referral", NULL, NULL}, - { 8, "rs_attr_get_effective", NULL, NULL}, + { 3, "rs_attr_lookup_by_name", NULL, NULL}, + { 4, "rs_attr_update", NULL, NULL}, + { 5, "rs_attr_test_and_update", NULL, NULL}, + { 6, "rs_attr_delete", NULL, NULL}, + { 7, "rs_attr_get_referral", NULL, NULL}, + { 8, "rs_attr_get_effective", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c index 3894c265bc..3d702c5543 100644 --- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c +++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_attr_schema (void); +void proto_reg_handoff_rs_attr_schema (void); + static int proto_rs_attr_schema = -1; static int hf_rs_attr_schema_opnum = -1; @@ -38,20 +41,20 @@ static int hf_rs_attr_schema_opnum = -1; static gint ett_rs_attr_schema = -1; static e_uuid_t uuid_rs_attr_schema = { 0xb47c9460, 0x567f, 0x11cb, {0x8c, 0x09, 0x08, 0x00, 0x1e, 0x04, 0xde, - 0x8c} }; + 0x8c} }; static guint16 ver_rs_attr_schema = 0; static dcerpc_sub_dissector rs_attr_schema_dissectors[] = { - {0, "create_entry", NULL, NULL}, - {1, "delete_entry", NULL, NULL}, - {2, "update_entry", NULL, NULL}, - {3, "cursor_init", NULL, NULL}, - {4, "scan", NULL, NULL}, + {0, "create_entry", NULL, NULL}, + {1, "delete_entry", NULL, NULL}, + {2, "update_entry", NULL, NULL}, + {3, "cursor_init", NULL, NULL}, + {4, "scan", NULL, NULL}, {5, "lookup_by_name", NULL, NULL}, - {6, "lookup_by_id", NULL, NULL}, - {7, "get_referral", NULL, NULL}, - {8, "get_acl_mgrs", NULL, NULL}, + {6, "lookup_by_id", NULL, NULL}, + {7, "get_referral", NULL, NULL}, + {8, "get_acl_mgrs", NULL, NULL}, {9, "aclmgr_strings", NULL, NULL}, {0, NULL, NULL, NULL} }; @@ -70,7 +73,7 @@ proto_register_rs_attr_schema (void) }; proto_rs_attr_schema = proto_register_protocol ("DCE/RPC Registry Server Attributes Schema", - "rs_attr_schema", "rs_attr_schema"); + "rs_attr_schema", "rs_attr_schema"); proto_register_field_array (proto_rs_attr_schema, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); } @@ -80,6 +83,6 @@ proto_reg_handoff_rs_attr_schema (void) { /* Register the protocol as dcerpc */ dcerpc_init_uuid (proto_rs_attr_schema, ett_rs_attr_schema, - &uuid_rs_attr_schema, ver_rs_attr_schema, - rs_attr_schema_dissectors, hf_rs_attr_schema_opnum); + &uuid_rs_attr_schema, ver_rs_attr_schema, + rs_attr_schema_dissectors, hf_rs_attr_schema_opnum); } diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c index b6509a7837..e16b3e22ea 100644 --- a/epan/dissectors/packet-dcerpc-rs_bind.c +++ b/epan/dissectors/packet-dcerpc-rs_bind.c @@ -32,6 +32,8 @@ #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" +void proto_register_rs_bind (void); +void proto_reg_handoff_rs_bind (void); static int proto_rs_bind = -1; static int hf_rs_bind_opnum = -1; @@ -41,7 +43,7 @@ static gint ett_rs_bind = -1; static e_uuid_t uuid_rs_bind = { 0xd46113d0, 0xa848, 0x11cb, {0xb8, 0x63, 0x08, 0x00, 0x1e, 0x04, 0x6a, - 0xa5} + 0xa5} }; static guint16 ver_rs_bind = 2; @@ -75,5 +77,5 @@ proto_reg_handoff_rs_bind (void) { /* Register the protocol as dcerpc */ dcerpc_init_uuid (proto_rs_bind, ett_rs_bind, &uuid_rs_bind, ver_rs_bind, - rs_bind_dissectors, hf_rs_bind_opnum); + rs_bind_dissectors, hf_rs_bind_opnum); } diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index 3b304c15ce..64bc7fa417 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_misc (void); +void proto_reg_handoff_rs_misc (void); static int proto_rs_misc = -1; static int hf_rs_misc_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 559ece0cbb..055f99d524 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -31,6 +31,10 @@ #include <epan/packet.h> #include "packet-dcerpc.h" #include "packet-dcerpc-dce122.h" + +void proto_register_rs_pgo (void); +void proto_reg_handoff_rs_pgo (void); + /* delete dissect_rgy_acct_user_flags_t @@ -85,46 +89,46 @@ static gint ett_rs_pgo_query_result_t = -1; static gint ett_rs_pgo_result_t = -1; -#define sec_rgy_acct_admin_valid 0x1 -#define sec_rgy_acct_admin_audit 0x2 -#define sec_rgy_acct_admin_server 0x4 -#define sec_rgy_acct_admin_client 0x8 -#define sec_rgy_acct_admin_flags_none 0 -#define sec_rgy_acct_auth_post_dated 0x1 -#define sec_rgy_acct_auth_forwardable 0x2 -#define sec_rgy_acct_auth_tgt 0x4 -#define sec_rgy_acct_auth_renewable 0x8 -#define sec_rgy_acct_auth_proxiable 0x10 -#define sec_rgy_acct_auth_dup_skey 0x20 -#define sec_rgy_acct_auth_user_to_user 0x40 -#define sec_rgy_acct_auth_flags_none 0 -#define sec_rgy_acct_user_passwd_valid 0x1 -#define sec_rgy_acct_user_flags_none 0 -#define rs_acct_part_user 0x1 -#define rs_acct_part_admin 0x2 -#define rs_acct_part_passwd 0x4 -#define rs_acct_part_unused 0x8 -#define rs_acct_part_login_name 0x10 -#define sec_rgy_pgo_is_an_alias 0x1 -#define sec_rgy_pgo_is_required 0x2 -#define sec_rgy_pgo_projlist_ok 0x4 -#define sec_rgy_pgo_flags_none 0 -#define sec_rgy_acct_user_passwd_valid 0x1 -#define sec_rgy_acct_user_flags_none 0 +#define sec_rgy_acct_admin_valid 0x01 +#define sec_rgy_acct_admin_audit 0x02 +#define sec_rgy_acct_admin_server 0x04 +#define sec_rgy_acct_admin_client 0x08 +#define sec_rgy_acct_admin_flags_none 0x00 +#define sec_rgy_acct_auth_post_dated 0x01 +#define sec_rgy_acct_auth_forwardable 0x02 +#define sec_rgy_acct_auth_tgt 0x04 +#define sec_rgy_acct_auth_renewable 0x08 +#define sec_rgy_acct_auth_proxiable 0x10 +#define sec_rgy_acct_auth_dup_skey 0x20 +#define sec_rgy_acct_auth_user_to_user 0x40 +#define sec_rgy_acct_auth_flags_none 0x00 +#define sec_rgy_acct_user_passwd_valid 0x01 +#define sec_rgy_acct_user_flags_none 0x00 +#define rs_acct_part_user 0x01 +#define rs_acct_part_admin 0x02 +#define rs_acct_part_passwd 0x04 +#define rs_acct_part_unused 0x08 +#define rs_acct_part_login_name 0x10 +#define sec_rgy_pgo_is_an_alias 0x01 +#define sec_rgy_pgo_is_required 0x02 +#define sec_rgy_pgo_projlist_ok 0x04 +#define sec_rgy_pgo_flags_none 0x00 +#define sec_rgy_acct_user_passwd_valid 0x01 +#define sec_rgy_acct_user_flags_none 0x00 static gint ett_rs_pgo = -1; static e_uuid_t uuid_rs_pgo = { 0x4c878280, 0x3000, 0x0000, {0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, - 0x00} + 0x00} }; static guint16 ver_rs_pgo = 1; static int dissect_error_status_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { proto_item *item; proto_tree *tree; @@ -142,7 +146,7 @@ dissect_error_status_t (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep, hf_error_status_t, - &st); + &st); st_str = val_to_str_ext (st, &dce_error_vals_ext, "%u"); col_append_fstr (pinfo->cinfo, COL_INFO, " st:%s ", st_str); @@ -154,8 +158,8 @@ dissect_error_status_t (tvbuff_t * tvb, int offset, static int dissect_sec_rgy_pname_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { @@ -178,31 +182,31 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_pname_t"); + proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_pname_t"); tree = proto_item_add_subtree (item, ett_sec_rgy_pname_t); } offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep, - hf_sec_rgy_pname_t_size, &string_size); + hf_sec_rgy_pname_t_size, &string_size); col_append_fstr (pinfo->cinfo, COL_INFO, " String_size:%u", string_size); if (string_size < sec_rgy_pname_t_size) { /* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */ proto_tree_add_item (tree, hf_sec_rgy_pname_t_principalName_string, - tvb, offset, string_size, ENC_ASCII|ENC_NA); + tvb, offset, string_size, ENC_ASCII|ENC_NA); if (string_size > 1) - { - col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", - tvb_get_string(wmem_packet_scope(), tvb, offset, string_size)); - } + { + col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", + tvb_get_string(wmem_packet_scope(), tvb, offset, string_size)); + } offset += string_size; } else { - col_append_fstr (pinfo->cinfo, COL_INFO, - " :FIXME!: Invalid string length of %u", - string_size); + col_append_fstr (pinfo->cinfo, COL_INFO, + " :FIXME!: Invalid string length of %u", + string_size); } proto_item_set_len (item, offset - old_offset); @@ -211,8 +215,8 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In static int dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -237,14 +241,14 @@ dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - "sec_rgy_pgo_flags_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + "sec_rgy_pgo_flags_t "); tree = proto_item_add_subtree (item, ett_sec_rgy_pgo_flags_t); } offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_sec_rgy_pgo_flags_t, &flags); + hf_sec_rgy_pgo_flags_t, &flags); /* * @@ -269,10 +273,10 @@ dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset, * const unsigned32 sec_rgy_pgo_flags_none = 0; */ -#define sec_rgy_pgo_is_an_alias 0x1 -#define sec_rgy_pgo_is_required 0x2 -#define sec_rgy_pgo_projlist_ok 0x4 -#define sec_rgy_pgo_flags_none 0 +#define sec_rgy_pgo_is_an_alias 0x01 +#define sec_rgy_pgo_is_required 0x02 +#define sec_rgy_pgo_projlist_ok 0x04 +#define sec_rgy_pgo_flags_none 0x00 col_append_str (pinfo->cinfo, COL_INFO, " PgoFlags="); @@ -306,8 +310,8 @@ dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset, static int dissect_rs_cache_data_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -336,7 +340,7 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, "rs_cache_data_t"); + proto_tree_add_text (parent_tree, tvb, offset, -1, "rs_cache_data_t"); tree = proto_item_add_subtree (item, ett_rs_cache_data_t); } @@ -345,20 +349,20 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset, dissect_ndr_uuid_t(tvb, offset, pinfo, tree, di, drep, hf_rs_uuid1, &uuid1); offset = dissect_dcerpc_time_t (tvb, offset, pinfo, tree, drep, hf_rs_timeval, - &person_dtm); + &person_dtm); offset = dissect_dcerpc_time_t (tvb, offset, pinfo, tree, drep, hf_rs_timeval, - &group_dtm); + &group_dtm); offset = dissect_dcerpc_time_t (tvb, offset, pinfo, tree, drep, hf_rs_timeval, - &org_dtm); + &org_dtm); col_append_fstr (pinfo->cinfo, COL_INFO, - " siteid %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x person_dtm:%u group_dtm:%u org_dtm:%u", - uuid1.Data1, uuid1.Data2, uuid1.Data3, uuid1.Data4[0], - uuid1.Data4[1], uuid1.Data4[2], uuid1.Data4[3], - uuid1.Data4[4], uuid1.Data4[5], uuid1.Data4[6], - uuid1.Data4[7], person_dtm, group_dtm, org_dtm); + " siteid %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x person_dtm:%u group_dtm:%u org_dtm:%u", + uuid1.Data1, uuid1.Data2, uuid1.Data3, uuid1.Data4[0], + uuid1.Data4[1], uuid1.Data4[2], uuid1.Data4[3], + uuid1.Data4[4], uuid1.Data4[5], uuid1.Data4[6], + uuid1.Data4[7], person_dtm, group_dtm, org_dtm); proto_item_set_len (item, offset - old_offset); return offset; @@ -368,8 +372,8 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset, static int dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { @@ -389,32 +393,32 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_name_t"); + proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_name_t"); tree = proto_item_add_subtree (item, ett_sec_rgy_name_t); } offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_sec_rgy_name_t_size, &string_size); + hf_sec_rgy_name_t_size, &string_size); col_append_fstr (pinfo->cinfo, COL_INFO, " String_size:%u", string_size); if (string_size < sec_rgy_name_t_size) { /* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */ proto_tree_add_item (tree, hf_sec_rgy_name_t_principalName_string, - tvb, offset, string_size, ENC_ASCII|ENC_NA); + tvb, offset, string_size, ENC_ASCII|ENC_NA); if (string_size > 1) - { - col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", - tvb_get_string (wmem_packet_scope(), tvb, offset, string_size)); - } + { + col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", + tvb_get_string (wmem_packet_scope(), tvb, offset, string_size)); + } offset += string_size; } else { - col_append_fstr (pinfo->cinfo, COL_INFO, - " :FIXME!: Invalid string length of %u", - string_size); + col_append_fstr (pinfo->cinfo, COL_INFO, + " :FIXME!: Invalid string length of %u", + string_size); } proto_item_set_len (item, offset - old_offset); @@ -424,8 +428,8 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset, static int dissect_sec_rgy_domain_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -446,17 +450,17 @@ dissect_sec_rgy_domain_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_domain_t"); + proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_domain_t"); tree = proto_item_add_subtree (item, ett_sec_rgy_domain_t); } offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_sec_rgy_domain_t, - &domain_t); + &domain_t); col_append_fstr (pinfo->cinfo, COL_INFO, " sec_rgy_domain_t:%u", - domain_t); + domain_t); proto_item_set_len (item, offset - old_offset); @@ -465,8 +469,8 @@ dissect_sec_rgy_domain_t (tvbuff_t * tvb, int offset, static int dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -495,8 +499,8 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - " sec_rgy_pgo_item_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + " sec_rgy_pgo_item_t "); tree = proto_item_add_subtree (item, ett_sec_rgy_pgo_item_t); } @@ -504,20 +508,20 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset, dissect_ndr_uuid_t(tvb, offset, pinfo, tree, di, drep, hf_rs_uuid1, &id); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_rs_sec_rgy_pgo_item_t_unix_num, &unix_num); + hf_rs_sec_rgy_pgo_item_t_unix_num, &unix_num); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_rs_sec_rgy_pgo_item_t_quota, "a); + hf_rs_sec_rgy_pgo_item_t_quota, "a); offset = dissect_sec_rgy_pgo_flags_t (tvb, offset, pinfo, tree, di, drep); - offset += 4; /* XXX */ + offset += 4; /* XXX */ offset = dissect_sec_rgy_pname_t (tvb, offset, pinfo, tree, di, drep); col_append_fstr (pinfo->cinfo, COL_INFO, - " sec_rgy_pgo_item_t - id %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x unix_num:%u quota:%u", - id.Data1, id.Data2, id.Data3, id.Data4[0], - id.Data4[1], id.Data4[2], id.Data4[3], - id.Data4[4], id.Data4[5], id.Data4[6], - id.Data4[7], unix_num, quota); + " sec_rgy_pgo_item_t - id %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x unix_num:%u quota:%u", + id.Data1, id.Data2, id.Data3, id.Data4[0], + id.Data4[1], id.Data4[2], id.Data4[3], + id.Data4[4], id.Data4[5], id.Data4[6], + id.Data4[7], unix_num, quota); proto_item_set_len (item, offset - old_offset); return offset; @@ -526,8 +530,8 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset, static int dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -557,8 +561,8 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - " sec_rgy_cursor_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + " sec_rgy_cursor_t "); tree = proto_item_add_subtree (item, ett_sec_rgy_cursor_t); } @@ -566,17 +570,17 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset, dissect_ndr_uuid_t(tvb, offset, pinfo, tree, di, drep, hf_rs_uuid1, &source); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_rs_sec_rgy_pgo_item_t_unix_num, &handle); + hf_rs_sec_rgy_pgo_item_t_unix_num, &handle); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_rs_sec_rgy_pgo_item_t_quota, &valid); + hf_rs_sec_rgy_pgo_item_t_quota, &valid); col_append_fstr (pinfo->cinfo, COL_INFO, - " sec_rgy_cursor_t - source %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x handle:%u valid:%u", - source.Data1, source.Data2, source.Data3, - source.Data4[0], source.Data4[1], source.Data4[2], - source.Data4[3], source.Data4[4], source.Data4[5], - source.Data4[6], source.Data4[7], handle, valid); + " sec_rgy_cursor_t - source %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x handle:%u valid:%u", + source.Data1, source.Data2, source.Data3, + source.Data4[0], source.Data4[1], source.Data4[2], + source.Data4[3], source.Data4[4], source.Data4[5], + source.Data4[6], source.Data4[7], handle, valid); proto_item_set_len (item, offset - old_offset); return offset; @@ -584,8 +588,8 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset, static int dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { enum @@ -612,12 +616,12 @@ dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, "rs_pgo_query_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, "rs_pgo_query_t "); tree = proto_item_add_subtree (item, ett_rs_pgo_query_t); } offset = dissect_ndr_uint8 (tvb, offset, pinfo, tree, di, drep, hf_rs_pgo_query_t, - &query_t); + &query_t); col_append_str (pinfo->cinfo, COL_INFO, " rs_pgo_query_t:"); switch (query_t) @@ -638,7 +642,7 @@ dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset, col_append_str (pinfo->cinfo, COL_INFO, "NONE"); break; default: - col_append_fstr (pinfo->cinfo, COL_INFO, " unknown:%u", query_t); + col_append_fstr (pinfo->cinfo, COL_INFO, " unknown:%u", query_t); break; ; } @@ -649,8 +653,8 @@ dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset, } static int dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -675,8 +679,8 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - "rs_pgo_id_key_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + "rs_pgo_id_key_t "); tree = proto_item_add_subtree (item, ett_rs_pgo_id_key_t); } @@ -685,10 +689,10 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset, offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, di, drep); col_append_fstr (pinfo->cinfo, COL_INFO, - " rs_pgo_id_key_t - id %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - id.Data1, id.Data2, id.Data3, id.Data4[0], - id.Data4[1], id.Data4[2], id.Data4[3], - id.Data4[4], id.Data4[5], id.Data4[6], id.Data4[7]); + " rs_pgo_id_key_t - id %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + id.Data1, id.Data2, id.Data3, id.Data4[0], + id.Data4[1], id.Data4[2], id.Data4[3], + id.Data4[4], id.Data4[5], id.Data4[6], id.Data4[7]); proto_item_set_len (item, offset - old_offset); return offset; @@ -697,8 +701,8 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset, static int dissect_rs_pgo_result_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -722,8 +726,8 @@ dissect_rs_pgo_result_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - "rs_pgo_result_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + "rs_pgo_result_t "); tree = proto_item_add_subtree (item, ett_rs_pgo_result_t); } @@ -738,8 +742,8 @@ dissect_rs_pgo_result_t (tvbuff_t * tvb, int offset, static int dissect_rs_pgo_unix_num_key_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { /* @@ -767,18 +771,18 @@ r if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - " rs_pgo_unix_num_key_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + " rs_pgo_unix_num_key_t "); tree = proto_item_add_subtree (item, ett_rs_pgo_unix_num_key_t); } offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_rs_pgo_unix_num_key_t, &rs_pgo_unix_num_key_t); + hf_rs_pgo_unix_num_key_t, &rs_pgo_unix_num_key_t); offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, di, drep); col_append_fstr (pinfo->cinfo, COL_INFO, - " rs_pgo_unix_num_key_t:%u", rs_pgo_unix_num_key_t); + " rs_pgo_unix_num_key_t:%u", rs_pgo_unix_num_key_t); proto_item_set_len (item, offset - old_offset); return offset; @@ -787,8 +791,8 @@ r static int dissect_rs_pgo_query_key_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { enum @@ -834,13 +838,13 @@ dissect_rs_pgo_query_key_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = - proto_tree_add_text (parent_tree, tvb, offset, -1, - "rs_pgo_query_key_t "); + proto_tree_add_text (parent_tree, tvb, offset, -1, + "rs_pgo_query_key_t "); tree = proto_item_add_subtree (item, ett_rs_pgo_query_key_t); } offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, di, drep, hf_rs_pgo_query_key_t, - &query_t); + &query_t); col_append_str (pinfo->cinfo, COL_INFO, " rs_pgo_query_key_t:"); offset += 4; switch (query_t) @@ -877,8 +881,8 @@ dissect_rs_pgo_query_key_t (tvbuff_t * tvb, int offset, static int dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * parent_tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * parent_tree, + dcerpc_info *di, guint8 * drep) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -906,18 +910,18 @@ dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset, if (parent_tree) { item = proto_tree_add_text (parent_tree, tvb, offset, -1, - "rs_pgo_query_result_t"); + "rs_pgo_query_result_t"); tree = proto_item_add_subtree (item, ett_rs_pgo_query_result_t); } offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_rs_pgo_query_result_t, &st); + hf_rs_pgo_query_result_t, &st); status = val_to_str_ext (st, &dce_error_vals_ext, "%u"); col_append_fstr (pinfo->cinfo, COL_INFO, " status:%s ", status); - offset += 4; /* XXX */ + offset += 4; /* XXX */ switch (st) { @@ -937,8 +941,8 @@ dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_add_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -956,15 +960,15 @@ rs_pgo_dissect_add_rqst (tvbuff_t * tvb, int offset, offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, di, drep); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_sec_rgy_pgo_item_t, NDR_POINTER_REF, - "sec_rgy_pgo_item_t: ", -1); + dissect_sec_rgy_pgo_item_t, NDR_POINTER_REF, + "sec_rgy_pgo_item_t: ", -1); return offset; } static int rs_pgo_dissect_add_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { gint buff_remain; @@ -984,20 +988,20 @@ rs_pgo_dissect_add_resp (tvbuff_t * tvb, int offset, if (buff_remain > 8) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info: ", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info: ", -1); } offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status: ", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status: ", + -1); return offset; } static int rs_pgo_dissect_delete_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1016,8 +1020,8 @@ rs_pgo_dissect_delete_rqst (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_delete_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { gint buff_remain; @@ -1037,22 +1041,22 @@ rs_pgo_dissect_delete_resp (tvbuff_t * tvb, int offset, if (buff_remain > 8) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); } offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; } static int rs_pgo_dissect_replace_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1068,16 +1072,16 @@ rs_pgo_dissect_replace_rqst (tvbuff_t * tvb, int offset, offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, di, drep); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_sec_rgy_pgo_item_t, NDR_POINTER_REF, - "pgo_item:", -1); + dissect_sec_rgy_pgo_item_t, NDR_POINTER_REF, + "pgo_item:", -1); return offset; } static int rs_pgo_dissect_replace_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1092,12 +1096,12 @@ rs_pgo_dissect_replace_resp (tvbuff_t * tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; } @@ -1105,8 +1109,8 @@ rs_pgo_dissect_replace_resp (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_add_member_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1131,8 +1135,8 @@ rs_pgo_dissect_add_member_rqst (tvbuff_t * tvb, int offset, } static int rs_pgo_dissect_rename_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1154,8 +1158,8 @@ rs_pgo_dissect_rename_rqst (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_rename_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1168,12 +1172,12 @@ rs_pgo_dissect_rename_resp (tvbuff_t * tvb, int offset, */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; } @@ -1181,8 +1185,8 @@ rs_pgo_dissect_rename_resp (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_add_member_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { gint buff_remain; @@ -1203,13 +1207,13 @@ if (buff_remain > 8) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); } offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; @@ -1217,8 +1221,8 @@ if (buff_remain > 8) { static int rs_pgo_dissect_delete_member_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1244,8 +1248,8 @@ rs_pgo_dissect_delete_member_rqst (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_get_members_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { guint32 max_members; @@ -1267,11 +1271,11 @@ rs_pgo_dissect_get_members_rqst (tvbuff_t * tvb, int offset, offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, di, drep); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_sec_rgy_cursor_t, NDR_POINTER_REF, - "member_cursor:", -1); + dissect_sec_rgy_cursor_t, NDR_POINTER_REF, + "member_cursor:", -1); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_rs_var1, - &max_members); + &max_members); col_append_fstr (pinfo->cinfo, COL_INFO, " :max_members:%u", max_members); @@ -1280,8 +1284,8 @@ rs_pgo_dissect_get_members_rqst (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_key_transfer_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) @@ -1300,16 +1304,16 @@ rs_pgo_dissect_key_transfer_rqst (tvbuff_t * tvb, int offset, offset = dissect_rs_pgo_query_t (tvb, offset, pinfo, tree, di, drep); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_pgo_query_key_t, NDR_POINTER_REF, "key:", - -1); + dissect_rs_pgo_query_key_t, NDR_POINTER_REF, "key:", + -1); return offset; } static int rs_pgo_dissect_key_transfer_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1324,16 +1328,16 @@ rs_pgo_dissect_key_transfer_resp (tvbuff_t * tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_pgo_query_key_t, NDR_POINTER_REF, "key:", - -1); + dissect_rs_pgo_query_key_t, NDR_POINTER_REF, "key:", + -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; } @@ -1341,8 +1345,8 @@ rs_pgo_dissect_key_transfer_resp (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_is_member_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) @@ -1356,20 +1360,20 @@ rs_pgo_dissect_is_member_resp (tvbuff_t * tvb, int offset, */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; } static int rs_pgo_dissect_is_member_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { /* [in] sec_rgy_domain_t name_domain, @@ -1396,8 +1400,8 @@ rs_pgo_dissect_is_member_rqst (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_get_rqst (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { guint32 allow_aliases; @@ -1416,30 +1420,30 @@ rs_pgo_dissect_get_rqst (tvbuff_t * tvb, int offset, offset = dissect_sec_rgy_domain_t (tvb, offset, pinfo, tree, di, drep); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_pgo_query_key_t, NDR_POINTER_REF, "key:", - -1); + dissect_rs_pgo_query_key_t, NDR_POINTER_REF, "key:", + -1); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_rs_var1, - &allow_aliases); + &allow_aliases); col_append_fstr (pinfo->cinfo, COL_INFO, " :allow_aliases:%u", - allow_aliases); + allow_aliases); - offset += 4; /* XXX */ + offset += 4; /* XXX */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_sec_rgy_cursor_t, NDR_POINTER_REF, - "item_cursor:", -1); + dissect_sec_rgy_cursor_t, NDR_POINTER_REF, + "item_cursor:", -1); return offset; } static int rs_pgo_dissect_get_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) { @@ -1454,16 +1458,16 @@ rs_pgo_dissect_get_resp (tvbuff_t * tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_sec_rgy_cursor_t, NDR_POINTER_REF, - "item_cursor:", -1); + dissect_sec_rgy_cursor_t, NDR_POINTER_REF, + "item_cursor:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_pgo_query_result_t, NDR_POINTER_REF, - "result:", -1); + dissect_rs_pgo_query_result_t, NDR_POINTER_REF, + "result:", -1); return offset; @@ -1471,8 +1475,8 @@ rs_pgo_dissect_get_resp (tvbuff_t * tvb, int offset, static int rs_pgo_dissect_delete_member_resp (tvbuff_t * tvb, int offset, - packet_info * pinfo, proto_tree * tree, - dcerpc_info *di, guint8 * drep) + packet_info * pinfo, proto_tree * tree, + dcerpc_info *di, guint8 * drep) { if (di->conformant_run) @@ -1488,12 +1492,12 @@ rs_pgo_dissect_delete_member_resp (tvbuff_t * tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_rs_cache_data_t, NDR_POINTER_REF, - "cache_info:", -1); + dissect_rs_cache_data_t, NDR_POINTER_REF, + "cache_info:", -1); offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, di, drep, - dissect_error_status_t, NDR_POINTER_REF, "status:", - -1); + dissect_error_status_t, NDR_POINTER_REF, "status:", + -1); return offset; @@ -1619,5 +1623,5 @@ proto_reg_handoff_rs_pgo (void) { /* 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); + rs_pgo_dissectors, hf_rs_pgo_opnum); } diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c index 4e14f2238a..b88a5307a5 100644 --- a/epan/dissectors/packet-dcerpc-rs_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_plcy.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_dcerpc_rs_plcy(void); +void proto_reg_handoff_dcerpc_rs_plcy(void); + /* Global hf index fields */ static int proto_dcerpc_rs_plcy = -1; @@ -44,16 +47,16 @@ static e_uuid_t uuid_dcerpc_rs_plcy = { static guint16 ver_dcerpc_rs_plcy = 1; static dcerpc_sub_dissector dcerpc_rs_plcy_dissectors[] = { - { 0, "rs_properties_get_info", NULL, NULL }, - { 1, "rs_properties_set_info ", NULL, NULL }, - { 2, "rs_policy_get_info", NULL, NULL }, - { 3, "rs_policy_set_info", NULL, NULL }, - { 4, "rs_policy_get_effective", NULL, NULL }, - { 5, "rs_policy_get_override_info", NULL, NULL }, - { 6, "rs_policy_set_override_info", NULL, NULL }, - { 7, "rs_auth_policy_get_info", NULL, NULL }, + { 0, "rs_properties_get_info", NULL, NULL }, + { 1, "rs_properties_set_info ", NULL, NULL }, + { 2, "rs_policy_get_info", NULL, NULL }, + { 3, "rs_policy_set_info", NULL, NULL }, + { 4, "rs_policy_get_effective", NULL, NULL }, + { 5, "rs_policy_get_override_info", NULL, NULL }, + { 6, "rs_policy_set_override_info", NULL, NULL }, + { 7, "rs_auth_policy_get_info", NULL, NULL }, { 8, "rs_auth_policy_get_effective", NULL, NULL }, - { 9, "rs_auth_policy_set_info", NULL, NULL }, + { 9, "rs_auth_policy_set_info", NULL, NULL }, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c index 667db23134..2212a17c86 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c @@ -30,6 +30,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_prop_acct (void); +void proto_reg_handoff_rs_prop_acct (void); + static int proto_rs_prop_acct = -1; static int hf_rs_prop_acct_opnum = -1; @@ -40,13 +43,13 @@ static guint16 ver_rs_prop_acct = 1; static dcerpc_sub_dissector rs_prop_acct_dissectors[] = { -{ 0, "rs_prop_acct_add", NULL, NULL }, -{ 1, "rs_prop_acct_delete", NULL, NULL }, -{ 2, "rs_prop_acct_rename", NULL, NULL }, -{ 3, "rs_prop_acct_replace", NULL, NULL }, -{ 4, "rs_prop_acct_add_key_version", NULL, NULL }, -{ 2, "rs_prop_acct_rename", NULL, NULL }, -{ 0, NULL, NULL, NULL } + { 0, "rs_prop_acct_add", NULL, NULL }, + { 1, "rs_prop_acct_delete", NULL, NULL }, + { 2, "rs_prop_acct_rename", NULL, NULL }, + { 3, "rs_prop_acct_replace", NULL, NULL }, + { 4, "rs_prop_acct_add_key_version", NULL, NULL }, + { 2, "rs_prop_acct_rename", NULL, NULL }, + { 0, NULL, NULL, NULL } }; void diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c index 14cab455b2..dbdbe91e1b 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_prop_acl (void); +void proto_reg_handoff_rs_prop_acl (void); + static int proto_rs_prop_acl = -1; static int hf_rs_prop_acl_opnum = -1; @@ -38,7 +41,7 @@ static int hf_rs_prop_acl_opnum = -1; static gint ett_rs_prop_acl = -1; static e_uuid_t uuid_rs_prop_acl = { 0x591d87d0, 0xde64, 0x11ca, {0xa1, 0x1c, 0x08, 0x00, 0x1e, 0x03, 0x94, - 0xc7} }; + 0xc7} }; static guint16 ver_rs_prop_acl = 1; @@ -73,6 +76,6 @@ proto_reg_handoff_rs_prop_acl (void) { /* Register the protocol as dcerpc */ dcerpc_init_uuid (proto_rs_prop_acl, ett_rs_prop_acl, &uuid_rs_prop_acl, - ver_rs_prop_acl, rs_prop_acl_dissectors, - hf_rs_prop_acl_opnum); + ver_rs_prop_acl, rs_prop_acl_dissectors, + hf_rs_prop_acl_opnum); } diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c index 698e73527b..4a7ee138b2 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_prop_attr (void); +void proto_reg_handoff_rs_prop_attr (void); + static int proto_rs_prop_attr = -1; static int hf_rs_prop_attr_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c index 7a4e440cb3..e2e309db99 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_prop_pgo (void); +void proto_reg_handoff_rs_prop_pgo (void); + static int proto_rs_prop_pgo = -1; static int hf_rs_prop_pgo_opnum = -1; @@ -44,11 +47,11 @@ static guint16 ver_rs_prop_pgo = 1; static dcerpc_sub_dissector rs_prop_pgo_dissectors[] = { - {0, "add", NULL, NULL}, - {1, "rename", NULL, NULL}, - {2, "replace", NULL, NULL}, - {3, "add_member", NULL, NULL}, - {4, "delete_member", NULL, NULL}, + {0, "add", NULL, NULL}, + {1, "rename", NULL, NULL}, + {2, "replace", NULL, NULL}, + {3, "add_member", NULL, NULL}, + {4, "delete_member", NULL, NULL}, {5, "add_member_global", NULL, NULL}, {0, NULL, NULL, NULL} }; diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c index 28fd8aac3f..63b6c46161 100644 --- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c +++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_prop_plcy (void); +void proto_reg_handoff_rs_prop_plcy (void); + static int proto_rs_prop_plcy = -1; static int hf_rs_prop_plcy_opnum = -1; @@ -44,9 +47,9 @@ static guint16 ver_rs_prop_plcy = 1; static dcerpc_sub_dissector rs_prop_plcy_dissectors[] = { - {0, "rs_prop_properties_set_info", NULL, NULL}, - {1, "rs_prop_plcy_set_info", NULL, NULL}, - {2, "rs_prop_auth_plcy_set_info", NULL, NULL}, + {0, "rs_prop_properties_set_info", NULL, NULL}, + {1, "rs_prop_plcy_set_info", NULL, NULL}, + {2, "rs_prop_auth_plcy_set_info", NULL, NULL}, {3, "rs_prop_plcy_set_dom_cache_info", NULL, NULL}, {0, NULL, NULL, NULL} }; diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c index 418467965e..bcb230925d 100644 --- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c +++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_pwd_mgmt (void); +void proto_reg_handoff_rs_pwd_mgmt (void); + static int proto_rs_pwd_mgmt = -1; static int hf_rs_pwd_mgmt_opnum = -1; @@ -44,14 +47,14 @@ static guint16 ver_rs_pwd_mgmt = 1; static dcerpc_sub_dissector rs_pwd_mgmt_dissectors[] = { - {0, "lookup", NULL, NULL}, - {1, "replace", NULL, NULL}, - {2, "get_access", NULL, NULL}, - {3, "test_access", NULL, NULL}, - {4, "test_access_on_behalf", NULL, NULL}, - {5, "get_manager_types", NULL, NULL}, - {6, "get_printstring", NULL, NULL}, - {7, "get_referral", NULL, NULL}, + {0, "lookup", NULL, NULL}, + {1, "replace", NULL, NULL}, + {2, "get_access", NULL, NULL}, + {3, "test_access", NULL, NULL}, + {4, "test_access_on_behalf", NULL, NULL}, + {5, "get_manager_types", NULL, NULL}, + {6, "get_printstring", NULL, NULL}, + {7, "get_referral", NULL, NULL}, {8, "get_mgr_types_semantics", NULL, NULL}, {0, NULL, NULL, NULL} }; diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c index 6b9122a86a..d66ef1389a 100644 --- a/epan/dissectors/packet-dcerpc-rs_repadm.c +++ b/epan/dissectors/packet-dcerpc-rs_repadm.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_repadm (void); +void proto_reg_handoff_rs_repadm (void); static int proto_rs_repadm = -1; static int hf_rs_repadm_opnum = -1; @@ -46,17 +48,17 @@ static guint16 ver_rs_repadm = 1; static dcerpc_sub_dissector rs_repadm_dissectors[] = { - { 0, "stop", NULL, NULL}, - { 1, "maint", NULL, NULL}, - { 2, "mkey", NULL, NULL}, - { 3, "info", NULL, NULL}, - { 4, "info_full", NULL, NULL}, - { 5, "destroy", NULL, NULL}, - { 6, "init_replica", NULL, NULL}, - { 7, "change_master", NULL, NULL}, - { 8, "become_master", NULL, NULL}, - { 9, "become_slave", NULL, NULL}, - { 10, "set_sw_rev", NULL, NULL}, + { 0, "stop", NULL, NULL}, + { 1, "maint", NULL, NULL}, + { 2, "mkey", NULL, NULL}, + { 3, "info", NULL, NULL}, + { 4, "info_full", NULL, NULL}, + { 5, "destroy", NULL, NULL}, + { 6, "init_replica", NULL, NULL}, + { 7, "change_master", NULL, NULL}, + { 8, "become_master", NULL, NULL}, + { 9, "become_slave", NULL, NULL}, + { 10, "set_sw_rev", NULL, NULL}, { 11, "get_sw_vers_info", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c index 93f4e6d529..e9b764f2f8 100644 --- a/epan/dissectors/packet-dcerpc-rs_replist.c +++ b/epan/dissectors/packet-dcerpc-rs_replist.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_replist (void); +void proto_reg_handoff_rs_replist (void); static int proto_rs_replist = -1; static int hf_rs_replist_opnum = -1; @@ -44,16 +46,16 @@ static guint16 ver_rs_replist = 2; static dcerpc_sub_dissector rs_replist_dissectors[] = { - { 0, "rs_replist_add_replica", NULL, NULL}, + { 0, "rs_replist_add_replica", NULL, NULL}, { 1, "rs_replist_replace_replica", NULL, NULL}, - { 2, "rs_replist_delete_replica", NULL, NULL}, - { 3, "rs_replist_read", NULL, NULL}, - { 4, "rs_replist_read_full", NULL, NULL}, - { 5, "rs_replist_add_replica", NULL, NULL}, + { 2, "rs_replist_delete_replica", NULL, NULL}, + { 3, "rs_replist_read", NULL, NULL}, + { 4, "rs_replist_read_full", NULL, NULL}, + { 5, "rs_replist_add_replica", NULL, NULL}, { 6, "rs_replist_replace_replica", NULL, NULL}, - { 7, "rs_replist_delete_replica", NULL, NULL}, - { 8, "rs_replist_read", NULL, NULL}, - { 9, "rs_replist_read_full", NULL, NULL}, + { 7, "rs_replist_delete_replica", NULL, NULL}, + { 8, "rs_replist_read", NULL, NULL}, + { 9, "rs_replist_read_full", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c index 55665b24f6..1b68f654a8 100644 --- a/epan/dissectors/packet-dcerpc-rs_repmgr.c +++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_repmgr (void); +void proto_reg_handoff_rs_repmgr (void); + static int proto_rs_repmgr = -1; static int hf_rs_repmgr_opnum = -1; @@ -44,14 +47,14 @@ static guint16 ver_rs_repmgr = 2; static dcerpc_sub_dissector rs_repmgr_dissectors[] = { - {0, "get_info_and_creds", NULL, NULL}, - {1, "init", NULL, NULL}, - {2, "init_done", NULL, NULL}, - {3, "i_am_slave", NULL, NULL}, - {4, "i_am_master", NULL, NULL}, - {5, "become_master", NULL, NULL}, - {6, "copy_all", NULL, NULL}, - {7, "copy_propq", NULL, NULL}, + {0, "get_info_and_creds", NULL, NULL}, + {1, "init", NULL, NULL}, + {2, "init_done", NULL, NULL}, + {3, "i_am_slave", NULL, NULL}, + {4, "i_am_master", NULL, NULL}, + {5, "become_master", NULL, NULL}, + {6, "copy_all", NULL, NULL}, + {7, "copy_propq", NULL, NULL}, {8, "stop_until_compat_sw", NULL, NULL}, {0, NULL, NULL, NULL} }; diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c index 12fc1045ea..a3040beee4 100644 --- a/epan/dissectors/packet-dcerpc-rs_unix.c +++ b/epan/dissectors/packet-dcerpc-rs_unix.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rs_unix (void); +void proto_reg_handoff_rs_unix (void); static int proto_rs_unix = -1; static int hf_rs_unix_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c index 3fd5664a42..2f0e9746c9 100644 --- a/epan/dissectors/packet-dcerpc-rsec_login.c +++ b/epan/dissectors/packet-dcerpc-rsec_login.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_rsec_login (void); +void proto_reg_handoff_rsec_login (void); static int proto_rsec_login = -1; static int hf_rsec_login_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c index 6ce45c7d69..228dc0672a 100644 --- a/epan/dissectors/packet-dcerpc-secidmap.c +++ b/epan/dissectors/packet-dcerpc-secidmap.c @@ -31,6 +31,9 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_secidmap (void); +void proto_reg_handoff_secidmap (void); + static int proto_secidmap = -1; static int hf_secidmap_opnum = -1; @@ -43,11 +46,11 @@ static guint16 ver_secidmap = 1; static dcerpc_sub_dissector secidmap_dissectors[] = { - { 0, "parse_name", NULL, NULL}, - { 1, "gen_name", NULL, NULL}, - { 2, "avoid_cn_bug", NULL, NULL}, + { 0, "parse_name", NULL, NULL}, + { 1, "gen_name", NULL, NULL}, + { 2, "avoid_cn_bug", NULL, NULL}, { 3, "parse_name_cache", NULL, NULL}, - { 4, "gen_name_cache", NULL, NULL}, + { 4, "gen_name_cache", NULL, NULL}, { 0, NULL, NULL, NULL }, }; diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index 9da3cd3250..8cd5419057 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -39,6 +39,9 @@ #include "packet-dcerpc-spoolss.h" #include "packet-windows-common.h" +void proto_register_dcerpc_spoolss(void); +void proto_reg_handoff_dcerpc_spoolss(void); + /* GetPrinterDriver2 */ static int hf_clientmajorversion = -1; diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c index 3c29d5e16f..05eccf1f5e 100644 --- a/epan/dissectors/packet-dcerpc-svcctl.c +++ b/epan/dissectors/packet-dcerpc-svcctl.c @@ -33,6 +33,9 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" +void proto_register_dcerpc_svcctl(void); +void proto_reg_handoff_dcerpc_svcctl(void); + static int proto_dcerpc_svcctl = -1; static int hf_svcctl_opnum = -1; static int hf_svcctl_machinename = -1; diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c index 749ebe0069..b7dc18fb96 100644 --- a/epan/dissectors/packet-dcerpc-tapi.c +++ b/epan/dissectors/packet-dcerpc-tapi.c @@ -33,6 +33,9 @@ #include "packet-dcerpc-tapi.h" #include "packet-windows-common.h" +void proto_register_dcerpc_tapi(void); +void proto_reg_handoff_dcerpc_tapi(void); + static int proto_dcerpc_tapi = -1; static int hf_tapi_opnum = -1; static int hf_tapi_rc = -1; diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c index 66d49ddd87..a6b01f2305 100644 --- a/epan/dissectors/packet-dcerpc-tkn4int.c +++ b/epan/dissectors/packet-dcerpc-tkn4int.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_tkn4int (void); +void proto_reg_handoff_tkn4int (void); static int proto_tkn4int = -1; static int hf_tkn4int_opnum = -1; @@ -44,15 +46,15 @@ static guint16 ver_tkn4int = 4; static dcerpc_sub_dissector tkn4int_dissectors[] = { - { 0, "Probe", NULL, NULL}, - { 1, "InitTokenState", NULL, NULL}, - { 2, "TokenRevoke", NULL, NULL}, - { 3, "GetCellName", NULL, NULL}, - { 4, "GetLock", NULL, NULL}, - { 5, "GetCE", NULL, NULL}, + { 0, "Probe", NULL, NULL}, + { 1, "InitTokenState", NULL, NULL}, + { 2, "TokenRevoke", NULL, NULL}, + { 3, "GetCellName", NULL, NULL}, + { 4, "GetLock", NULL, NULL}, + { 5, "GetCE", NULL, NULL}, { 6, "GetServerInterfaces", NULL, NULL}, - { 7, "SetParams", NULL, NULL}, - { 8, "AsyncGrant", NULL, NULL}, + { 7, "SetParams", NULL, NULL}, + { 8, "AsyncGrant", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c index d1d14ae128..388b686e74 100644 --- a/epan/dissectors/packet-dcerpc-trksvr.c +++ b/epan/dissectors/packet-dcerpc-trksvr.c @@ -32,6 +32,9 @@ #include "packet-dcerpc-nt.h" #include "packet-windows-common.h" +void proto_register_dcerpc_trksvr(void); +void proto_reg_handoff_dcerpc_trksvr(void); + static int proto_dcerpc_trksvr = -1; static int hf_trksvr_opnum = -1; /* static int hf_trksvr_rc = -1; */ diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c index cbd1ad0da0..28a9c3c0c7 100644 --- a/epan/dissectors/packet-dcerpc-ubikdisk.c +++ b/epan/dissectors/packet-dcerpc-ubikdisk.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_ubikdisk (void); +void proto_reg_handoff_ubikdisk (void); static int proto_ubikdisk = -1; static int hf_ubikdisk_opnum = -1; diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c index 0dae2cc41c..2510d21813 100644 --- a/epan/dissectors/packet-dcerpc-ubikvote.c +++ b/epan/dissectors/packet-dcerpc-ubikvote.c @@ -31,6 +31,8 @@ #include <epan/packet.h> #include "packet-dcerpc.h" +void proto_register_ubikvote (void); +void proto_reg_handoff_ubikvote (void); static int proto_ubikvote = -1; static int hf_ubikvote_opnum = -1; @@ -44,13 +46,13 @@ static guint16 ver_ubikvote = 4; static dcerpc_sub_dissector ubikvote_dissectors[] = { - { 0, "Beacon", NULL, NULL}, - { 1, "Debug", NULL, NULL}, - { 2, "SDebug", NULL, NULL}, + { 0, "Beacon", NULL, NULL}, + { 1, "Debug", NULL, NULL}, + { 2, "SDebug", NULL, NULL}, { 3, "GetServerInterfaces", NULL, NULL}, - { 4, "GetSyncSite", NULL, NULL}, - { 5, "DebugV2", NULL, NULL}, - { 6, "SDebugV2", NULL, NULL}, + { 4, "GetSyncSite", NULL, NULL}, + { 5, "DebugV2", NULL, NULL}, + { 6, "SDebugV2", NULL, NULL}, { 7, "GetSyncSiteIdentity", NULL, NULL}, { 0, NULL, NULL, NULL } }; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 3c338c67bb..1d7758fba4 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -48,6 +48,9 @@ #include <epan/dissectors/packet-dcerpc.h> #include <epan/dissectors/packet-dcerpc-nt.h> +void proto_register_dcerpc(void); +void proto_reg_handoff_dcerpc(void); + static int dcerpc_tap = -1; /* 32bit Network Data Representation, see DCE/RPC Appendix I */ diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c index fac4086a19..6431c88753 100644 --- a/epan/dissectors/packet-elmi.c +++ b/epan/dissectors/packet-elmi.c @@ -34,6 +34,7 @@ static int proto_elmi = -1; +void proto_register_elmi(void); void proto_reg_handoff_elmi(void); static gint ett_elmi = -1; diff --git a/epan/dissectors/packet-pktap.c b/epan/dissectors/packet-pktap.c index 6e5c17b0bd..c5d65c1be9 100644 --- a/epan/dissectors/packet-pktap.c +++ b/epan/dissectors/packet-pktap.c @@ -39,6 +39,9 @@ /* Needed for wtap_pcap_encap_to_wtap_encap(). */ #include <wiretap/pcap-encap.h> +void proto_register_pktap(void); +void proto_reg_handoff_pktap(void); + /* * Apple's PKTAP header. */ diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index 102d090874..1550161387 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -35,6 +35,9 @@ #include "packet-iwarp-ddp-rdmap.h" #include "packet-infiniband.h" +void proto_register_smb_direct(void); +void proto_reg_handoff_smb_direct(void); + static int proto_smb_direct = -1; static gint ett_smb_direct = -1; diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 102c23a393..72e57cc3d5 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -51,6 +51,9 @@ #include <zlib.h> #endif +void proto_register_spdy(void); +void proto_reg_handoff_spdy(void); + #define MIN_SPDY_VERSION 3 #define SPDY_STREAM_ID_MASK 0x7FFFFFFF |