diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-06-09 09:24:07 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-06-09 09:24:07 +0000 |
| commit | 2cf487fcf6e4c5523c98820aa54c84c6997cb866 (patch) | |
| tree | ed18ed3c427e59c5cb143bd8bf646301b45990dc /packet-smb-pipe.c | |
| parent | 058b3c5582ccbcdbe9a8dcd4434e8e2496440c68 (diff) | |
| download | wireshark-2cf487fcf6e4c5523c98820aa54c84c6997cb866.tar.gz wireshark-2cf487fcf6e4c5523c98820aa54c84c6997cb866.tar.bz2 wireshark-2cf487fcf6e4c5523c98820aa54c84c6997cb866.zip | |
DCERPC problem reported by JBM and identified by Todd Sabin
Other protocol, not only SMB will populate pinfo->private_data
thus checking for existence of non-NULL pinfo->private_data is not sufficient
to determine we have SMB data and this is what it is.
Refactor the adding of salt/FID from lower layer protocols and generalize it.
Create a new dissector_handle specific for SMB so that we know that IFF we came in through that handle, then whatever pinfo->private_data is what we expect it to be.
svn path=/trunk/; revision=11129
Diffstat (limited to 'packet-smb-pipe.c')
| -rw-r--r-- | packet-smb-pipe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c index ae48bf881a..1a8748c2dd 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.100 2004/06/03 23:55:57 sahlberg Exp $ + * $Id: packet-smb-pipe.c,v 1.101 2004/06/09 09:24:07 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3248,8 +3248,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree fragment_data *fd_head; tvbuff_t *new_tvb; - dcerpc_priv.transport_type = DCERPC_TRANSPORT_SMB; - dcerpc_priv.data.smb.fid = fid; + dcerpc_priv.fid = fid; pinfo->private_data = &dcerpc_priv; |