diff options
-rw-r--r-- | packet-dcerpc-browser.c | 8 | ||||
-rw-r--r-- | packet-dcerpc-conv.c | 6 | ||||
-rw-r--r-- | packet-dcerpc-dfs.c | 6 | ||||
-rw-r--r-- | packet-dcerpc-epm.c | 8 | ||||
-rw-r--r-- | packet-dcerpc-lsa.c | 10 | ||||
-rw-r--r-- | packet-dcerpc-mapi.c | 9 | ||||
-rw-r--r-- | packet-dcerpc-mgmt.c | 6 | ||||
-rw-r--r-- | packet-dcerpc-netlogon.c | 8 | ||||
-rw-r--r-- | packet-dcerpc-nspi.c | 6 | ||||
-rw-r--r-- | packet-dcerpc-oxid.c | 8 | ||||
-rw-r--r-- | packet-dcerpc-reg.c | 6 | ||||
-rw-r--r-- | packet-dcerpc-remact.c | 4 | ||||
-rw-r--r-- | packet-dcerpc-samr.c | 8 | ||||
-rw-r--r-- | packet-dcerpc-srvsvc.c | 8 | ||||
-rw-r--r-- | packet-dcerpc-wkssvc.c | 6 |
15 files changed, 50 insertions, 57 deletions
diff --git a/packet-dcerpc-browser.c b/packet-dcerpc-browser.c index f7f6d31203..2324d7c8c4 100644 --- a/packet-dcerpc-browser.c +++ b/packet-dcerpc-browser.c @@ -2,7 +2,7 @@ * Routines for DCERPC Browser packet disassembly * Copyright 2001, Ronnie Sahlberg * - * $Id: packet-dcerpc-browser.c,v 1.4 2002/05/30 10:06:58 sahlberg Exp $ + * $Id: packet-dcerpc-browser.c,v 1.5 2002/05/31 00:31:12 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1126,7 +1126,7 @@ static dcerpc_sub_dissector dcerpc_browser_dissectors[] = { dissect_browser_UNKNOWN_0b_rqst, dissect_browser_UNKNOWN_0b_reply }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; void @@ -1151,11 +1151,11 @@ static hf_register_info hf[] = { { &hf_browser_unknown_string, { "Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_HEX, - NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }}, + NULL, 0x0, "Unknown string. If you know what this is, contact ethereal developers.", HFILL }} }; static gint *ett[] = { - &ett_dcerpc_browser, + &ett_dcerpc_browser }; proto_dcerpc_browser = proto_register_protocol( diff --git a/packet-dcerpc-conv.c b/packet-dcerpc-conv.c index c2a7b71530..4481a20f71 100644 --- a/packet-dcerpc-conv.c +++ b/packet-dcerpc-conv.c @@ -2,7 +2,7 @@ * Routines for dcerpc conv dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-conv.c,v 1.2 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-conv.c,v 1.3 2002/05/31 00:31:12 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -54,7 +54,7 @@ static dcerpc_sub_dissector conv_dissectors[] = { { 2, "conv_are_you_there", NULL, NULL }, { 3, "conv_who_are_you_auth", NULL, NULL }, { 4, "conv_who_are_you_auth_more", NULL, NULL }, - { 0, NULL, NULL, NULL }, + { 0, NULL, NULL, NULL } }; @@ -67,7 +67,7 @@ proto_register_conv (void) #endif static gint *ett[] = { - &ett_conv, + &ett_conv }; proto_conv = proto_register_protocol ("DCE/RPC Conversation Manager", "CONV", "conv"); #if 0 diff --git a/packet-dcerpc-dfs.c b/packet-dcerpc-dfs.c index b56fe5efeb..54a1033561 100644 --- a/packet-dcerpc-dfs.c +++ b/packet-dcerpc-dfs.c @@ -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.2 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-dfs.c,v 1.3 2002/05/31 00:31:12 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -49,14 +49,14 @@ static dcerpc_sub_dissector dcerpc_dfs_dissectors[] = { { DFS_GET_INFO, "DFS_GET_INFO", NULL, NULL }, { DFS_ENUM, "DFS_ENUM", NULL, NULL }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; void proto_register_dcerpc_dfs(void) { static gint *ett[] = { - &ett_dcerpc_dfs, + &ett_dcerpc_dfs }; proto_dcerpc_dfs = proto_register_protocol( diff --git a/packet-dcerpc-epm.c b/packet-dcerpc-epm.c index 817bf2185e..9e8e60ac9b 100644 --- a/packet-dcerpc-epm.c +++ b/packet-dcerpc-epm.c @@ -2,7 +2,7 @@ * Routines for dcerpc endpoint mapper dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-epm.c,v 1.9 2002/05/28 11:45:56 sahlberg Exp $ + * $Id: packet-dcerpc-epm.c,v 1.10 2002/05/31 00:31:12 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -367,7 +367,7 @@ static dcerpc_sub_dissector epm_dissectors[] = { { 4, "ept_lookup_handle_free", NULL, NULL }, { 5, "ept_inq_object", NULL, NULL }, { 6, "ept_mgmt_delete", NULL, NULL }, - { 0, NULL, NULL, NULL }, + { 0, NULL, NULL, NULL } }; @@ -416,12 +416,12 @@ proto_register_epm (void) { &hf_epm_tower_lhs_len, { "LHS Length", "epm.tower.lhs.len", FT_UINT16, BASE_DEC, NULL, 0x0, "Length of LHS data", HFILL }}, { &hf_epm_tower_proto_id, - { "Protocol", "epm.tower.proto_id", FT_UINT8, BASE_HEX, VALS(proto_id_vals), 0x0, "Protocol identifier", HFILL }}, + { "Protocol", "epm.tower.proto_id", FT_UINT8, BASE_HEX, VALS(proto_id_vals), 0x0, "Protocol identifier", HFILL }} }; static gint *ett[] = { &ett_epm, - &ett_epm_tower_floor, + &ett_epm_tower_floor }; proto_epm = proto_register_protocol ("DCE/RPC Endpoint Mapper", "EPM", "epm"); proto_register_field_array (proto_epm, hf, array_length (hf)); diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c index 58ac98d376..2bf014cb0a 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.48 2002/05/27 09:50:57 sahlberg Exp $ + * $Id: packet-dcerpc-lsa.c,v 1.49 2002/05/31 00:31:12 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3974,7 +3974,7 @@ static dcerpc_sub_dissector dcerpc_lsa_dissectors[] = { { LSA_LSAFUNCTION_3B, "LSAFUNCTION_3B", lsa_dissect_lsafunction_3b_rqst, lsa_dissect_lsafunction_3b_reply }, - {0, NULL, NULL, NULL}, + {0, NULL, NULL, NULL} }; void @@ -4291,9 +4291,7 @@ proto_register_dcerpc_lsa(void) { &hf_lsa_remove_all, { "Remove All", "lsa.remove_all", FT_UINT8, BASE_DEC, - NULL, 0x0, "Flag whether all rights should be removed or only the specified ones", HFILL }}, - - + NULL, 0x0, "Flag whether all rights should be removed or only the specified ones", HFILL }} }; static gint *ett[] = { @@ -4328,7 +4326,7 @@ proto_register_dcerpc_lsa(void) &ett_lsa_trusted_domain_info, &ett_lsa_trust_attr, &ett_lsa_trusted_domain_auth_information, - &ett_lsa_auth_information, + &ett_lsa_auth_information }; proto_dcerpc_lsa = proto_register_protocol( diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c index 41f30fd57c..e1b1e3b06a 100644 --- a/packet-dcerpc-mapi.c +++ b/packet-dcerpc-mapi.c @@ -2,7 +2,7 @@ * Routines for MS Exchange MAPI * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-mapi.c,v 1.8 2002/05/27 09:50:57 sahlberg Exp $ + * $Id: packet-dcerpc-mapi.c,v 1.9 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -360,7 +360,7 @@ static dcerpc_sub_dissector dcerpc_mapi_dissectors[] = { mapi_unknown_02_request, mapi_unknown_02_reply }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; void @@ -418,14 +418,13 @@ static hf_register_info hf[] = { { &hf_mapi_pdu_extra_trailer, { "unknown", "mapi.pdu.extra_trailer", FT_BYTES, BASE_HEX, - NULL, 0x0, "If you know what this is, contact ethereal developers", HFILL }}, - + NULL, 0x0, "If you know what this is, contact ethereal developers", HFILL }} }; static gint *ett[] = { &ett_dcerpc_mapi, - &ett_mapi_decrypted_pdu, + &ett_mapi_decrypted_pdu }; module_t *mapi_module; diff --git a/packet-dcerpc-mgmt.c b/packet-dcerpc-mgmt.c index a7be8f0bee..d9ee080e21 100644 --- a/packet-dcerpc-mgmt.c +++ b/packet-dcerpc-mgmt.c @@ -2,7 +2,7 @@ * Routines for dcerpc mgmt dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-mgmt.c,v 1.2 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-mgmt.c,v 1.3 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -54,7 +54,7 @@ static dcerpc_sub_dissector mgmt_dissectors[] = { { 2, "rpc__mgmt_is_server_listening", NULL, NULL }, { 3, "rpc__mgmt_stop_server_listening", NULL, NULL }, { 4, "rpc__mgmt_inq_princ_name", NULL, NULL }, - { 0, NULL, NULL, NULL }, + { 0, NULL, NULL, NULL } }; @@ -67,7 +67,7 @@ proto_register_mgmt (void) #endif static gint *ett[] = { - &ett_mgmt, + &ett_mgmt }; proto_mgmt = proto_register_protocol ("DCE/RPC Remote Management", "MGMT", "mgmt"); #if 0 diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c index 7c1b7cde65..6b348c9f7b 100644 --- a/packet-dcerpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -3,7 +3,7 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * 2002 structure and command dissectors by Ronnie Sahlberg * - * $Id: packet-dcerpc-netlogon.c,v 1.21 2002/05/10 23:20:38 guy Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.22 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -5144,7 +5144,7 @@ static dcerpc_sub_dissector dcerpc_netlogon_dissectors[] = { { NETLOGON_DSRDEREGISTERDNSHOSTRECORDS, "DSRDEREGISTERDNSHOSTRECORDS", netlogon_dissect_dsrderegisterdnshostrecords_rqst, netlogon_dissect_dsrderegisterdnshostrecords_reply }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; void @@ -5492,7 +5492,7 @@ static hf_register_info hf[] = { { &hf_netlogon_pwd_must_change_time, { "PWD Must Change", "netlogon.pwd_must_change_time", FT_ABSOLUTE_TIME, BASE_NONE, - NULL, 0, "When this users password must be changed", HFILL }}, + NULL, 0, "When this users password must be changed", HFILL }} }; @@ -5556,7 +5556,7 @@ static hf_register_info hf[] = { &ett_USER_SESSION_KEY, &ett_BLOB, &ett_rid_array, - &ett_attrib_array, + &ett_attrib_array }; proto_dcerpc_netlogon = proto_register_protocol( diff --git a/packet-dcerpc-nspi.c b/packet-dcerpc-nspi.c index 45f7617ffd..09640d1594 100644 --- a/packet-dcerpc-nspi.c +++ b/packet-dcerpc-nspi.c @@ -2,7 +2,7 @@ * Routines for dcerpc nspi dissection * Copyright 2001, Todd Sabin <tsabin@optonline.net> * - * $Id: packet-dcerpc-nspi.c,v 1.1 2002/05/23 23:45:22 guy Exp $ + * $Id: packet-dcerpc-nspi.c,v 1.2 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -65,7 +65,7 @@ static dcerpc_sub_dissector nspi_dissectors[] = { { 17, "NspiGetNamesFromIDs", NULL, NULL }, { 18, "NspiGetIDsFromNames", NULL, NULL }, { 19, "NspiResolveNames", NULL, NULL }, - { 0, NULL, NULL, NULL }, + { 0, NULL, NULL, NULL } }; @@ -73,7 +73,7 @@ void proto_register_nspi (void) { static gint *ett[] = { - &ett_nspi, + &ett_nspi }; proto_nspi = proto_register_protocol ("NSPI", "NSPI", "nspi"); proto_register_subtree_array (ett, array_length (ett)); diff --git a/packet-dcerpc-oxid.c b/packet-dcerpc-oxid.c index 67169c72bf..a8a47e2024 100644 --- a/packet-dcerpc-oxid.c +++ b/packet-dcerpc-oxid.c @@ -2,7 +2,7 @@ * Routines for DCOM OXID Resolver * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-oxid.c,v 1.2 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-oxid.c,v 1.3 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -27,7 +27,6 @@ #include "config.h" #endif - #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -38,7 +37,6 @@ #include <epan/packet.h> #include "packet-dcerpc.h" - static int proto_oxid = -1; static gint ett_oxid = -1; @@ -46,7 +44,6 @@ static gint ett_oxid = -1; static e_uuid_t uuid_oxid = { 0x99fcfec4, 0x5260, 0x101b, { 0xbb, 0xcb, 0x00, 0xaa, 0x00, 0x21, 0x34, 0x7a } }; static guint16 ver_oxid = 0; - static dcerpc_sub_dissector oxid_dissectors[] = { { 0, "ResolveOxid", NULL, NULL }, { 1, "SimplePing", NULL, NULL }, @@ -55,7 +52,6 @@ static dcerpc_sub_dissector oxid_dissectors[] = { { 0, NULL, NULL, NULL }, }; - void proto_register_oxid (void) { @@ -65,7 +61,7 @@ proto_register_oxid (void) #endif static gint *ett[] = { - &ett_oxid, + &ett_oxid }; proto_oxid = proto_register_protocol ("DCOM OXID Resolver", "OXID", "oxid"); #if 0 diff --git a/packet-dcerpc-reg.c b/packet-dcerpc-reg.c index fdf152daa6..b5fca7e91d 100644 --- a/packet-dcerpc-reg.c +++ b/packet-dcerpc-reg.c @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\winreg packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-reg.c,v 1.3 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-reg.c,v 1.4 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -89,14 +89,14 @@ static dcerpc_sub_dissector dcerpc_reg_dissectors[] = { { REG_ABORT_SHUTDOWN, "REG_ABORT_SHUTDOWN", NULL, NULL }, { REG_UNK_1A, "REG_UNK_1A", NULL, NULL }, - {0, NULL, NULL, NULL }, + { 0, NULL, NULL, NULL } }; void proto_register_dcerpc_reg(void) { static gint *ett[] = { - &ett_dcerpc_reg, + &ett_dcerpc_reg }; proto_dcerpc_reg = proto_register_protocol( diff --git a/packet-dcerpc-remact.c b/packet-dcerpc-remact.c index abfd82a617..94468785fe 100644 --- a/packet-dcerpc-remact.c +++ b/packet-dcerpc-remact.c @@ -2,7 +2,7 @@ * Routines for DCOM Remote Activation * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-remact.c,v 1.3 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-remact.c,v 1.4 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -63,7 +63,7 @@ proto_register_remact (void) #endif static gint *ett[] = { - &ett_remact, + &ett_remact }; proto_remact = proto_register_protocol ("DCOM Remote Activation", "REMACT", "remact"); #if 0 diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c index c415adab38..153cd94f34 100644 --- a/packet-dcerpc-samr.c +++ b/packet-dcerpc-samr.c @@ -3,7 +3,7 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * 2002 Added all command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-samr.c,v 1.46 2002/05/27 09:50:57 sahlberg Exp $ + * $Id: packet-dcerpc-samr.c,v 1.47 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -4287,7 +4287,7 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_UNKNOWN_3C, "Unknown 0x3c", samr_dissect_unknown_3c_rqst, samr_dissect_unknown_3c_reply }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; void @@ -4599,7 +4599,7 @@ proto_register_dcerpc_samr(void) { &hf_nt_acb_autolock, { "", "nt.acb.autolock", FT_BOOLEAN, 32, - TFS(&tfs_nt_acb_autolock), 0x0400, "If this account has been autolocked", HFILL }}, + TFS(&tfs_nt_acb_autolock), 0x0400, "If this account has been autolocked", HFILL }} }; static gint *ett[] = { &ett_dcerpc_samr, @@ -4653,7 +4653,7 @@ proto_register_dcerpc_samr(void) &ett_samr_rids, &ett_samr_sid_and_attributes_array, &ett_samr_sid_and_attributes, - &ett_nt_acct_ctrl, + &ett_nt_acct_ctrl }; proto_dcerpc_samr = proto_register_protocol( diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c index dfbb2ac6da..4efc8206c0 100644 --- a/packet-dcerpc-srvsvc.c +++ b/packet-dcerpc-srvsvc.c @@ -4,7 +4,7 @@ * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * decode srvsvc calls where Samba knows them ... * - * $Id: packet-dcerpc-srvsvc.c,v 1.12 2002/05/30 00:20:32 tpot Exp $ + * $Id: packet-dcerpc-srvsvc.c,v 1.13 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -575,7 +575,7 @@ static dcerpc_sub_dissector dcerpc_srvsvc_dissectors[] = { { SRV_NETFILEQUERYSECDESC, "SRV_NETFILEQUERYSECDESC", NULL, NULL }, { SRV_NETFILESETSECDESC, "SRV_NETFILESETSECDESC", NULL, NULL }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; static const value_string platform_id_vals[] = { @@ -664,13 +664,13 @@ proto_register_dcerpc_srvsvc(void) BASE_DEC, NULL, 0x0, "Preferred Length", HFILL}}, { &hf_srvsvc_enum_handle, { "Enumeration handle", "srvsvc.enum_hnd", FT_BYTES, - BASE_HEX, NULL, 0x0, "Enumeration Handle", HFILL}}, + BASE_HEX, NULL, 0x0, "Enumeration Handle", HFILL}} }; static gint *ett[] = { &ett_dcerpc_srvsvc, &ett_srvsvc_server_info, - &ett_srvsvc_share_info, + &ett_srvsvc_share_info }; proto_dcerpc_srvsvc = proto_register_protocol( diff --git a/packet-dcerpc-wkssvc.c b/packet-dcerpc-wkssvc.c index c35f66d67b..509dbc3bbf 100644 --- a/packet-dcerpc-wkssvc.c +++ b/packet-dcerpc-wkssvc.c @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\wkssvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-wkssvc.c,v 1.2 2002/01/21 07:36:33 guy Exp $ + * $Id: packet-dcerpc-wkssvc.c,v 1.3 2002/05/31 00:31:13 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -45,14 +45,14 @@ static guint16 ver_dcerpc_wkssvc = 1; static dcerpc_sub_dissector dcerpc_wkssvc_dissectors[] = { { WKS_QUERY_INFO, "WKS_QUERY_INFO", NULL, NULL }, - {0, NULL, NULL, NULL }, + {0, NULL, NULL, NULL } }; void proto_register_dcerpc_wkssvc(void) { static gint *ett[] = { - &ett_dcerpc_wkssvc, + &ett_dcerpc_wkssvc }; proto_dcerpc_wkssvc = proto_register_protocol( |