Wireshark · Ethereal-dev: [Ethereal-dev] [patch] msrpc vs dcerpc cleanup

Ethereal-dev: [Ethereal-dev] [patch] msrpc vs dcerpc cleanup

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Tim Potter <tpot@xxxxxxxxx>

Date: Sun, 9 Dec 2001 09:33:53 +1100

Here's a small patch to change all instances of the string msrpc to
decrpc.  I also snuck another comment cleanup into packet-dcerpc-*.h
as well.


Tim.

Index: packet-dcerpc-dfs.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-dfs.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-dfs.h
--- packet-dcerpc-dfs.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-dfs.h	2001/12/08 22:32:53
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-dfs.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -34,4 +34,4 @@
 #define DFS_GET_INFO             0x04
 #define DFS_ENUM                 0x05
 
-#endif /* packet-msrpc-dfs.h */
+#endif /* packet-dcerpc-dfs.h */
Index: packet-dcerpc-lsa.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-lsa.c,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-lsa.c
--- packet-dcerpc-lsa.c	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-lsa.c	2001/12/08 22:32:54
@@ -42,6 +42,8 @@
 
 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 },
Index: packet-dcerpc-lsa.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-lsa.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-lsa.h
--- packet-dcerpc-lsa.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-lsa.h	2001/12/08 22:32:54
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-lsa.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -75,4 +75,4 @@
 #define LSA_OPENPOLICY2        0x2c
 #define LSA_UNK_GET_CONNUSER   0x2d
 
-#endif /* packet-msrpc-lsa.h */
+#endif /* packet-dcerpc-lsa.h */
Index: packet-dcerpc-netlogon.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-netlogon.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-netlogon.h
--- packet-dcerpc-netlogon.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-netlogon.h	2001/12/08 22:32:54
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-netlogon.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -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 */
Index: packet-dcerpc-reg.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-reg.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-reg.h
--- packet-dcerpc-reg.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-reg.h	2001/12/08 22:32:54
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-reg.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -56,4 +56,4 @@
 #define REG_ABORT_SHUTDOWN	0x19
 #define REG_UNK_1A		0x1a
 
-#endif /* packet-msrpc-reg.h */
+#endif /* packet-dcerpc-reg.h */
Index: packet-dcerpc-samr.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-samr.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-samr.h
--- packet-dcerpc-samr.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-samr.h	2001/12/08 22:32:54
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-samr.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -85,4 +85,4 @@
 #define SAMR_CONNECT           0x39
 #define SAMR_SET_USERINFO      0x3A
 
-#endif /* packet-msrpc-samr.h */
+#endif /* packet-dcerpc-samr.h */
Index: packet-dcerpc-spoolss.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-spoolss.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-spoolss.h
--- packet-dcerpc-spoolss.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-spoolss.h	2001/12/08 22:32:54
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-spoolss.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -76,4 +76,4 @@
 #define SPOOLSS_GETPRINTERDATAEX			0x4e
 #define SPOOLSS_SETPRINTERDATAEX			0x50
 
-#endif /* packet-msrpc-spoolss.h */
+#endif /* packet-dcerpc-spoolss.h */
Index: packet-dcerpc-srvsvc.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-srvsvc.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-srvsvc.h
--- packet-dcerpc-srvsvc.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-srvsvc.h	2001/12/08 22:32:56
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-srvsvc.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -45,4 +45,4 @@
 #define SRV_NETFILEQUERYSECDESC 0x27
 #define SRV_NETFILESETSECDESC	0x28
 
-#endif /* packet-msrpc-srvsvc.h */
+#endif /* packet-dcerpc-srvsvc.h */
Index: packet-dcerpc-wkssvc.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-wkssvc.h,v
retrieving revision 1.1
diff -u -r1.1 packet-dcerpc-wkssvc.h
--- packet-dcerpc-wkssvc.h	2001/11/21 02:08:57	1.1
+++ packet-dcerpc-wkssvc.h	2001/12/08 22:32:56
@@ -1,5 +1,5 @@
-/* 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@xxxxxxxxx>
  *
  * $Id: packet-dcerpc-wkssvc.h,v 1.1 2001/11/21 02:08:57 guy Exp $
@@ -30,4 +30,4 @@
 
 #define WKS_QUERY_INFO    0x00
 
-#endif /* packet-msrpc-wkssvc.h */
+#endif /* packet-dcerpc-wkssvc.h */
Index: packet-smb-pipe.c
===================================================================
RCS file: /cvsroot/ethereal/packet-smb-pipe.c,v
retrieving revision 1.59
diff -u -r1.59 packet-smb-pipe.c
--- packet-smb-pipe.c	2001/12/05 08:20:28	1.59
+++ packet-smb-pipe.c	2001/12/08 22:33:06
@@ -2534,7 +2534,7 @@
 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 @@
 }
 
 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 @@
 			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;

Follow-Ups:
- Re: [Ethereal-dev] [patch] msrpc vs dcerpc cleanup
  - From: Guy Harris

Prev by Date: Re: [Ethereal-dev] SPOOLSS, msrpc dissection, please comment
Next by Date: Re: [Ethereal-dev] problems building on mac os x
Previous by thread: Re: [Ethereal-dev] TCP graphs now compatible with 0.8.19 and Win32
Next by thread: Re: [Ethereal-dev] [patch] msrpc vs dcerpc cleanup
Index(es):
- Date
- Thread