diff options
-rw-r--r-- | packet-dcerpc-dfs.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-lsa.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-netlogon.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-reg.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-samr.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-spoolss.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-srvsvc.h | 6 | ||||
-rw-r--r-- | packet-dcerpc-wkssvc.h | 6 | ||||
-rw-r--r-- | packet-smb-pipe.c | 10 |
9 files changed, 29 insertions, 29 deletions
diff --git a/packet-dcerpc-dfs.h b/packet-dcerpc-dfs.h index 0bcdab3de3..e6af5931c5 100644 --- a/packet-dcerpc-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-dcerpc-dfs.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-dfs.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_DFS_H -#define __PACKET_MSRPC_DFS_H +#ifndef __PACKET_DCERPC_DFS_H +#define __PACKET_DCERPC_DFS_H /* Functions available on the NETDFS pipe. From Samba, include/rpc_dfs.h */ diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h index 8d699e377e..37f0422d62 100644 --- a/packet-dcerpc-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-dcerpc-lsa.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-lsa.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_LSA_H -#define __PACKET_MSRPC_LSA_H +#ifndef __PACKET_DCERPC_LSA_H +#define __PACKET_DCERPC_LSA_H /* Functions available on the LSA pipe. From Samba, include/rpc_lsa.h */ diff --git a/packet-dcerpc-netlogon.h b/packet-dcerpc-netlogon.h index 23dbdb3afa..e84e9e8a59 100644 --- a/packet-dcerpc-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-dcerpc-netlogon.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-netlogon.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_NETLOGON_H -#define __PACKET_MSRPC_NETLOGON_H +#ifndef __PACKET_DCERPC_NETLOGON_H +#define __PACKET_DCERPC_NETLOGON_H /* Functions available on the NETLOGON pipe. From Samba, include/rpc_netlogon.h */ diff --git a/packet-dcerpc-reg.h b/packet-dcerpc-reg.h index 831b646289..941937a2b7 100644 --- a/packet-dcerpc-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-dcerpc-reg.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-reg.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_REG_H -#define __PACKET_MSRPC_REG_H +#ifndef __PACKET_DCERPC_REG_H +#define __PACKET_DCERPC_REG_H /* Functions available on the WINREG pipe. From Samba, include/rpc_reg.h */ diff --git a/packet-dcerpc-samr.h b/packet-dcerpc-samr.h index 3dc0542fed..d1faf92e72 100644 --- a/packet-dcerpc-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-dcerpc-samr.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-samr.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_SAMR_H -#define __PACKET_MSRPC_SAMR_H +#ifndef __PACKET_DCERPC_SAMR_H +#define __PACKET_DCERPC_SAMR_H /* Functions available on the SAMR pipe. From Samba, include/rpc_samr.h */ diff --git a/packet-dcerpc-spoolss.h b/packet-dcerpc-spoolss.h index 846878f800..ef7a481271 100644 --- a/packet-dcerpc-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-dcerpc-spoolss.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-spoolss.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_SPOOLSS_H -#define __PACKET_MSRPC_SPOOLSS_H +#ifndef __PACKET_DCERPC_SPOOLSS_H +#define __PACKET_DCERPC_SPOOLSS_H /* Functions available on the SPOOLSS pipe. From Samba, include/rpc_spoolss.h */ diff --git a/packet-dcerpc-srvsvc.h b/packet-dcerpc-srvsvc.h index c44c0f27f6..889471a765 100644 --- a/packet-dcerpc-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-dcerpc-srvsvc.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-srvsvc.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_SRVSVC_H -#define __PACKET_MSRPC_SRVSVC_H +#ifndef __PACKET_DCERPC_SRVSVC_H +#define __PACKET_DCERPC_SRVSVC_H /* Functions available on the SRVSVC pipe. From Samba, include/rpc_srvsvc.h */ diff --git a/packet-dcerpc-wkssvc.h b/packet-dcerpc-wkssvc.h index 3b6c8c2567..b483824002 100644 --- a/packet-dcerpc-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-dcerpc-wkssvc.h,v 1.2 2001/12/09 00:07:37 guy Exp $ + * $Id: packet-dcerpc-wkssvc.h,v 1.3 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __PACKET_MSRPC_WKSSVC_H -#define __PACKET_MSRPC_WKSSVC_H +#ifndef __PACKET_DCERPC_WKSSVC_H +#define __PACKET_DCERPC_WKSSVC_H /* Functions available on the WKSSVC pipe. From Samba, include/rpc_wkssvc.h */ diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index f454179dad..a0d7e018cd 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.61 2001/12/10 00:25:34 guy Exp $ + * $Id: packet-smb-pipe.c,v 1.62 2001/12/16 20:08:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2657,7 +2657,7 @@ static const value_string pipe_status[] = { }; #define PIPE_LANMAN 1 -#define PIPE_MSRPC 2 +#define PIPE_DCERPC 2 /* decode the SMB pipe protocol for requests @@ -2814,8 +2814,8 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, if(strncmp(pipe,"LANMAN",6) == 0){ trans_subcmd=PIPE_LANMAN; } else { - /* assume it is MSRPC*/ - trans_subcmd=PIPE_MSRPC; + /* assume it is DCERPC */ + trans_subcmd=PIPE_DCERPC; } if (!pinfo->fd->flags.visited) @@ -2842,7 +2842,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, tree); break; - case PIPE_MSRPC: + case PIPE_DCERPC: /* * Only dissect this if we know the FID. */ |