diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 22:03:00 +0000 |
| commit | ae747e4c4b34c2d6889df335a439b9fba77538d0 (patch) | |
| tree | 3586ed7bc3e608af6db8bf6eff87fb3990c45b35 /epan/dissectors/packet-rdp.c | |
| parent | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (diff) | |
| download | wireshark-ae747e4c4b34c2d6889df335a439b9fba77538d0.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48430
Diffstat (limited to 'epan/dissectors/packet-rdp.c')
| -rw-r--r-- | epan/dissectors/packet-rdp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 8f32e86b63..e3d68eb339 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -1418,7 +1418,7 @@ dissect_rdp_SendData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tree = proto_item_add_subtree(pi, ett_rdp_SendData); conversation = find_or_create_conversation(pinfo); - rdp_info = conversation_get_proto_data(conversation, proto_rdp); + rdp_info = (rdp_conv_info_t *)conversation_get_proto_data(conversation, proto_rdp); if (rdp_info && ((rdp_info->licenseAgreed == 0) || @@ -1627,10 +1627,10 @@ dissect_rdp_ClientData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { conversation = find_or_create_conversation(pinfo); - rdp_info = conversation_get_proto_data(conversation, proto_rdp); + rdp_info = (rdp_conv_info_t *)conversation_get_proto_data(conversation, proto_rdp); if (rdp_info == NULL) { - rdp_info = se_alloc0(sizeof(rdp_conv_info_t)); + rdp_info = se_new0(rdp_conv_info_t); rdp_info->staticChannelId = -1; rdp_info->encryptionMethod = 0; rdp_info->encryptionLevel = 0; @@ -1773,10 +1773,10 @@ dissect_rdp_ServerData(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { conversation = find_or_create_conversation(pinfo); - rdp_info = conversation_get_proto_data(conversation, proto_rdp); + rdp_info = (rdp_conv_info_t *)conversation_get_proto_data(conversation, proto_rdp); if (rdp_info == NULL) { - rdp_info = se_alloc0(sizeof(rdp_conv_info_t)); + rdp_info = se_new0(rdp_conv_info_t); rdp_info->staticChannelId = -1; rdp_info->encryptionMethod = 0; rdp_info->encryptionLevel = 0; |