diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 19:28:57 +0000 |
| commit | 3eb06be97d520daef0bad19bf9c261b01abdc66d (patch) | |
| tree | 521ce26d4bc68c8e4158df7aa2af769ba60e93b9 /epan/dissectors/packet-msproxy.c | |
| parent | 089dfcd1085ac242322b8e90845ad9913ac7fcd3 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48425
Diffstat (limited to 'epan/dissectors/packet-msproxy.c')
| -rw-r--r-- | epan/dissectors/packet-msproxy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 7a7a8b8749..f3d691fcfa 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -206,7 +206,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, DISSECTOR_ASSERT( conversation); /* should always find a conversation */ - redirect_info = conversation_get_proto_data(conversation, + redirect_info = (redirect_entry_t *)conversation_get_proto_data(conversation, proto_msproxy); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS Proxy"); @@ -277,17 +277,17 @@ static void add_msproxy_conversation( packet_info *pinfo, } conversation = find_conversation( pinfo->fd->num, &pinfo->src, - &pinfo->dst, hash_info->proto, hash_info->server_int_port, + &pinfo->dst, (port_type)hash_info->proto, hash_info->server_int_port, hash_info->clnt_port, 0); if ( !conversation) { conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst, - hash_info->proto, hash_info->server_int_port, + (port_type)hash_info->proto, hash_info->server_int_port, hash_info->clnt_port, 0); } conversation_set_dissector(conversation, msproxy_sub_handle); - new_conv_info = se_alloc(sizeof(redirect_entry_t)); + new_conv_info = se_new(redirect_entry_t); new_conv_info->remote_addr = hash_info->dst_addr; new_conv_info->clnt_port = hash_info->clnt_port; @@ -1085,9 +1085,9 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) conversation = find_or_create_conversation(pinfo); - hash_info = conversation_get_proto_data(conversation, proto_msproxy); + hash_info = (hash_entry_t *)conversation_get_proto_data(conversation, proto_msproxy); if ( !hash_info) { - hash_info = se_alloc(sizeof(hash_entry_t)); + hash_info = se_new(hash_entry_t); conversation_add_proto_data(conversation, proto_msproxy, hash_info); } |