pinfo->private_data was a quite subptimal idea

[obnox/wireshark/wip.git] / epan / dissectors / packet-smb-pipe.c

diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index b7ba50097618f071b37b4129b96cf95faf6f8d63..bc1ffea3ed286c54777302496b42539b835c69cf 100644 (file)
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -46,8 +46,9 @@ XXX  Fixme : shouldnt show [malformed frame] for long packets
 #include "packet-smb-pipe.h"
 #include "packet-smb-browse.h"
 #include "packet-smb-common.h"
+#include "packet-windows-common.h"
 #include "packet-dcerpc.h"
-#include "reassemble.h"
+#include <epan/reassemble.h>
 
 static int proto_smb_pipe = -1;
 static int hf_pipe_function = -1;
@@ -3239,7 +3240,6 @@ gboolean
 dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree,
     proto_tree *tree, guint32 fid)
 {
-       dcerpc_private_info dcerpc_priv;
        smb_info_t *smb_priv = (smb_info_t *)pinfo->private_data;
        gboolean result=0;
        gboolean save_fragmented;
@@ -3248,10 +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.fid = fid;
-
-       pinfo->private_data = &dcerpc_priv;
-
+       pinfo->dcetransportsalt = fid;
 
        /*
         * Offer desegmentation service to DCERPC if we have all the