diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-07-03 18:18:03 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-07-03 22:26:27 +0000 |
| commit | 3e325b144883556d8d1b5bf7de5b586643c1d994 (patch) | |
| tree | 894f6e69cd08eeea0de30fc1f798babbf3a43c9b /epan/dissectors/packet-vnc.c | |
| parent | df6bdcc07d4b2dc7877007cfa04830761acb0d0f (diff) | |
| download | wireshark-3e325b144883556d8d1b5bf7de5b586643c1d994.tar.gz | |
packet-vnc.c: Restore tvb_get_string() --> tvb_get_string_enc() changes lost in gdf6bdcc
These changes were originally done in g971ffd6
Change-Id: I9de28ba7089f99e8058207f3b6d34de931decf76
Reviewed-on: https://code.wireshark.org/review/2835
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-vnc.c')
| -rw-r--r-- | epan/dissectors/packet-vnc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 9d1903a58e..972d85c47c 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -984,7 +984,7 @@ process_vendor(proto_tree *tree, gint hfindex, tvbuff_t *tvb, gint offset) proto_item *ti; if (tree) { - vendor = tvb_get_string(wmem_packet_scope(), tvb, offset, 4); + vendor = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII); ti = proto_tree_add_string(tree, hfindex, tvb, offset, 4, vendor); @@ -1017,7 +1017,7 @@ process_tight_capabilities(proto_tree *tree, offset = process_vendor(tree, vendor_index, tvb, offset); - name = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII); proto_tree_add_string(tree, name_index, tvb, offset, 8, name); offset += 8; } @@ -1123,7 +1123,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_item(tree, hf_vnc_server_proto_ver, tvb, 4, 7, ENC_ASCII|ENC_NA); per_conversation_info->server_proto_ver = - g_ascii_strtod((char *)tvb_get_string(wmem_packet_scope(), tvb, 4, 7), NULL); + g_ascii_strtod((char *)tvb_get_string_enc(wmem_packet_scope(), tvb, 4, 7, ENC_ASCII), NULL); per_conversation_info->server_port = pinfo->srcport; col_add_fstr(pinfo->cinfo, COL_INFO, @@ -1140,7 +1140,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree_add_item(tree, hf_vnc_client_proto_ver, tvb, 4, 7, ENC_ASCII|ENC_NA); per_conversation_info->client_proto_ver = - g_ascii_strtod((char *)tvb_get_string(wmem_packet_scope(), tvb, 4, 7), NULL); + g_ascii_strtod((char *)tvb_get_string_enc(wmem_packet_scope(), tvb, 4, 7, ENC_ASCII), NULL); col_add_fstr(pinfo->cinfo, COL_INFO, "Client protocol version: %s", @@ -1292,10 +1292,10 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, auth_code = tvb_get_ntohl(tvb, offset); auth_item = proto_tree_add_item(tree, hf_vnc_tight_auth_code, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - vendor = tvb_get_string(wmem_packet_scope(), tvb, offset, 4); + vendor = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII); process_vendor(tree, hf_vnc_tight_server_vendor, tvb, offset); offset += 4; - signature = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); + signature = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII); proto_tree_add_text(tree, tvb, offset, 8, "Signature: %s", signature); offset += 8; |