From 7125550f19560de37b1b3cc11c75a2ff1dd515d3 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Mon, 6 Sep 2004 19:51:33 +0000 Subject: [PATCH] rename add_conv_to_dcerpc_bind_table to dcerpc_add_conv_to_bind_table and don't use packet_info as a parameter svn path=/trunk/; revision=11916 --- epan/dissectors/packet-dcerpc.c | 15 ++++++++------- epan/dissectors/packet-dcerpc.h | 4 ++-- epan/libethereal.def | 1 + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 0cf75db889..8ad5d88da2 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -2272,7 +2272,7 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, NULL, hdr->drep, hf_dcerpc_cn_ctx_id, &ctx_id); - /* save context ID for use with add_conv_to_dcerpc_bind_table() */ + /* save context ID for use with dcerpc_add_conv_to_bind_table() */ /* (if we have multiple contexts, this might cause "decode as" * to behave unpredictably) */ pinfo->dcectxid = ctx_id; @@ -2338,6 +2338,7 @@ dissect_dcerpc_cn_bind (tvbuff_t *tvb, gint offset, packet_info *pinfo, pinfo->srcport, pinfo->destport, 0); } + /* if this is the first time we see this packet, we need to update the dcerpc_binds table so that any later calls can match to the interface. @@ -2822,9 +2823,9 @@ end_cn_stub: * @return Pointer to newly-added UUID/conversation binding. */ struct _dcerpc_bind_value * -add_conv_to_dcerpc_bind_table(conversation_t *conv, +dcerpc_add_conv_to_bind_table(conversation_t *conv, guint16 ctx_id, - packet_info *pinfo, + guint16 smb_fid, e_uuid_t uuid, guint16 ver) { @@ -2843,7 +2844,7 @@ add_conv_to_dcerpc_bind_table(conversation_t *conv, key = g_mem_chunk_alloc(dcerpc_bind_key_chunk); key->conv = conv; key->ctx_id = ctx_id; - key->smb_fid = get_transport_salt(pinfo, pinfo->dcetransporttype); + key->smb_fid = smb_fid; /* add this entry to the bind table, first removing any previous ones that are identical @@ -2881,7 +2882,7 @@ dissect_dcerpc_cn_rqst (tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_opnum, &opnum); - /* save context ID for use with add_conv_to_dcerpc_bind_table() */ + /* save context ID for use with dcerpc_add_conv_to_bind_table() */ pinfo->dcectxid = ctx_id; pinfo->dcetransporttype = transport_type; @@ -3042,7 +3043,7 @@ dissect_dcerpc_cn_resp (tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_dcerpc_uint16 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_ctx_id, &ctx_id); - /* save context ID for use with add_conv_to_dcerpc_bind_table() */ + /* save context ID for use with dcerpc_add_conv_to_bind_table() */ pinfo->dcectxid = ctx_id; pinfo->dcetransporttype = transport_type; @@ -3160,7 +3161,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, offset = dissect_dcerpc_uint32 (tvb, offset, pinfo, dcerpc_tree, hdr->drep, hf_dcerpc_cn_status, &status); - /* save context ID for use with add_conv_to_dcerpc_bind_table() */ + /* save context ID for use with dcerpc_add_conv_to_bind_table() */ pinfo->dcectxid = ctx_id; pinfo->dcetransporttype = transport_type; diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h index 32d5d30756..823b355faf 100644 --- a/epan/dissectors/packet-dcerpc.h +++ b/epan/dissectors/packet-dcerpc.h @@ -313,9 +313,9 @@ void register_dcerpc_auth_subdissector(guint8 auth_level, guint8 auth_type, /* Helper for "decode as" dialog to set up a UUID/conversation binding. */ struct _dcerpc_bind_value * -add_conv_to_dcerpc_bind_table(conversation_t *conv, +dcerpc_add_conv_to_bind_table(conversation_t *conv, guint16 ctx_id, - packet_info *pinfo, + guint16 smb_fid, e_uuid_t uuid, guint16 ver); diff --git a/epan/libethereal.def b/epan/libethereal.def index d360cbebce..d5629b50d2 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -79,6 +79,7 @@ create_dissector_handle create_persconffile_dir create_tempfile data_out_file DATA +dcerpc_add_conv_to_bind_table dcerpc_get_proto_hf_opnum dcerpc_get_proto_name dcerpc_get_proto_sub_dissector