aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packet-dcerpc-dfs.h8
-rw-r--r--packet-dcerpc-lsa.c4
-rw-r--r--packet-dcerpc-lsa.h8
-rw-r--r--packet-dcerpc-netlogon.h8
-rw-r--r--packet-dcerpc-reg.h8
-rw-r--r--packet-dcerpc-samr.h8
-rw-r--r--packet-dcerpc-spoolss.h8
-rw-r--r--packet-dcerpc-srvsvc.h8
-rw-r--r--packet-dcerpc-wkssvc.h8
-rw-r--r--packet-smb-pipe.c8
10 files changed, 39 insertions, 37 deletions
diff --git a/packet-dcerpc-dfs.h b/packet-dcerpc-dfs.h
index 5eae4f192a..0bcdab3de3 100644
--- a/packet-dcerpc-dfs.h
+++ b/packet-dcerpc-dfs.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-dfs.h
- * Routines for SMB \\PIPE\\netdfs packet disassembly
+/* packet-dcerpc-dfs.h
+ * Routines for SMB \PIPE\netdfs packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-dfs.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-dfs.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,4 +34,4 @@
#define DFS_GET_INFO 0x04
#define DFS_ENUM 0x05
-#endif /* packet-msrpc-dfs.h */
+#endif /* packet-dcerpc-dfs.h */
diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index 40da9c32ae..97797d4a43 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -2,7 +2,7 @@
* Routines for SMB \\PIPE\\lsarpc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-lsa.c,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -42,6 +42,8 @@ static e_uuid_t uuid_dcerpc_lsa = {
static guint16 ver_dcerpc_lsa = 0;
+
+
static dcerpc_sub_dissector dcerpc_lsa_dissectors[] = {
{ LSA_CLOSE, "LSA_CLOSE", NULL, NULL },
{ LSA_DELETE, "LSA_DELETE", NULL, NULL },
diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h
index 559908ab58..8d699e377e 100644
--- a/packet-dcerpc-lsa.h
+++ b/packet-dcerpc-lsa.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-lsa.h
- * Routines for SMB \\PIPE\\lsarpc packet disassembly
+/* packet-dcerpc-lsa.h
+ * Routines for SMB \PIPE\lsarpc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-lsa.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-lsa.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -75,4 +75,4 @@
#define LSA_OPENPOLICY2 0x2c
#define LSA_UNK_GET_CONNUSER 0x2d
-#endif /* packet-msrpc-lsa.h */
+#endif /* packet-dcerpc-lsa.h */
diff --git a/packet-dcerpc-netlogon.h b/packet-dcerpc-netlogon.h
index 414eacdda9..23dbdb3afa 100644
--- a/packet-dcerpc-netlogon.h
+++ b/packet-dcerpc-netlogon.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-netlogon.h
- * Routines for SMB \\PIPE\\NETLOGON packet disassembly
+/* packet-dcerpc-netlogon.h
+ * Routines for SMB \PIPE\NETLOGON packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-netlogon.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-netlogon.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,4 +41,4 @@
#define NET_SAM_SYNC 0x10
#define NET_TRUST_DOM_LIST 0x13
-#endif /* packet-msrpc-netlogon.h */
+#endif /* packet-dcerpc-netlogon.h */
diff --git a/packet-dcerpc-reg.h b/packet-dcerpc-reg.h
index 3c05f81786..831b646289 100644
--- a/packet-dcerpc-reg.h
+++ b/packet-dcerpc-reg.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-reg.h
- * Routines for SMB \\PIPE\\winreg packet disassembly
+/* packet-dcerpc-reg.h
+ * Routines for SMB \PIPE\winreg packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-reg.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-reg.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -56,4 +56,4 @@
#define REG_ABORT_SHUTDOWN 0x19
#define REG_UNK_1A 0x1a
-#endif /* packet-msrpc-reg.h */
+#endif /* packet-dcerpc-reg.h */
diff --git a/packet-dcerpc-samr.h b/packet-dcerpc-samr.h
index 2be1a1377c..3dc0542fed 100644
--- a/packet-dcerpc-samr.h
+++ b/packet-dcerpc-samr.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-samr.h
- * Routines for SMB \\PIPE\\samr packet disassembly
+/* packet-dcerpc-samr.h
+ * Routines for SMB \PIPE\samr packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-samr.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-samr.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -85,4 +85,4 @@
#define SAMR_CONNECT 0x39
#define SAMR_SET_USERINFO 0x3A
-#endif /* packet-msrpc-samr.h */
+#endif /* packet-dcerpc-samr.h */
diff --git a/packet-dcerpc-spoolss.h b/packet-dcerpc-spoolss.h
index 4244109630..846878f800 100644
--- a/packet-dcerpc-spoolss.h
+++ b/packet-dcerpc-spoolss.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-spoolss.h
- * Routines for SMB \\PIPE\\spoolss packet disassembly
+/* packet-dcerpc-spoolss.h
+ * Routines for SMB \PIPE\spoolss packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-spoolss.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-spoolss.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -76,4 +76,4 @@
#define SPOOLSS_GETPRINTERDATAEX 0x4e
#define SPOOLSS_SETPRINTERDATAEX 0x50
-#endif /* packet-msrpc-spoolss.h */
+#endif /* packet-dcerpc-spoolss.h */
diff --git a/packet-dcerpc-srvsvc.h b/packet-dcerpc-srvsvc.h
index f7c5ed5117..c44c0f27f6 100644
--- a/packet-dcerpc-srvsvc.h
+++ b/packet-dcerpc-srvsvc.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-srvsvc.h
- * Routines for SMB \\PIPE\\srvsvc packet disassembly
+/* packet-dcerpc-srvsvc.h
+ * Routines for SMB \PIPE\srvsvc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-srvsvc.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-srvsvc.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -45,4 +45,4 @@
#define SRV_NETFILEQUERYSECDESC 0x27
#define SRV_NETFILESETSECDESC 0x28
-#endif /* packet-msrpc-srvsvc.h */
+#endif /* packet-dcerpc-srvsvc.h */
diff --git a/packet-dcerpc-wkssvc.h b/packet-dcerpc-wkssvc.h
index 31573ecc18..3b6c8c2567 100644
--- a/packet-dcerpc-wkssvc.h
+++ b/packet-dcerpc-wkssvc.h
@@ -1,8 +1,8 @@
-/* packet-msrpc-wkssvc.h
- * Routines for SMB \\PIPE\\wkssvc packet disassembly
+/* packet-dcerpc-wkssvc.h
+ * Routines for SMB \PIPE\wkssvc packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-wkssvc.h,v 1.1 2001/11/21 02:08:57 guy Exp $
+ * $Id: packet-dcerpc-wkssvc.h,v 1.2 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -30,4 +30,4 @@
#define WKS_QUERY_INFO 0x00
-#endif /* packet-msrpc-wkssvc.h */
+#endif /* packet-dcerpc-wkssvc.h */
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 9c815ceba3..66070b13c2 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -8,7 +8,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
* Guy Harris 2001
*
- * $Id: packet-smb-pipe.c,v 1.59 2001/12/05 08:20:28 guy Exp $
+ * $Id: packet-smb-pipe.c,v 1.60 2001/12/09 00:07:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2534,7 +2534,7 @@ proto_register_pipe_lanman(void)
static heur_dissector_list_t smb_transact_heur_subdissector_list;
static gboolean
-dissect_pipe_msrpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree,
+dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree,
proto_tree *tree, guint32 fid)
{
dcerpc_private_info dcerpc_priv;
@@ -2620,7 +2620,7 @@ dissect_pipe_msrpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree,
}
void
-proto_register_pipe_msrpc(void)
+proto_register_pipe_dcerpc(void)
{
register_heur_dissector_list("smb_transact", &smb_transact_heur_subdissector_list);
}
@@ -2849,7 +2849,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb,
if (fid != -1) {
if (d_tvb == NULL)
return FALSE;
- return dissect_pipe_msrpc(d_tvb, pinfo, tree,
+ return dissect_pipe_dcerpc(d_tvb, pinfo, tree,
pipe_tree, fid);
}
break;