diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-26 04:44:52 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-02-26 23:09:43 +0000 |
commit | e4c059f67f3b29bcc26b1faf111bf647ac630e04 (patch) | |
tree | 8ec634d7614f7a32c09c5cdb60d7509fc2dd2208 /epan/dissectors/packet-teamspeak2.c | |
parent | 92537916483ec721a638cdd7c416d099a45a9304 (diff) |
Add free_address_wmem(), fix warnings [-Wcast-qual]
Try to improve address API and also fix some constness warnings
by not overloading the 'data' pointer to store malloc'ed buffers
(use private pointer for that instead).
Second try, now passing test suite.
Change-Id: Idc101cd866b6d4f13500c9d59da5c7a38847fb7f
Reviewed-on: https://code.wireshark.org/review/13946
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-teamspeak2.c')
-rw-r--r-- | epan/dissectors/packet-teamspeak2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index cdbe67abf4..3febde13f3 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -735,7 +735,7 @@ static int dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void switch(type) { case TS2T_LOGINREQUEST: conversation_data->server_port=pinfo->destport; - conversation_data->server_addr=pinfo->dst; + copy_address_shallow(&conversation_data->server_addr, &pinfo->dst); break; } break; @@ -783,7 +783,7 @@ static int dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_ASCII|ENC_BIG_ENDIAN); conversation_data->server_port=pinfo->destport; - conversation_data->server_addr=pinfo->dst; + copy_address_shallow(&conversation_data->server_addr, &pinfo->dst); break; case TS2T_LOGINREPLY: |