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-dcerpc.h | |
| parent | 058b3c5582ccbcdbe9a8dcd4434e8e2496440c68 (diff) | |
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-dcerpc.h')
| -rw-r--r-- | packet-dcerpc.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/packet-dcerpc.h b/packet-dcerpc.h index 84e7d236cf..8d90878066 100644 --- a/packet-dcerpc.h +++ b/packet-dcerpc.h @@ -2,7 +2,7 @@ * Copyright 2001, Todd Sabin <tas@webspan.net> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc.h,v 1.42 2004/05/09 10:03:37 guy Exp $ + * $Id: packet-dcerpc.h,v 1.43 2004/06/09 09:24:07 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -226,18 +226,13 @@ value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd); /* Private data structure to pass to DCERPC dissector. This is used to pass transport specific information down to the dissector from the - dissector that parsed this encapsulated calls. */ - -#define DCERPC_TRANSPORT_SMB 1 + dissector that parsed this encapsulated calls. + When it comes to DCERPC over SMB the only thing we really want to pass + on is the FID. +*/ typedef struct _dcerpc_private_info { - int transport_type; /* Tag */ - - union { - struct { /* DCERPC_TRANSPORT_SMB */ - guint16 fid; - } smb; - } data; + guint16 fid; } dcerpc_private_info; /* Private data passed to subdissectors from the main DCERPC dissector. */ |