diff options
| -rw-r--r-- | Makefile.am | 36 | ||||
| -rw-r--r-- | Makefile.nmake | 20 | ||||
| -rw-r--r-- | packet-dcerpc-dfs.c (renamed from packet-msrpc-dfs.c) | 28 | ||||
| -rw-r--r-- | packet-dcerpc-dfs.h (renamed from packet-msrpc-dfs.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-lsa.c (renamed from packet-msrpc-lsa.c) | 28 | ||||
| -rw-r--r-- | packet-dcerpc-lsa.h (renamed from packet-msrpc-lsa.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-netlogon.c (renamed from packet-msrpc-netlogon.c) | 30 | ||||
| -rw-r--r-- | packet-dcerpc-netlogon.h (renamed from packet-msrpc-netlogon.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-reg.c (renamed from packet-msrpc-reg.c) | 28 | ||||
| -rw-r--r-- | packet-dcerpc-reg.h (renamed from packet-msrpc-reg.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-samr.c (renamed from packet-msrpc-samr.c) | 28 | ||||
| -rw-r--r-- | packet-dcerpc-samr.h (renamed from packet-msrpc-samr.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-spoolss.c (renamed from packet-msrpc-spoolss.c) | 30 | ||||
| -rw-r--r-- | packet-dcerpc-spoolss.h (renamed from packet-msrpc-spoolss.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-srvsvc.c (renamed from packet-msrpc-srvsvc.c) | 30 | ||||
| -rw-r--r-- | packet-dcerpc-srvsvc.h (renamed from packet-msrpc-srvsvc.h) | 2 | ||||
| -rw-r--r-- | packet-dcerpc-wkssvc.c (renamed from packet-msrpc-wkssvc.c) | 30 | ||||
| -rw-r--r-- | packet-dcerpc-wkssvc.h (renamed from packet-msrpc-wkssvc.h) | 2 |
18 files changed, 152 insertions, 152 deletions
diff --git a/Makefile.am b/Makefile.am index 5947633cdd..aaa30bdc09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.381 2001/11/15 21:11:01 gram Exp $ +# $Id: Makefile.am,v 1.382 2001/11/21 02:08:56 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -98,10 +98,18 @@ DISSECTOR_SRC = \ packet-data.c \ packet-dcerpc.c \ packet-dcerpc-conv.c \ + packet-dcerpc-dfs.c \ packet-dcerpc-epm.c \ + packet-dcerpc-lsa.c \ packet-dcerpc-mgmt.c \ - packet-dcerpc-remact.c \ + packet-dcerpc-netlogon.c \ packet-dcerpc-oxid.c \ + packet-dcerpc-reg.c \ + packet-dcerpc-remact.c \ + packet-dcerpc-samr.c \ + packet-dcerpc-spoolss.c \ + packet-dcerpc-srvsvc.c \ + packet-dcerpc-wkssvc.c \ packet-ddtp.c \ packet-dec-bpdu.c \ packet-diameter.c \ @@ -178,14 +186,6 @@ DISSECTOR_SRC = \ packet-msdp.c \ packet-msnip.c \ packet-msproxy.c \ - packet-msrpc-dfs.c \ - packet-msrpc-lsa.c \ - packet-msrpc-netlogon.c \ - packet-msrpc-reg.c \ - packet-msrpc-samr.c \ - packet-msrpc-spoolss.c \ - packet-msrpc-srvsvc.c \ - packet-msrpc-wkssvc.c \ packet-mtp3.c \ packet-nbipx.c \ packet-nbns.c \ @@ -335,6 +335,14 @@ noinst_HEADERS = \ packet-chdlc.h \ packet-clip.h \ packet-dcerpc.h \ + packet-dcerpc-dfs.h \ + packet-dcerpc-lsa.h \ + packet-dcerpc-netlogon.h \ + packet-dcerpc-reg.h \ + packet-dcerpc-samr.h \ + packet-dcerpc-spoolss.h \ + packet-dcerpc-srvsvc.h \ + packet-dcerpc-wkssvc.h \ packet-ddtp.h \ packet-diameter-defs.h \ packet-dns.h \ @@ -366,14 +374,6 @@ noinst_HEADERS = \ packet-mount.h \ packet-mrdisc.h \ packet-msnip.h \ - packet-msrpc-dfs.h \ - packet-msrpc-lsa.h \ - packet-msrpc-netlogon.h \ - packet-msrpc-reg.h \ - packet-msrpc-samr.h \ - packet-msrpc-spoolss.h \ - packet-msrpc-srvsvc.h \ - packet-msrpc-wkssvc.h \ packet-ncp-int.h \ packet-netbios.h \ packet-nfs.h \ diff --git a/Makefile.nmake b/Makefile.nmake index cd2b4d2b23..31c012cc1d 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.142 2001/11/15 21:50:02 guy Exp $ +# $Id: Makefile.nmake,v 1.143 2001/11/21 02:08:57 guy Exp $ include config.nmake include <win32.mak> @@ -49,10 +49,18 @@ DISSECTOR_SRC = \ packet-data.c \ packet-dcerpc.c \ packet-dcerpc-conv.c \ + packet-dcerpc-dfs.c \ packet-dcerpc-epm.c \ + packet-dcerpc-lsa.c \ packet-dcerpc-mgmt.c \ - packet-dcerpc-remact.c \ + packet-dcerpc-netlogon.c \ packet-dcerpc-oxid.c \ + packet-dcerpc-reg.c \ + packet-dcerpc-remact.c \ + packet-dcerpc-samr.c \ + packet-dcerpc-spoolss.c \ + packet-dcerpc-srvsvc.c \ + packet-dcerpc-wkssvc.c \ packet-ddtp.c \ packet-dec-bpdu.c \ packet-diameter.c \ @@ -129,14 +137,6 @@ DISSECTOR_SRC = \ packet-msdp.c \ packet-msnip.c \ packet-msproxy.c \ - packet-msrpc-dfs.c \ - packet-msrpc-lsa.c \ - packet-msrpc-netlogon.c \ - packet-msrpc-reg.c \ - packet-msrpc-samr.c \ - packet-msrpc-spoolss.c \ - packet-msrpc-srvsvc.c \ - packet-msrpc-wkssvc.c \ packet-mtp3.c \ packet-nbipx.c \ packet-nbns.c \ diff --git a/packet-msrpc-dfs.c b/packet-dcerpc-dfs.c index 38112aedee..7256c22463 100644 --- a/packet-msrpc-dfs.c +++ b/packet-dcerpc-dfs.c @@ -1,8 +1,8 @@ -/* packet-msrpc-dfs.c +/* packet-dcerpc-dfs.c * Routines for SMB \\PIPE\\netdfs packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-dfs.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-dfs.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-dfs.h" +#include "packet-dcerpc-dfs.h" -static int proto_msrpc_dfs = -1; -static gint ett_msrpc_dfs = -1; +static int proto_dcerpc_dfs = -1; +static gint ett_dcerpc_dfs = -1; -static e_uuid_t uuid_msrpc_dfs = { +static e_uuid_t uuid_dcerpc_dfs = { 0x4fc742e0, 0x4a10, 0x11cf, { 0x82, 0x73, 0x00, 0xaa, 0x00, 0x4a, 0xe6, 0x73 } }; -static guint16 ver_msrpc_dfs = 3; +static guint16 ver_dcerpc_dfs = 3; -static dcerpc_sub_dissector msrpc_dfs_dissectors[] = { +static dcerpc_sub_dissector dcerpc_dfs_dissectors[] = { { DFS_EXIST, "DFS_EXIST", NULL, NULL }, { DFS_ADD, "DFS_ADD", NULL, NULL }, { DFS_REMOVE, "DFS_REMOVE", NULL, NULL }, @@ -53,23 +53,23 @@ static dcerpc_sub_dissector msrpc_dfs_dissectors[] = { }; void -proto_register_msrpc_dfs(void) +proto_register_dcerpc_dfs(void) { static gint *ett[] = { - &ett_msrpc_dfs, + &ett_dcerpc_dfs, }; - proto_msrpc_dfs = proto_register_protocol( + proto_dcerpc_dfs = proto_register_protocol( "Microsoft Distributed File System", "DFS", "dfs"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_dfs(void) +proto_reg_handoff_dcerpc_dfs(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_dfs, ett_msrpc_dfs, &uuid_msrpc_dfs, - ver_msrpc_dfs, msrpc_dfs_dissectors); + dcerpc_init_uuid(proto_dcerpc_dfs, ett_dcerpc_dfs, &uuid_dcerpc_dfs, + ver_dcerpc_dfs, dcerpc_dfs_dissectors); } diff --git a/packet-msrpc-dfs.h b/packet-dcerpc-dfs.h index 5857480646..5eae4f192a 100644 --- a/packet-msrpc-dfs.h +++ b/packet-dcerpc-dfs.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\netdfs packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-dfs.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-dfs.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-lsa.c b/packet-dcerpc-lsa.c index a4d2f04fec..40da9c32ae 100644 --- a/packet-msrpc-lsa.c +++ b/packet-dcerpc-lsa.c @@ -1,8 +1,8 @@ -/* packet-msrpc-lsa.c +/* packet-dcerpc-lsa.c * Routines for SMB \\PIPE\\lsarpc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-lsa.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-lsa.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-lsa.h" +#include "packet-dcerpc-lsa.h" -static int proto_msrpc_lsa = -1; -static gint ett_msrpc_lsa = -1; +static int proto_dcerpc_lsa = -1; +static gint ett_dcerpc_lsa = -1; -static e_uuid_t uuid_msrpc_lsa = { +static e_uuid_t uuid_dcerpc_lsa = { 0x12345778, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab} }; -static guint16 ver_msrpc_lsa = 0; +static guint16 ver_dcerpc_lsa = 0; -static dcerpc_sub_dissector msrpc_lsa_dissectors[] = { +static dcerpc_sub_dissector dcerpc_lsa_dissectors[] = { { LSA_CLOSE, "LSA_CLOSE", NULL, NULL }, { LSA_DELETE, "LSA_DELETE", NULL, NULL }, { LSA_ENUM_PRIVS, "LSA_ENUM_PRIVS", NULL, NULL }, @@ -94,23 +94,23 @@ static dcerpc_sub_dissector msrpc_lsa_dissectors[] = { }; void -proto_register_msrpc_lsa(void) +proto_register_dcerpc_lsa(void) { static gint *ett[] = { - &ett_msrpc_lsa, + &ett_dcerpc_lsa, }; - proto_msrpc_lsa = proto_register_protocol( + proto_dcerpc_lsa = proto_register_protocol( "Microsoft Local Security Architecture", "LSA", "lsa"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_lsa(void) +proto_reg_handoff_dcerpc_lsa(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_lsa, ett_msrpc_lsa, &uuid_msrpc_lsa, - ver_msrpc_lsa, msrpc_lsa_dissectors); + dcerpc_init_uuid(proto_dcerpc_lsa, ett_dcerpc_lsa, &uuid_dcerpc_lsa, + ver_dcerpc_lsa, dcerpc_lsa_dissectors); } diff --git a/packet-msrpc-lsa.h b/packet-dcerpc-lsa.h index 47da1d52cd..559908ab58 100644 --- a/packet-msrpc-lsa.h +++ b/packet-dcerpc-lsa.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\lsarpc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-lsa.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-lsa.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-netlogon.c b/packet-dcerpc-netlogon.c index acbbfc03b1..5e588153cc 100644 --- a/packet-msrpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -1,8 +1,8 @@ -/* packet-msrpc-netlogon.c +/* packet-dcerpc-netlogon.c * Routines for SMB \\PIPE\\NETLOGON packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-netlogon.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-netlogon.h" +#include "packet-dcerpc-netlogon.h" -static int proto_msrpc_netlogon = -1; -static gint ett_msrpc_netlogon = -1; +static int proto_dcerpc_netlogon = -1; +static gint ett_dcerpc_netlogon = -1; -static e_uuid_t uuid_msrpc_netlogon = { +static e_uuid_t uuid_dcerpc_netlogon = { 0x12345678, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0xcf, 0xfb } }; -static guint16 ver_msrpc_netlogon = 1; +static guint16 ver_dcerpc_netlogon = 1; -static dcerpc_sub_dissector msrpc_netlogon_dissectors[] = { +static dcerpc_sub_dissector dcerpc_netlogon_dissectors[] = { { NET_SAMLOGON, "NET_SAMLOGON", NULL, NULL }, { NET_SAMLOGOFF, "NET_SAMLOGOFF", NULL, NULL }, { NET_REQCHAL, "NET_REQCHAL", NULL, NULL }, @@ -59,24 +59,24 @@ static dcerpc_sub_dissector msrpc_netlogon_dissectors[] = { }; void -proto_register_msrpc_netlogon(void) +proto_register_dcerpc_netlogon(void) { static gint *ett[] = { - &ett_msrpc_netlogon, + &ett_dcerpc_netlogon, }; - proto_msrpc_netlogon = proto_register_protocol( + proto_dcerpc_netlogon = proto_register_protocol( "Microsoft Network Logon", "NETLOGON", "rpc_netlogon"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_netlogon(void) +proto_reg_handoff_dcerpc_netlogon(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_netlogon, ett_msrpc_netlogon, - &uuid_msrpc_netlogon, ver_msrpc_netlogon, - msrpc_netlogon_dissectors); + dcerpc_init_uuid(proto_dcerpc_netlogon, ett_dcerpc_netlogon, + &uuid_dcerpc_netlogon, ver_dcerpc_netlogon, + dcerpc_netlogon_dissectors); } diff --git a/packet-msrpc-netlogon.h b/packet-dcerpc-netlogon.h index 23cca20630..414eacdda9 100644 --- a/packet-msrpc-netlogon.h +++ b/packet-dcerpc-netlogon.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\NETLOGON packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-netlogon.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-netlogon.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-reg.c b/packet-dcerpc-reg.c index 30e18157d7..7c7900c029 100644 --- a/packet-msrpc-reg.c +++ b/packet-dcerpc-reg.c @@ -1,8 +1,8 @@ -/* packet-msrpc-reg.c +/* packet-dcerpc-reg.c * Routines for SMB \\PIPE\\winreg packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-reg.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-reg.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-reg.h" +#include "packet-dcerpc-reg.h" -static int proto_msrpc_reg = -1; -static gint ett_msrpc_reg = -1; +static int proto_dcerpc_reg = -1; +static gint ett_dcerpc_reg = -1; -static e_uuid_t uuid_msrpc_reg = { +static e_uuid_t uuid_dcerpc_reg = { 0x338cd001, 0x2244, 0x31f1, { 0xaa, 0xaa, 0x90, 0x00, 0x38, 0x00, 0x10, 0x03 } }; -static guint16 ver_msrpc_reg = 1; +static guint16 ver_dcerpc_reg = 1; -static dcerpc_sub_dissector msrpc_reg_dissectors[] = { +static dcerpc_sub_dissector dcerpc_reg_dissectors[] = { { REG_OPEN_HKCR, "REG_OPEN_HKCR", NULL, NULL }, { _REG_UNK_01, "_REG_UNK_01", NULL, NULL }, { REG_OPEN_HKLM, "REG_OPEN_HKLM", NULL, NULL }, @@ -75,23 +75,23 @@ static dcerpc_sub_dissector msrpc_reg_dissectors[] = { }; void -proto_register_msrpc_reg(void) +proto_register_dcerpc_reg(void) { static gint *ett[] = { - &ett_msrpc_reg, + &ett_dcerpc_reg, }; - proto_msrpc_reg = proto_register_protocol( + proto_dcerpc_reg = proto_register_protocol( "Microsoft Registry", "REG", "reg"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_reg(void) +proto_reg_handoff_dcerpc_reg(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_reg, ett_msrpc_reg, &uuid_msrpc_reg, - ver_msrpc_reg, msrpc_reg_dissectors); + dcerpc_init_uuid(proto_dcerpc_reg, ett_dcerpc_reg, &uuid_dcerpc_reg, + ver_dcerpc_reg, dcerpc_reg_dissectors); } diff --git a/packet-msrpc-reg.h b/packet-dcerpc-reg.h index 8bac50d976..3c05f81786 100644 --- a/packet-msrpc-reg.h +++ b/packet-dcerpc-reg.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\winreg packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-reg.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-reg.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-samr.c b/packet-dcerpc-samr.c index d2309c3291..a170c292a7 100644 --- a/packet-msrpc-samr.c +++ b/packet-dcerpc-samr.c @@ -1,8 +1,8 @@ -/* packet-msrpc-samr.c +/* packet-dcerpc-samr.c * Routines for SMB \\PIPE\\samr packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-samr.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-samr.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-samr.h" +#include "packet-dcerpc-samr.h" -static int proto_msrpc_samr = -1; -static gint ett_msrpc_samr = -1; +static int proto_dcerpc_samr = -1; +static gint ett_dcerpc_samr = -1; -static e_uuid_t uuid_msrpc_samr = { +static e_uuid_t uuid_dcerpc_samr = { 0x12345778, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xac} }; -static guint16 ver_msrpc_samr = 1; +static guint16 ver_dcerpc_samr = 1; -static dcerpc_sub_dissector msrpc_samr_dissectors[] = { +static dcerpc_sub_dissector dcerpc_samr_dissectors[] = { { SAMR_CONNECT_ANON, "SAMR_CONNECT_ANON", NULL, NULL }, { SAMR_CLOSE_HND, "SAMR_CLOSE_HND", NULL, NULL }, { SAMR_UNKNOWN_2, "SAMR_UNKNOWN_2", NULL, NULL }, @@ -104,23 +104,23 @@ static dcerpc_sub_dissector msrpc_samr_dissectors[] = { }; void -proto_register_msrpc_samr(void) +proto_register_dcerpc_samr(void) { static gint *ett[] = { - &ett_msrpc_samr, + &ett_dcerpc_samr, }; - proto_msrpc_samr = proto_register_protocol( + proto_dcerpc_samr = proto_register_protocol( "Microsoft Security Account Manager", "SAMR", "samr"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_samr(void) +proto_reg_handoff_dcerpc_samr(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_samr, ett_msrpc_samr, &uuid_msrpc_samr, - ver_msrpc_samr, msrpc_samr_dissectors); + dcerpc_init_uuid(proto_dcerpc_samr, ett_dcerpc_samr, &uuid_dcerpc_samr, + ver_dcerpc_samr, dcerpc_samr_dissectors); } diff --git a/packet-msrpc-samr.h b/packet-dcerpc-samr.h index b2e5ec1eab..2be1a1377c 100644 --- a/packet-msrpc-samr.h +++ b/packet-dcerpc-samr.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\samr packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-samr.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-samr.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-spoolss.c b/packet-dcerpc-spoolss.c index 88926dcc4b..8129f29826 100644 --- a/packet-msrpc-spoolss.c +++ b/packet-dcerpc-spoolss.c @@ -1,8 +1,8 @@ -/* packet-msrpc-spoolss.c +/* packet-dcerpc-spoolss.c * Routines for SMB \\PIPE\\spoolss packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-spoolss.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-spoolss.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-spoolss.h" +#include "packet-dcerpc-spoolss.h" -static int proto_msrpc_spoolss = -1; -static gint ett_msrpc_spoolss = -1; +static int proto_dcerpc_spoolss = -1; +static gint ett_dcerpc_spoolss = -1; -static e_uuid_t uuid_msrpc_spoolss = { +static e_uuid_t uuid_dcerpc_spoolss = { 0x12345678, 0x1234, 0xabcd, { 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab } }; -static guint16 ver_msrpc_spoolss = 1; +static guint16 ver_dcerpc_spoolss = 1; -static dcerpc_sub_dissector msrpc_spoolss_dissectors[] = { +static dcerpc_sub_dissector dcerpc_spoolss_dissectors[] = { { SPOOLSS_ENUMPRINTERS, "SPOOLSS_ENUMPRINTERS", NULL, NULL }, { SPOOLSS_SETJOB, "SPOOLSS_SETJOB", NULL, NULL }, { SPOOLSS_GETJOB, "SPOOLSS_GETJOB", NULL, NULL }, @@ -94,24 +94,24 @@ static dcerpc_sub_dissector msrpc_spoolss_dissectors[] = { }; void -proto_register_msrpc_spoolss(void) +proto_register_dcerpc_spoolss(void) { static gint *ett[] = { - &ett_msrpc_spoolss, + &ett_dcerpc_spoolss, }; - proto_msrpc_spoolss = proto_register_protocol( + proto_dcerpc_spoolss = proto_register_protocol( "Microsoft Spool Subsystem", "SPOOLSS", "spoolss"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_spoolss(void) +proto_reg_handoff_dcerpc_spoolss(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_spoolss, ett_msrpc_spoolss, - &uuid_msrpc_spoolss, ver_msrpc_spoolss, - msrpc_spoolss_dissectors); + dcerpc_init_uuid(proto_dcerpc_spoolss, ett_dcerpc_spoolss, + &uuid_dcerpc_spoolss, ver_dcerpc_spoolss, + dcerpc_spoolss_dissectors); } diff --git a/packet-msrpc-spoolss.h b/packet-dcerpc-spoolss.h index 07ea342627..4244109630 100644 --- a/packet-msrpc-spoolss.h +++ b/packet-dcerpc-spoolss.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\spoolss packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-spoolss.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-spoolss.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-srvsvc.c b/packet-dcerpc-srvsvc.c index bc37991280..1df7045c11 100644 --- a/packet-msrpc-srvsvc.c +++ b/packet-dcerpc-srvsvc.c @@ -1,8 +1,8 @@ -/* packet-msrpc-srvsvc.c +/* packet-dcerpc-srvsvc.c * Routines for SMB \\PIPE\\srvsvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-srvsvc.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-srvsvc.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,19 +30,19 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-srvsvc.h" +#include "packet-dcerpc-srvsvc.h" -static int proto_msrpc_srvsvc = -1; -static gint ett_msrpc_srvsvc = -1; +static int proto_dcerpc_srvsvc = -1; +static gint ett_dcerpc_srvsvc = -1; -static e_uuid_t uuid_msrpc_srvsvc = { +static e_uuid_t uuid_dcerpc_srvsvc = { 0x4b324fc8, 0x1670, 0x01d3, { 0x12, 0x78, 0x5a, 0x47, 0xbf, 0x6e, 0xe1, 0x88 } }; -static guint16 ver_msrpc_srvsvc = 3; +static guint16 ver_dcerpc_srvsvc = 3; -static dcerpc_sub_dissector msrpc_srvsvc_dissectors[] = { +static dcerpc_sub_dissector dcerpc_srvsvc_dissectors[] = { { SRV_NETCONNENUM, "SRV_NETCONNENUM", NULL, NULL }, { SRV_NETFILEENUM, "SRV_NETFILEENUM", NULL, NULL }, { SRV_NETSESSENUM, "SRV_NETSESSENUM", NULL, NULL }, @@ -64,24 +64,24 @@ static dcerpc_sub_dissector msrpc_srvsvc_dissectors[] = { }; void -proto_register_msrpc_srvsvc(void) +proto_register_dcerpc_srvsvc(void) { static gint *ett[] = { - &ett_msrpc_srvsvc, + &ett_dcerpc_srvsvc, }; - proto_msrpc_srvsvc = proto_register_protocol( + proto_dcerpc_srvsvc = proto_register_protocol( "Microsoft Server Service", "SRVSVC", "srvsvc"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_srvsvc(void) +proto_reg_handoff_dcerpc_srvsvc(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_srvsvc, ett_msrpc_srvsvc, - &uuid_msrpc_srvsvc, ver_msrpc_srvsvc, - msrpc_srvsvc_dissectors); + dcerpc_init_uuid(proto_dcerpc_srvsvc, ett_dcerpc_srvsvc, + &uuid_dcerpc_srvsvc, ver_dcerpc_srvsvc, + dcerpc_srvsvc_dissectors); } diff --git a/packet-msrpc-srvsvc.h b/packet-dcerpc-srvsvc.h index dfdf3e99bc..f7c5ed5117 100644 --- a/packet-msrpc-srvsvc.h +++ b/packet-dcerpc-srvsvc.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\srvsvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-srvsvc.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-srvsvc.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> diff --git a/packet-msrpc-wkssvc.c b/packet-dcerpc-wkssvc.c index 9569578b47..30b34c552a 100644 --- a/packet-msrpc-wkssvc.c +++ b/packet-dcerpc-wkssvc.c @@ -1,8 +1,8 @@ -/* packet-msrpc-wkssvc.c +/* packet-dcerpc-wkssvc.c * Routines for SMB \\PIPE\\wkssvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-wkssvc.c,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-wkssvc.c,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,43 +30,43 @@ #include <glib.h> #include "packet.h" #include "packet-dcerpc.h" -#include "packet-msrpc-wkssvc.h" +#include "packet-dcerpc-wkssvc.h" -static int proto_msrpc_wkssvc = -1; -static gint ett_msrpc_wkssvc = -1; +static int proto_dcerpc_wkssvc = -1; +static gint ett_dcerpc_wkssvc = -1; -static e_uuid_t uuid_msrpc_wkssvc = { +static e_uuid_t uuid_dcerpc_wkssvc = { 0x6bffd098, 0xa112, 0x3610, { 0x98, 0x33, 0x46, 0xc3, 0xf8, 0x7e, 0x34, 0x5a } }; -static guint16 ver_msrpc_wkssvc = 1; +static guint16 ver_dcerpc_wkssvc = 1; -static dcerpc_sub_dissector msrpc_wkssvc_dissectors[] = { +static dcerpc_sub_dissector dcerpc_wkssvc_dissectors[] = { { WKS_QUERY_INFO, "WKS_QUERY_INFO", NULL, NULL }, {0, NULL, NULL, NULL }, }; void -proto_register_msrpc_wkssvc(void) +proto_register_dcerpc_wkssvc(void) { static gint *ett[] = { - &ett_msrpc_wkssvc, + &ett_dcerpc_wkssvc, }; - proto_msrpc_wkssvc = proto_register_protocol( + proto_dcerpc_wkssvc = proto_register_protocol( "Microsoft Workstation Service", "WKSSVC", "wkssvc"); proto_register_subtree_array(ett, array_length(ett)); } void -proto_reg_handoff_msrpc_wkssvc(void) +proto_reg_handoff_dcerpc_wkssvc(void) { /* Register protocol as dcerpc */ - dcerpc_init_uuid(proto_msrpc_wkssvc, ett_msrpc_wkssvc, - &uuid_msrpc_wkssvc, ver_msrpc_wkssvc, - msrpc_wkssvc_dissectors); + dcerpc_init_uuid(proto_dcerpc_wkssvc, ett_dcerpc_wkssvc, + &uuid_dcerpc_wkssvc, ver_dcerpc_wkssvc, + dcerpc_wkssvc_dissectors); } diff --git a/packet-msrpc-wkssvc.h b/packet-dcerpc-wkssvc.h index c9e0f06a2c..31573ecc18 100644 --- a/packet-msrpc-wkssvc.h +++ b/packet-dcerpc-wkssvc.h @@ -2,7 +2,7 @@ * Routines for SMB \\PIPE\\wkssvc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-msrpc-wkssvc.h,v 1.1 2001/11/12 08:58:43 guy Exp $ + * $Id: packet-dcerpc-wkssvc.h,v 1.1 2001/11/21 02:08:57 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> |