forked from osmocom/wireshark
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
This commit is contained in:
parent
cdb4a5f4d5
commit
7125550f19
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue