diff options
171 files changed, 567 insertions, 567 deletions
diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c index cd3c42339e..6534bacdf7 100644 --- a/epan/dissectors/file-jpeg.c +++ b/epan/dissectors/file-jpeg.c @@ -493,7 +493,7 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - str = tvb_get_stringz(wmem_packet_scope(), tvb, 4, &str_size); + str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, 4, &str_size, ENC_ASCII); ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); if (strcmp(str, "JFIF") == 0) { /* Version */ @@ -588,7 +588,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - str = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &str_size); + str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &str_size, ENC_ASCII); ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, ENC_ASCII|ENC_NA); offset += str_size; if (strcmp(str, "Exif") == 0) { @@ -745,7 +745,7 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - str = tvb_get_stringz(wmem_packet_scope(), tvb, 4, &str_size); + str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, 4, &str_size, ENC_ASCII); ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); if (strcmp(str, "FPXR") == 0) { proto_tree_add_text(tree, tvb, 0, -1, "Exif FlashPix APP2 application marker"); diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c index dd3ec9c8cb..2ab768da35 100644 --- a/epan/dissectors/packet-adb_cs.c +++ b/epan/dissectors/packet-adb_cs.c @@ -400,7 +400,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ expert_add_info(pinfo, sub_item, &ei_incomplete_message); } - col_append_fstr(pinfo->cinfo, COL_INFO, " Fail=<%s>", tvb_get_string(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset))); + col_append_fstr(pinfo->cinfo, COL_INFO, " Fail=<%s>", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII)); offset = tvb_length(tvb); return offset; } diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index d3ff449d5a..ddaeeb1a2a 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -535,7 +535,7 @@ static int dissect_pascal_string(tvbuff_t *tvb, int offset, proto_tree *tree, * code, we could perhaps avoid allocating and freeing * this string buffer. */ - tmp = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset, len); + tmp = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); item = proto_tree_add_string(tree, hf_index, tvb, offset-1, len+1, tmp); subtree = proto_item_add_subtree(item, ett_pstring); diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 20fe7d7fe7..451c4dc130 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -6271,11 +6271,11 @@ fCharacterString(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offs coding = "UTF-8"; break; case IBM_MS_DBCS: - out = tvb_get_string(wmem_packet_scope(), tvb, offset, l); + out = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_ASCII); coding = "IBM MS DBCS"; break; case JIS_C_6226: - out = tvb_get_string(wmem_packet_scope(), tvb, offset, l); + out = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, l, ENC_ASCII); coding = "JIS C 6226"; break; case ISO_10646_UCS4: diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 111dc770ca..6fdc4d6d1b 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -3541,7 +3541,7 @@ dissect_ber_GeneralizedTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree return end_offset; } - tmpstr = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + tmpstr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); strptr = str; /* those fields are allways present */ strptr += g_snprintf(str, 20, "%.4s-%.2s-%.2s %.2s:%.2s:%.2s", @@ -3650,11 +3650,11 @@ dissect_ber_UTCTime(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *tree, t if ((len < 10) || (len > 19)) { error_str = wmem_strdup_printf(wmem_packet_scope(), "BER Error: UTCTime invalid length: %u", len); - instr = tvb_get_string(wmem_packet_scope(), tvb, offset, len > 19 ? 19 : len); + instr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len > 19 ? 19 : len, ENC_ASCII); goto malformed; } - instr = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + instr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); /* YYMMDDhhmm */ for (i=0; i<10; i++) { diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 15a5efd3c6..b18ddcdce6 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -344,7 +344,7 @@ dissect_bfd_authentication(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (auth_type) { case BFD_AUTH_SIMPLE: if (tree) { - password = tvb_get_string(wmem_packet_scope(), tvb, offset+3, auth_len-3); + password = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+3, auth_len-3, ENC_ASCII); proto_tree_add_string(auth_tree, hf_bfd_auth_password, tvb, offset+3, auth_len-3, password); proto_item_append_text(auth_item, ": %s", password); diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index 278f709330..ccbdb1b8e4 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -512,8 +512,8 @@ dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t for(i = 0; peer_id[i].name != NULL; ++i) { if(tvb_memeql(tvb, offset, peer_id[i].id, (int)strlen(peer_id[i].id)) == 0) { - version = tvb_get_string(wmem_packet_scope(), tvb, offset + (int)strlen(peer_id[i].id), - peer_id[i].ver_len); + version = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + (int)strlen(peer_id[i].id), + peer_id[i].ver_len, ENC_ASCII); proto_tree_add_text(tree, tvb, offset, 20, "Client is %s v%s", peer_id[i].name, format_text((guchar*)version, peer_id[i].ver_len)); diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c index 19d953f5ef..e8599d916e 100644 --- a/epan/dissectors/packet-bt-dht.c +++ b/epan/dissectors/packet-bt-dht.c @@ -108,7 +108,7 @@ bencoded_string_length(tvbuff_t *tvb, guint *offset_ptr) while(tvb_get_guint8(tvb, offset) != ':') ++offset; - len = atoi(tvb_get_string(wmem_packet_scope(), tvb, start, offset-start)); + len = atoi(tvb_get_string_enc(wmem_packet_scope(), tvb, start, offset-start, ENC_ASCII)); ++offset; /* skip the ':' */ *offset_ptr = offset; @@ -131,7 +131,7 @@ dissect_bencoded_string(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, if( tohex ) *result = tvb_bytes_to_ep_str(tvb, offset, string_len ); else - *result = tvb_get_string( wmem_packet_scope(), tvb, offset, string_len ); + *result = tvb_get_string_enc( wmem_packet_scope(), tvb, offset, string_len , ENC_ASCII); proto_tree_add_string_format( tree, hf_bencoded_string, tvb, offset, string_len, *result, "%s: %s", label, *result ); offset += string_len; @@ -154,7 +154,7 @@ dissect_bencoded_int(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, gui while( tvb_get_guint8(tvb,offset)!='e' ) offset += 1; - *result = tvb_get_string( wmem_packet_scope(), tvb, start_offset, offset-start_offset); + *result = tvb_get_string_enc( wmem_packet_scope(), tvb, start_offset, offset-start_offset, ENC_ASCII); proto_tree_add_string_format( tree, hf_bencoded_int, tvb, start_offset, offset-start_offset, *result, "%s: %s", label, *result ); diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 22fcdfbde3..ea31ff4887 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -634,7 +634,7 @@ dissect_attribute_entries(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, for (i_entry = 0; i_entry < count; ++i_entry) { attribute_id = tvb_get_ntohl(tvb, offset); value_length = tvb_get_ntohs(tvb, offset + 4 + 2); - value = tvb_get_string(NULL, tvb, offset + 4 + 2 + 2, value_length); + value = tvb_get_string_enc(NULL, tvb, offset + 4 + 2 + 2, value_length, ENC_ASCII); if (attribute_id == 0x01) col_append_fstr(pinfo->cinfo, COL_INFO, " - Title: \"%s\"", value); @@ -672,7 +672,7 @@ dissect_item_mediaplayer(tvbuff_t *tvb, proto_tree *tree, gint offset) item_length = tvb_get_ntohs(tvb, offset + 1); displayable_name_length = tvb_get_ntohs(tvb, offset + 1 + 2 + 1 + 1 + 4 + 16 + 1 + 2); - displayable_name = tvb_get_string(NULL, tvb, offset + 1 + 2 + 1 + 1 + 4 + 16 + 1 + 2 + 2, displayable_name_length); + displayable_name = tvb_get_string_enc(NULL, tvb, offset + 1 + 2 + 1 + 1 + 4 + 16 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); pitem = proto_tree_add_none_format(tree, hf_btavrcp_player_item, tvb, offset, 1 + 2 + item_length, "Player: %s", displayable_name); ptree = proto_item_add_subtree(pitem, ett_btavrcp_player); @@ -834,7 +834,7 @@ dissect_item_media_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, item_length = tvb_get_ntohs(tvb, offset + 1); displayable_name_length = tvb_get_ntohs(tvb, offset + 1 + 2 + 8 + 1 + 2); - displayable_name = tvb_get_string(NULL, tvb, offset + 1 + 2 + 8 + 1 + 2 + 2, displayable_name_length); + displayable_name = tvb_get_string_enc(NULL, tvb, offset + 1 + 2 + 8 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); pitem = proto_tree_add_none_format(tree, hf_btavrcp_item , tvb, offset, 1 + 2 + item_length, "Element: %s", displayable_name); ptree = proto_item_add_subtree(pitem, ett_btavrcp_element); @@ -886,7 +886,7 @@ dissect_item_folder(tvbuff_t *tvb, proto_tree *tree, gint offset) item_length = tvb_get_ntohs(tvb, offset + 1); displayable_name_length = tvb_get_ntohs(tvb, offset + 1 + 2 + 8 + 1 + 1 + 2); - displayable_name = tvb_get_string(NULL, tvb, offset + 1 + 2 + 8 + 1 + 1 + 2 + 2, displayable_name_length); + displayable_name = tvb_get_string_enc(NULL, tvb, offset + 1 + 2 + 8 + 1 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); pitem = proto_tree_add_none_format(tree, hf_btavrcp_folder, tvb, offset, 1 + 2 + item_length, "Folder : %s", displayable_name); ptree = proto_item_add_subtree(pitem, ett_btavrcp_folder); @@ -1909,7 +1909,7 @@ dissect_browsing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, folder_name_length = tvb_get_ntohs(tvb, offset); offset += 2; proto_tree_add_item(ptree, hf_btavrcp_folder_name, tvb, offset, folder_name_length, ENC_NA); - folder_name = tvb_get_string(NULL, tvb, offset, folder_name_length); + folder_name = tvb_get_string_enc(NULL, tvb, offset, folder_name_length, ENC_ASCII); offset += folder_name_length; proto_item_append_text(pitem, "%s/", folder_name); col_append_fstr(pinfo->cinfo, COL_INFO, "%s/", folder_name); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 6a8655122d..d5de57d57d 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -1809,7 +1809,7 @@ save_local_device_name(tvbuff_t *tvb, gint offset, packet_info *pinfo, switch(tvb_get_guint8(tvb, offset + i + 1)) { case 0x08: /* Device Name, shortened */ case 0x09: /* Device Name, full */ - name = tvb_get_string(wmem_packet_scope(), tvb, offset + i + 2, length - 1); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + i + 2, length - 1, ENC_ASCII); k_interface_id = hci_data->interface_id; k_adapter_id = hci_data->adapter_id; @@ -2574,7 +2574,7 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin k_adapter_id = hci_data->adapter_id; k_frame_number = pinfo->fd->num; - name = tvb_get_string(wmem_packet_scope(), tvb, offset, 248); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 248, ENC_ASCII); key[0].length = 1; key[0].key = &k_interface_id; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 3b78a5ea13..8faee73fa8 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -929,7 +929,7 @@ save_remote_device_name(tvbuff_t *tvb, gint offset, packet_info *pinfo, switch(tvb_get_guint8(tvb, offset + i + 1)) { case 0x08: /* Device Name, shortened */ case 0x09: /* Device Name, full */ - name = tvb_get_string(wmem_packet_scope(), tvb, offset + i + 2, length - 1); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + i + 2, length - 1, ENC_ASCII); k_frame_number = pinfo->fd->num; k_bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2]; @@ -1267,7 +1267,7 @@ dissect_bthci_evt_remote_name_req_complete(tvbuff_t *tvb, int offset, gchar *name; device_name_t *device_name; - name = tvb_get_string(wmem_packet_scope(), tvb, offset, 248); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 248, ENC_ASCII); k_frame_number = pinfo->fd->num; k_bd_addr_oui = bd_addr[0] << 16 | bd_addr[1] << 8 | bd_addr[2]; @@ -2337,7 +2337,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, k_adapter_id = hci_data->adapter_id; k_frame_number = pinfo->fd->num; - name = tvb_get_string(wmem_packet_scope(), tvb, offset, 248); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 248, ENC_ASCII); key[0].length = 1; key[0].key = &k_interface_id; diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c index 8089139b7b..682a683f98 100644 --- a/epan/dissectors/packet-bthcrp.c +++ b/epan/dissectors/packet-bthcrp.c @@ -249,7 +249,7 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 *id; proto_tree_add_item(tree, hf_bthcrp_control_1284_id, tvb, offset, -1, ENC_ASCII | ENC_NA); - id = tvb_get_string(NULL, tvb, offset, tvb_length_remaining(tvb, offset)); + id = tvb_get_string_enc(NULL, tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " - 1284 ID: %s", id); offset += tvb_length_remaining(tvb, offset); } diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index a98f2876b8..b66f4d10d8 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -1346,7 +1346,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* Detect reassemble end character: \r for HS or \n for AG */ length = tvb_length(tvb); - at_stream = tvb_get_string(wmem_packet_scope(), tvb, 0, length); + at_stream = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, length, ENC_ASCII); reassemble_start_offset = 0; diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index 5785e1d76e..8c3dd201df 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -845,7 +845,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /* Detect reassemble end character: \r for HS or \n for AG */ length = tvb_length(tvb); - at_stream = tvb_get_string(wmem_packet_scope(), tvb, 0, length); + at_stream = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, length, ENC_ASCII); reassemble_start_offset = 0; diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index c9a3580272..c4c175981b 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -1360,8 +1360,8 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo, } else if (is_ascii_str(tvb_get_ptr(tvb, offset,item_length - 3), item_length - 3)) { - proto_item_append_text(hdr_tree, " (\"%s\")", tvb_get_string(wmem_packet_scope(), tvb, offset,item_length - 3)); - col_append_fstr(pinfo->cinfo, COL_INFO, " \"%s\"", tvb_get_string(wmem_packet_scope(), tvb, offset,item_length - 3)); + proto_item_append_text(hdr_tree, " (\"%s\")", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,item_length - 3, ENC_ASCII)); + col_append_fstr(pinfo->cinfo, COL_INFO, " \"%s\"", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,item_length - 3, ENC_ASCII)); } if (item_length >= 3) /* prevent infinite loops */ diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 64ae9bad22..81f2a79be5 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -2279,22 +2279,22 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, switch (attribute) { case 0x300: proto_tree_add_item(next_tree, hf_hcrp_1284_id, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x302: proto_tree_add_item(next_tree, hf_hcrp_device_name, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x304: proto_tree_add_item(next_tree, hf_hcrp_friendly_name, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x306: proto_tree_add_item(next_tree, hf_hcrp_device_location, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -2316,7 +2316,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x308: proto_tree_add_item(next_tree, hf_wap_homepage_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x309: @@ -2388,7 +2388,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, proto_item_set_len(entry_item, (new_offset - entry_offset) + length); entry_offset = new_offset; proto_tree_add_item(next_tree, hf_hdp_supported_features_mdep_description, tvb, entry_offset, length, ENC_ASCII | ENC_NA); - proto_item_append_text(entry_item, ": %s", tvb_get_string(wmem_packet_scope(), tvb, entry_offset, length)); + proto_item_append_text(entry_item, ": %s", tvb_get_string_enc(wmem_packet_scope(), tvb, entry_offset, length, ENC_ASCII)); entry_offset += length; } @@ -2430,12 +2430,12 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, case 0x30D: case 0x200: proto_tree_add_item(next_tree, hf_pan_ipv4_subnet, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x30E: proto_tree_add_item(next_tree, hf_pan_ipv6_subnet, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -2462,12 +2462,12 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, case 0x30D: case 0x200: proto_tree_add_item(next_tree, hf_pan_ipv4_subnet, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x30E: proto_tree_add_item(next_tree, hf_pan_ipv6_subnet, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -2519,7 +2519,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x306: proto_tree_add_item(next_tree, hf_dun_escape_sequence, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -2888,7 +2888,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, switch (attribute) { case 0x350: proto_tree_add_item(next_tree, hf_bpp_document_formats_supported, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x352: @@ -2898,7 +2898,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x354: proto_tree_add_item(next_tree, hf_bpp_xhtml_print_image_formats_supported, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x356: @@ -2908,17 +2908,17 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x358: proto_tree_add_item(next_tree, hf_bpp_1284_id, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x35A: proto_tree_add_item(next_tree, hf_bpp_printer_name, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x35C: proto_tree_add_item(next_tree, hf_bpp_printer_location, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x35E: @@ -2928,7 +2928,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x360: proto_tree_add_item(next_tree, hf_bpp_media_types_supported, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x362: @@ -2948,7 +2948,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x368: proto_tree_add_item(next_tree, hf_bpp_rui_formats_supported, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x370: @@ -2963,17 +2963,17 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x374: proto_tree_add_item(next_tree, hf_bpp_reference_printing_top_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x376: proto_tree_add_item(next_tree, hf_bpp_direct_printing_top_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x37A: proto_tree_add_item(next_tree, hf_bpp_device_name, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -2984,12 +2984,12 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, switch (attribute) { case 0x368: proto_tree_add_item(next_tree, hf_bpp_rui_formats_supported, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x378: proto_tree_add_item(next_tree, hf_bpp_printer_admin_rui_top_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -3062,7 +3062,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, dissect_data_element(entry_tree, &sub_tree, pinfo, tvb, list_offset); list_offset = get_type_length(tvb, list_offset, &entry_length); - new_str = tvb_get_string(wmem_packet_scope(), tvb, list_offset, entry_length); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, list_offset, entry_length, ENC_ASCII); wmem_strbuf_append_printf(info_buf, "Lang: %s", new_str); proto_item_append_text(entry_item, ": Lang: %s", new_str); proto_tree_add_item(sub_tree, hf_sdp_lang_code, tvb, list_offset, entry_length, ENC_ASCII | ENC_NA); @@ -3140,17 +3140,17 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x00A: proto_tree_add_item(next_tree, hf_sdp_service_documentation_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x00B: proto_tree_add_item(next_tree, hf_sdp_service_client_executable_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x00C: proto_tree_add_item(next_tree, hf_sdp_service_icon_url, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x00D: @@ -3178,17 +3178,17 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x100: proto_tree_add_item(next_tree, hf_sdp_service_name, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x101: proto_tree_add_item(next_tree, hf_sdp_service_description, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; case 0x102: proto_tree_add_item(next_tree, hf_sdp_service_provider_name, tvb, offset, size, ENC_ASCII | ENC_NA); - new_str = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + new_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); wmem_strbuf_append(info_buf, new_str); break; default: @@ -3219,7 +3219,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 8: /* fall through */ case 4: { - gchar *ptr = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset, size); + gchar *ptr = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); proto_tree_add_item(next_tree, (type == 8) ? hf_data_element_value_url : hf_data_element_value_string, tvb, offset, size, ENC_NA | ENC_ASCII); wmem_strbuf_append_printf(info_buf, "%s ", ptr); diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 4b2e63c31e..717d6bb5cd 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -462,7 +462,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm user_id = tvb_get_ntohs(tvb, *offset); proto_tree_add_uint(tree, hf_c1222_logon_id, tvb, *offset, 2, user_id); *offset += 2; - user_name = tvb_get_string(wmem_packet_scope(),tvb, *offset, 10); + user_name = tvb_get_string_enc(wmem_packet_scope(),tvb, *offset, 10, ENC_ASCII); proto_tree_add_string(tree, hf_c1222_logon_user, tvb, *offset, 10, user_name); *offset += 10; *length -= 12; @@ -474,7 +474,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm break; case C1222_CMD_SECURITY: if (*length >= 20) { - password = tvb_get_string(wmem_packet_scope(),tvb, *offset, 20); + password = tvb_get_string_enc(wmem_packet_scope(),tvb, *offset, 20, ENC_ASCII); proto_tree_add_string(tree, hf_c1222_security_password, tvb, *offset, 20, password); *offset += 20; *length -= 20; diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index bd577093c9..1ddfcfdcfa 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1920,7 +1920,7 @@ static void dissect_tty_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre int linelen = tvb_find_line_end_unquoted(tvb, offset, -1, &next_offset); /* Extract & add the string. */ - char *string = (char*)tvb_get_string(wmem_packet_scope(), tvb, offset, linelen); + char *string = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII); if (isascii(string[0])) { /* If looks printable treat as string... */ proto_tree_add_string_format(tty_tree, hf_catapult_dct2000_tty_line, @@ -2465,7 +2465,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (strcmp(protocol_name, "comment") == 0) { /* Extract & add the string. */ proto_item *string_ti; - char *string = (char*)tvb_get_string(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset)); + char *string = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII); /* Show comment string */ string_ti = proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_comment, tvb, @@ -2492,7 +2492,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else if (strcmp(protocol_name, "sprint") == 0) { /* Extract & add the string. */ - char *string = (char*)tvb_get_string(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset)); + char *string = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tvb_length_remaining(tvb, offset), ENC_ASCII); /* Show sprint string */ proto_tree_add_item(dct2000_tree, hf_catapult_dct2000_sprint, tvb, diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index 7834b33b59..fb67f32f15 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -340,12 +340,12 @@ dissect_gsm_cell_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *cbs_page_subtree = proto_item_add_subtree(item, ett_gsm_cbs_page_content); len = tvb_length(cbs_page_tvb); proto_tree_add_string(cbs_page_subtree, hf_gsm_cbs_page_content, cbs_page_tvb, 0, - text_len, tvb_get_string(wmem_packet_scope(), cbs_page_tvb, 0, text_len)); + text_len, tvb_get_string_enc(wmem_packet_scope(), cbs_page_tvb, 0, text_len, ENC_ASCII)); len -= text_len; if (len) { proto_tree_add_string(cbs_page_subtree, hf_gsm_cbs_page_content_padding, cbs_page_tvb, text_len, len, - tvb_get_string(wmem_packet_scope(), cbs_page_tvb, text_len, len)); + tvb_get_string_enc(wmem_packet_scope(), cbs_page_tvb, text_len, len, ENC_ASCII)); } } if (text_len) @@ -381,7 +381,7 @@ dissect_gsm_cell_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cbs_msg_item = proto_tree_add_protocol_format(proto_tree_get_root(tree), proto_cell_broadcast, cbs_msg_tvb, 0, len, "GSM Cell Broadcast Message"); cbs_msg_tree = proto_item_add_subtree(cbs_msg_item, ett_cbs_msg); - proto_tree_add_string(cbs_msg_tree, hf_gsm_cbs_message_content, cbs_msg_tvb, 0, len, tvb_get_string(wmem_packet_scope(), cbs_msg_tvb, 0, len)); + proto_tree_add_string(cbs_msg_tree, hf_gsm_cbs_message_content, cbs_msg_tvb, 0, len, tvb_get_string_enc(wmem_packet_scope(), cbs_msg_tvb, 0, len, ENC_ASCII)); } } @@ -410,7 +410,7 @@ void dissect_umts_cell_broadcast_message(tvbuff_t *tvb, packet_info *pinfo, prot msg_len = tvb_length(cbs_msg_tvb); cbs_item2 = proto_tree_add_text(cbs_tree, tvb, offset, -1, "Cell Broadcast Message Contents (length: %d)", msg_len); cbs_subtree = proto_item_add_subtree(cbs_item2, ett_cbs_msg); - proto_tree_add_text(cbs_subtree, cbs_msg_tvb , 0, tvb_length(cbs_msg_tvb), "%s", tvb_get_string(wmem_packet_scope(), cbs_msg_tvb, 0, msg_len)); + proto_tree_add_text(cbs_subtree, cbs_msg_tvb , 0, tvb_length(cbs_msg_tvb), "%s", tvb_get_string_enc(wmem_packet_scope(), cbs_msg_tvb, 0, msg_len, ENC_ASCII)); } /* Register the protocol with Wireshark */ diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 89bd2513ea..ea5dbd760c 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -705,7 +705,7 @@ static void dissect_cimd_dcs(tvbuff_t *tvb, proto_tree *tree, gint pindex, gint startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); offset = startOffset + 1 + CIMD_PC_LENGTH + 1; - dcs = (guint32) strtoul(tvb_get_string(wmem_packet_scope(), tvb, offset, endOffset - offset), NULL, 10); + dcs = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, endOffset - offset, ENC_ASCII), NULL, 10); proto_tree_add_uint(param_tree, (*vals_hdr_PC[pindex].hf_p), tvb, offset, endOffset - offset, dcs); dcs_cg = (dcs & 0xF0) >> 4; @@ -754,8 +754,8 @@ static void dissect_cimd_error_code( tvbuff_t *tvb, proto_tree *tree, gint pinde proto_tree_add_item(param_tree, hf_cimd_pcode_indicator, tvb, startOffset + 1, CIMD_PC_LENGTH, ENC_ASCII|ENC_NA); - err_code = (guint32) strtoul(tvb_get_string(wmem_packet_scope(), tvb, - startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1)), + err_code = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, + startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), ENC_ASCII), NULL, 10); proto_tree_add_uint(param_tree, (*vals_hdr_PC[pindex].hf_p), tvb, startOffset + 1 + CIMD_PC_LENGTH + 1, endOffset - (startOffset + 1 + CIMD_PC_LENGTH + 1), err_code); } @@ -783,7 +783,7 @@ dissect_cimd_operation(tvbuff_t *tvb, proto_tree *tree, gint etxp, guint16 check if (endOffset == -1) break; - PC = (guint32) strtoul(tvb_get_string(wmem_packet_scope(), tvb, offset + 1, CIMD_PC_LENGTH), NULL, 10); + PC = (guint32) strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, CIMD_PC_LENGTH, ENC_ASCII), NULL, 10); try_val_to_str_idx(PC, cimd_vals_PC, &idx); if (idx != -1 && tree) { @@ -814,8 +814,8 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) etxp = tvb_find_guint8(tvb, CIMD_PN_OFFSET + CIMD_PN_LENGTH, -1, CIMD_ETX); if (etxp == -1) return; - OC = (guint8)strtoul(tvb_get_string(wmem_packet_scope(), tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH), NULL, 10); - PN = (guint8)strtoul(tvb_get_string(wmem_packet_scope(), tvb, CIMD_PN_OFFSET, CIMD_PN_LENGTH), NULL, 10); + OC = (guint8)strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH, ENC_ASCII), NULL, 10); + PN = (guint8)strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, CIMD_PN_OFFSET, CIMD_PN_LENGTH, ENC_ASCII), NULL, 10); last1 = tvb_get_guint8(tvb, etxp - 1); last2 = tvb_get_guint8(tvb, etxp - 2); @@ -826,7 +826,7 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (last1 != CIMD_DELIM && last2 != CIMD_DELIM && last3 == CIMD_DELIM) { /* looks valid, it would be nice to check that last1 and last2 are HEXA */ /* CC is present */ - checksum = (guint16)strtoul(tvb_get_string(wmem_packet_scope(), tvb, etxp - 2, 2), NULL, 16); + checksum = (guint16)strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, etxp - 2, 2, ENC_ASCII), NULL, 16); for (; offset < (etxp - 2); offset++) { pkt_check += tvb_get_guint8(tvb, offset); @@ -871,7 +871,7 @@ dissect_cimd_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } /* Try getting the operation-code */ - opcode = (guint8)strtoul(tvb_get_string(wmem_packet_scope(), tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH), NULL, 10); + opcode = (guint8)strtoul(tvb_get_string_enc(wmem_packet_scope(), tvb, CIMD_OC_OFFSET, CIMD_OC_LENGTH, ENC_ASCII), NULL, 10); if (try_val_to_str(opcode, vals_hdr_OC) == NULL) return FALSE; diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index bd80377ea3..26e8f8fe0b 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.c @@ -256,7 +256,7 @@ cmpp_octet_string(proto_tree *tree, tvbuff_t *tvb, gint field, gint offset, gint { char *display; - display = (char *)tvb_get_string(wmem_packet_scope(), tvb, offset, length); + display = (char *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); proto_tree_add_string(tree, field, tvb, offset, length, display); return display; } diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 359b2fe599..54eef9e5a7 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -331,7 +331,7 @@ dissect_coap_opt_uri_host(tvbuff_t *tvb, proto_item *head_item, proto_tree *subt { guint8 *str; - str = tvb_get_string(wmem_packet_scope(), tvb, offset, opt_length); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); proto_tree_add_string(subtree, hf_coap_opt_uri_host, tvb, offset, opt_length, str); @@ -362,7 +362,7 @@ dissect_coap_opt_uri_path(tvbuff_t *tvb, proto_item *head_item, proto_tree *subt if (opt_length == 0) { str = nullstr; } else { - str = tvb_get_string(wmem_packet_scope(), tvb, offset, opt_length); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); g_strlcat(coap_uri_str, str, sizeof(coap_uri_str)); } @@ -385,7 +385,7 @@ dissect_coap_opt_uri_query(tvbuff_t *tvb, proto_item *head_item,proto_tree *subt if (opt_length == 0) { str = nullstr; } else { - str = tvb_get_string(wmem_packet_scope(), tvb, offset, opt_length); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); g_strlcat(coap_uri_str, str, sizeof(coap_uri_str)); } @@ -403,7 +403,7 @@ dissect_coap_opt_location_path(tvbuff_t *tvb, proto_item *head_item, proto_tree if (opt_length == 0) { str = nullstr; } else { - str = tvb_get_string(wmem_packet_scope(), tvb, offset, opt_length); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); } proto_tree_add_string(subtree, hf_coap_opt_location_path, tvb, offset, opt_length, str); @@ -420,7 +420,7 @@ dissect_coap_opt_location_query(tvbuff_t *tvb, proto_item *head_item, proto_tree if (opt_length == 0) { str = nullstr; } else { - str = tvb_get_string(wmem_packet_scope(), tvb, offset, opt_length); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); } proto_tree_add_string(subtree, hf_coap_opt_location_query, tvb, offset, opt_length, str); @@ -437,7 +437,7 @@ dissect_coap_opt_proxy_uri(tvbuff_t *tvb, proto_item *head_item, proto_tree *sub if (opt_length == 0) { str = nullstr; } else { - str = tvb_get_string(wmem_packet_scope(), tvb, offset, opt_length); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, opt_length, ENC_ASCII); } proto_tree_add_string(subtree, hf_coap_opt_proxy_uri, tvb, offset, opt_length, str); diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 040384aefd..843c4b7992 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -395,7 +395,7 @@ dissect_collectd_string (tvbuff_t *tvb, packet_info *pinfo, gint type_hf, *ret_offset = offset + 4; *ret_length = length - 4; - *ret_string = tvb_get_string (wmem_packet_scope(), tvb, *ret_offset, *ret_length); + *ret_string = tvb_get_string_enc(wmem_packet_scope(), tvb, *ret_offset, *ret_length, ENC_ASCII); pi = proto_tree_add_text (tree_root, tvb, offset, length, "collectd %s segment: \"%s\"", @@ -1007,8 +1007,8 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (part_type) { case TYPE_HOST: - vdispatch.host = tvb_get_string (wmem_packet_scope(), tvb, - offset + 4, part_length - 4); + vdispatch.host = tvb_get_string_enc(wmem_packet_scope(), tvb, + offset + 4, part_length - 4, ENC_ASCII); if (pkt_host == NULL) pkt_host = vdispatch.host; break; @@ -1016,15 +1016,15 @@ dissect_collectd (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case TYPE_TIME_HR: break; case TYPE_PLUGIN: - vdispatch.plugin = tvb_get_string (wmem_packet_scope(), tvb, - offset + 4, part_length - 4); + vdispatch.plugin = tvb_get_string_enc(wmem_packet_scope(), tvb, + offset + 4, part_length - 4, ENC_ASCII); pkt_plugins++; break; case TYPE_PLUGIN_INSTANCE: break; case TYPE_TYPE: - vdispatch.type = tvb_get_string (wmem_packet_scope(), tvb, - offset + 4, part_length - 4); + vdispatch.type = tvb_get_string_enc(wmem_packet_scope(), tvb, + offset + 4, part_length - 4, ENC_ASCII); break; case TYPE_TYPE_INSTANCE: break; diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index f9cd4f021f..75f02ab57b 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -2855,7 +2855,7 @@ info_to_display(tvbuff_t *tvb, proto_item *stt, int offset, int octets, const ch /* Special section for printing strings */ if (mode==FMT_STR) { - codestr = tvb_get_string(wmem_packet_scope(), tvb, offset, octets); + codestr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, octets, ENC_ASCII); pi = proto_tree_add_string_format(stt, *hf_proto_parameter, tvb, offset, octets, codestr, "%-28s : %s", str, codestr); return pi; diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index 6d320fc237..36edd41769 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -309,7 +309,7 @@ dissect_dbus_sig(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree, int offset len = dinfo->get32(tvb, offset); offset += 4; - val = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + val = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); offset += (len + 1 /* NUL-byte */ + 3) & ~3; if (sig == 's') { @@ -337,7 +337,7 @@ dissect_dbus_sig(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree, int offset len = tvb_get_guint8(tvb, offset); offset += 1; - val = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + val = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); offset += (len + 1); ti = proto_tree_add_string_format(tree, hfi_dbus_value_str.id, tvb, org_offset, offset - org_offset, val, "SIGNATURE: %s", val); @@ -368,7 +368,7 @@ dissect_dbus_field_signature(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree /* sig_len = tvb_strsize(tvb, offset); */ - sig = tvb_get_string(wmem_packet_scope(), tvb, offset, sig_len); + sig = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sig_len, ENC_ASCII); offset += (sig_len + 1); ti = proto_tree_add_string(tree, &hfi_dbus_type_signature, tvb, org_offset, offset - org_offset, sig); diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c index f8c04ba12a..b2b6a58e6a 100644 --- a/epan/dissectors/packet-dcerpc-epm.c +++ b/epan/dissectors/packet-dcerpc-epm.c @@ -180,7 +180,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset, hf_epm_ann_offset, NULL); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_epm_ann_len, &len); - str=tvb_get_string(wmem_packet_scope(), tvb, offset, len); + str=tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, ENC_ASCII|ENC_NA); offset += len; @@ -429,17 +429,17 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, case PROTO_ID_NAMED_PIPES: /* \\PIPE\xxx named pipe */ proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, ENC_ASCII|ENC_NA); - proto_item_append_text(tr, "NamedPipe:%s", tvb_get_string(wmem_packet_scope(), tvb, offset, len)); + proto_item_append_text(tr, "NamedPipe:%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII)); break; case PROTO_ID_NAMED_PIPES_2: /* PIPENAME named pipe */ proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, ENC_ASCII|ENC_NA); - proto_item_append_text(tr, "PIPE:%s", tvb_get_string(wmem_packet_scope(), tvb, offset, len)); + proto_item_append_text(tr, "PIPE:%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII)); break; case PROTO_ID_NETBIOS: /* \\NETBIOS netbios name */ proto_tree_add_item(tr, hf_epm_proto_netbios_name, tvb, offset, len, ENC_ASCII|ENC_NA); - proto_item_append_text(tr, "NetBIOS:%s", tvb_get_string(wmem_packet_scope(), tvb, offset, len)); + proto_item_append_text(tr, "NetBIOS:%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII)); break; case PROTO_ID_HTTP: /* RPC over HTTP */ proto_tree_add_item(tr, hf_epm_proto_http_port, tvb, offset, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c index 56dc75ec52..5f0494c537 100644 --- a/epan/dissectors/packet-dcerpc-fileexp.c +++ b/epan/dissectors/packet-dcerpc-fileexp.c @@ -580,7 +580,7 @@ typedef [string] byte NameString_t[AFS_NAMEMAX]; if (string_size < AFS_NAMEMAX) { proto_tree_add_item (tree, hf_fileexp_afsNameString_t_principalName_string, tvb, offset, string_size, ENC_ASCII|ENC_NA); - namestring = tvb_get_string (wmem_packet_scope(), tvb, offset, string_size); + namestring = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, string_size, ENC_ASCII); offset += string_size; col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", namestring); } @@ -755,7 +755,7 @@ dissect_afsTaggedPath (tvbuff_t * tvb, int offset, hf_fileexp_afsTaggedPath_tp_length, &tp_length); proto_tree_add_item (tree, hf_fileexp_afsTaggedPath_tp_chars, tvb, offset, tp_length, ENC_ASCII|ENC_NA); - tp_chars = tvb_get_string (wmem_packet_scope(), tvb, offset, 1025); + tp_chars = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 1025, ENC_ASCII); offset += 1025; col_append_fstr (pinfo->cinfo, COL_INFO, " :tp_chars %s", tp_chars); @@ -1312,7 +1312,7 @@ dissect_afstaggedname (tvbuff_t * tvb, int offset, { proto_tree_add_item (tree, hf_fileexp_tn_string, tvb, offset, tn_length, ENC_ASCII|ENC_NA); - tn_string = tvb_get_string (wmem_packet_scope(), tvb, offset, 257); + tn_string = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 257, ENC_ASCII); offset += 257; col_append_fstr (pinfo->cinfo, COL_INFO, " :tn_tag: %s", tn_string); } diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index 243af6a519..5b4fce15d4 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -341,7 +341,7 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset, /* byte name[MAXVLCELLCHARS]; Cell name */ proto_tree_add_item (tree, hf_fldb_vlconf_cell_name, tvb, offset, 114, ENC_ASCII|ENC_NA); - name = tvb_get_string (wmem_packet_scope(), tvb, offset, MAXVLCELLCHARS); /* XXX why 114 above and 128 here?? */ + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, MAXVLCELLCHARS, ENC_ASCII); /* XXX why 114 above and 128 here?? */ offset += MAXVLCELLCHARS; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */ col_append_fstr (pinfo->cinfo, COL_INFO, " Name: %s", name); @@ -377,7 +377,7 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset, { proto_tree_add_item (tree, hf_fldb_vlconf_cell_hostname, tvb, offset, 64, ENC_ASCII|ENC_NA); - hostname = tvb_get_string (wmem_packet_scope(), tvb, offset, 64); + hostname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 64, ENC_ASCII); offset += 64; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */ col_append_fstr (pinfo->cinfo, COL_INFO, " hostName: %s", hostname); } @@ -460,7 +460,7 @@ typedef [string] byte NameString_t[AFS_NAMEMAX]; proto_tree_add_item (tree, hf_fldb_afsNameString_t_principalName_string, tvb, offset, string_size, ENC_ASCII|ENC_NA); - namestring = tvb_get_string (wmem_packet_scope(), tvb, offset, string_size); + namestring = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, string_size, ENC_ASCII); offset += string_size; col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", namestring); } @@ -684,7 +684,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset, proto_tree_add_item (tree, hf_fldb_vldbentry_volumename, tvb, offset, 114, ENC_ASCII|ENC_NA); - volumename = tvb_get_string (wmem_packet_scope(), tvb, offset, 114); + volumename = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 114, ENC_ASCII); offset += 110; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */ col_append_fstr (pinfo->cinfo, COL_INFO, " Name: %s", volumename); @@ -746,7 +746,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset, { proto_tree_add_item (tree, hf_fldb_vldbentry_siteprincipal, tvb, offset, 64, ENC_ASCII|ENC_NA); - siteprincipal = tvb_get_string (wmem_packet_scope(), tvb, offset, 64); + siteprincipal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 64, ENC_ASCII); offset += 64; col_append_fstr (pinfo->cinfo, COL_INFO, " Princ: %s", siteprincipal); } @@ -908,14 +908,14 @@ dissect_vldbentry (tvbuff_t * tvb, int offset, /* byte LockerName[MAXLOCKNAMELEN]; */ proto_tree_add_item (tree, hf_fldb_vldbentry_lockername, tvb, offset, MAXLOCKNAMELEN, ENC_ASCII|ENC_NA); - lockername = tvb_get_string (wmem_packet_scope(), tvb, offset, MAXLOCKNAMELEN); + lockername = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, MAXLOCKNAMELEN, ENC_ASCII); offset += MAXLOCKNAMELEN; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */ col_append_fstr (pinfo->cinfo, COL_INFO, " LockerName: %s", lockername); /* byte charSpares[50]; */ proto_tree_add_item (tree, hf_fldb_vldbentry_charspares, tvb, offset, 50, ENC_ASCII|ENC_NA); - charspares = tvb_get_string (wmem_packet_scope(), tvb, offset, 50); + charspares = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 50, ENC_ASCII); offset += 50; /* some reason this 114 seems to be incorrect... cutting 4 short to compensate.... */ col_append_fstr (pinfo->cinfo, COL_INFO, " charSpares:%s", charspares); @@ -1057,7 +1057,7 @@ fldb_dissect_getsiteinfo_resp (tvbuff_t * tvb, int offset, offset += 48; /* part of kerbprin before name... */ proto_tree_add_item (tree, hf_fldb_namestring, tvb, offset, 64, ENC_ASCII|ENC_NA); - namestring = tvb_get_string (wmem_packet_scope(), tvb, offset, 64); + namestring = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 64, ENC_ASCII); offset += 64; col_append_fstr (pinfo->cinfo, COL_INFO, " %s", namestring); diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index d24c3ab6fc..b80fcd589f 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -1287,8 +1287,8 @@ void cb_str_postprocess(packet_info *pinfo, proto_tree *tree _U_, * some way we can get that string, rather than duplicating the * efforts of that routine? */ - s = tvb_get_string(wmem_packet_scope(), - tvb, start_offset + 12, (end_offset - start_offset - 12) ); + s = tvb_get_string_enc(wmem_packet_scope(), + tvb, start_offset + 12, (end_offset - start_offset - 12), ENC_ASCII); /* Append string to COL_INFO */ diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index a5e17b22e3..7cc4c0a680 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -77,13 +77,13 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, /* advance to get size of cell, and princ */ proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA); - key_t1 = tvb_get_string(wmem_packet_scope(), tvb, offset, key_size); + key_t1 = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size, ENC_ASCII); offset += key_size; offset += 8; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_rpriv_get_eptgt_rqst_key_size2, &key_size2); proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t2, tvb, offset, key_size2, ENC_ASCII|ENC_NA); - key_t2 = tvb_get_string(wmem_packet_scope(), tvb, offset, key_size2); + key_t2 = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size2, ENC_ASCII); offset += key_size2; diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c index 5f834ee0df..d57f6f2fe7 100644 --- a/epan/dissectors/packet-dcerpc-rs_acct.c +++ b/epan/dissectors/packet-dcerpc-rs_acct.c @@ -66,7 +66,7 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset, if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */ proto_tree_add_item (tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA); - keyx_t = tvb_get_string(wmem_packet_scope(), tvb, offset, key_size); + keyx_t = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size, ENC_ASCII); offset += key_size; col_append_fstr(pinfo->cinfo, COL_INFO, @@ -95,7 +95,7 @@ rs_acct_dissect_get_projlist_rqst (tvbuff_t *tvb, int offset, proto_tree_add_item (tree, hf_rs_acct_get_projlist_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA); - keyx_t = tvb_get_string(wmem_packet_scope(), tvb, offset, key_size); + keyx_t = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size, ENC_ASCII); offset += key_size; col_append_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c index 64bc7fa417..df3bdd8b10 100644 --- a/epan/dissectors/packet-dcerpc-rs_misc.c +++ b/epan/dissectors/packet-dcerpc-rs_misc.c @@ -64,7 +64,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset, if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */ proto_tree_add_item (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA); - key_t1 = tvb_get_string(wmem_packet_scope(), tvb, offset, key_size); + key_t1 = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size, ENC_ASCII); offset += key_size; col_append_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index 055f99d524..d072527587 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -198,7 +198,7 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In if (string_size > 1) { col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", - tvb_get_string(wmem_packet_scope(), tvb, offset, string_size)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, string_size, ENC_ASCII)); } offset += string_size; } @@ -410,7 +410,7 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset, if (string_size > 1) { col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", - tvb_get_string (wmem_packet_scope(), tvb, offset, string_size)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, string_size, ENC_ASCII)); } offset += string_size; } diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 03b5f6881a..363c5ab4e3 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4927,7 +4927,7 @@ dissect_dcm_assoc_item(tvbuff_t *tvb, proto_tree *tree, guint32 offset, switch (item_value_type) { case DCM_ITEM_VALUE_TYPE_UID: - *item_value = (gchar *)tvb_get_string(wmem_packet_scope(), tvb, offset+4, item_len); + *item_value = (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, item_len, ENC_ASCII); uid = (dcm_uid_t *)g_hash_table_lookup(dcm_uid_table, (gpointer) *item_value); if (uid) { @@ -4945,7 +4945,7 @@ dissect_dcm_assoc_item(tvbuff_t *tvb, proto_tree *tree, guint32 offset, break; case DCM_ITEM_VALUE_TYPE_STRING: - *item_value = (gchar *)tvb_get_string(wmem_packet_scope(), tvb, offset+4, item_len); + *item_value = (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, item_len, ENC_ASCII); proto_item_append_text(assoc_item_pitem, "%s", *item_value); proto_tree_add_string(assoc_item_ptree, *hf_value, tvb, offset+4, item_len, *item_value); @@ -4998,7 +4998,7 @@ dissect_dcm_assoc_sopclass_extneg(tvbuff_t *tvb, proto_tree *tree, guint32 offse proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_assoc_item_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_extneg_tree, hf_dcm_info_extneg_sopclassuid_len, tvb, offset+4, 2, ENC_BIG_ENDIAN); - sopclassuid_str = (gchar *)tvb_get_string(wmem_packet_scope(), tvb, offset+6, sop_class_uid_len); + sopclassuid_str = (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset+6, sop_class_uid_len, ENC_ASCII); sopclassuid = (dcm_uid_t *)g_hash_table_lookup(dcm_uid_table, (gpointer) sopclassuid_str); if (sopclassuid) { @@ -5100,7 +5100,7 @@ dissect_dcm_assoc_role_selection(tvbuff_t *tvb, proto_tree *tree, guint32 offset proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_assoc_item_len, tvb, offset+2, 2, ENC_BIG_ENDIAN); proto_tree_add_item(assoc_item_rolesel_tree, hf_dcm_info_rolesel_sopclassuid_len, tvb, offset+4, 2, ENC_BIG_ENDIAN); - sopclassuid_str = (gchar *)tvb_get_string(wmem_packet_scope(), tvb, offset+6, sop_class_uid_len); + sopclassuid_str = (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset+6, sop_class_uid_len, ENC_ASCII); sopclassuid = (dcm_uid_t *)g_hash_table_lookup(dcm_uid_table, (gpointer) sopclassuid_str); scu_role = tvb_get_guint8(tvb, offset+6+sop_class_uid_len); @@ -6202,7 +6202,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* Controlled exit, if VR does not fit. */ if (dcm_tag_is_open(pdv, offset_tag, offset_vr, endpos, 2)) return endpos; - vr = (gchar *)tvb_get_string(wmem_packet_scope(), tvb, offset, 2); + vr = (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 2, ENC_ASCII); offset += 2; g_free(pdv->open_tag.vr); diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index 26ecf654f9..2b30b1c8f4 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -196,7 +196,7 @@ dissect_dcp_etsi (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * dcp_tree = proto_item_add_subtree (ti, ett_edcp); } - sync = tvb_get_string (wmem_packet_scope(), tvb, 0, 2); + sync = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, 2, ENC_ASCII); dissector_try_string(dcp_dissector_table, (char*)sync, tvb, pinfo, dcp_tree, NULL); return TRUE; } @@ -618,14 +618,14 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) while(offset<tvb_length(tvb)) { guint32 bits; guint32 bytes; - char *tag = (char*)tvb_get_string (wmem_packet_scope(), tvb, offset, 4); offset += 4; + char *tag = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII); offset += 4; bits = tvb_get_ntohl(tvb, offset); offset += 4; bytes = bits / 8; if(bits % 8) bytes++; if(strcmp(tag, "*ptr")==0) { - prot = (char*)tvb_get_string (wmem_packet_scope(), tvb, offset, 4); + prot = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII); maj = tvb_get_ntohs(tvb, offset+4); min = tvb_get_ntohs(tvb, offset+6); proto_tree_add_bytes_format(tpl_tree, hf_tpl_tlv, tvb, diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index b02eb2db66..54305653f9 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -569,7 +569,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da * XXX - if this is truly like DHCP option 81, * we need to dissect it as such. */ - proto_item_append_text(oi,", \"%s\"", tvb_get_string(wmem_packet_scope(), tvb, offset, option_length)); + proto_item_append_text(oi,", \"%s\"", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, option_length, ENC_ASCII)); proto_tree_add_item(option_tree, hf_dhcpfo_client_identifier, tvb, offset, @@ -634,7 +634,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da case DHCP_FO_PD_VENDOR_CLASS: vendor_class_str = - tvb_get_string(wmem_packet_scope(), tvb, offset, option_length); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, option_length, ENC_ASCII); proto_item_append_text(oi,", \"%s\"", format_text(vendor_class_str, option_length)); proto_tree_add_string(option_tree, diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 5743fabb8e..66d493ce9c 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1019,7 +1019,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, proto_item *v_item, packet_i opt_len = tlv_len; field_len = tlv_len; - device_type = tvb_get_string(wmem_packet_scope(), tvb, sub_off, field_len); + device_type = tvb_get_string_enc(wmem_packet_scope(), tvb, sub_off, field_len, ENC_ASCII); if ((device_type == NULL) || (strlen(device_type) == 0)) { proto_item_append_text(ti, "Packet does not contain Device Type."); diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index be629bbf7c..03f8ba1933 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1649,7 +1649,7 @@ static void dmp_add_seq_ack_analysis (tvbuff_t *tvb, packet_info *pinfo, static gchar *dissect_7bit_string (tvbuff_t *tvb, gint offset, gint length) { - guchar *encoded = tvb_get_string (wmem_packet_scope(), tvb, offset, length); + guchar *encoded = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); guchar *decoded = (guchar *)wmem_alloc0 (wmem_packet_scope(), (size_t)(length * 1.2) + 1); guchar rest = 0, bits = 1; gint len = 0, i; @@ -3046,12 +3046,12 @@ static void dissect_dmp_structured_id (tvbuff_t *tvb, proto_tree *body_tree, break; case STRUCT_ID_STRING: - dmp.struct_id = tvb_get_string (wmem_packet_scope(), tvb, offset, (gint) dmp_struct_length); + dmp.struct_id = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, (gint) dmp_struct_length, ENC_ASCII); proto_tree_add_item (body_tree, hf_message_bodyid_string, tvb, offset, dmp_struct_length, ENC_ASCII|ENC_NA); break; case STRUCT_ID_ZSTRING: - dmp.struct_id = tvb_get_stringz (wmem_packet_scope(), tvb, offset, &length); + dmp.struct_id = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); proto_tree_add_item (body_tree, hf_message_bodyid_zstring, tvb, offset, length, ENC_ASCII|ENC_NA); break; @@ -3078,7 +3078,7 @@ static gint dissect_dmp_message (tvbuff_t *tvb, packet_info *pinfo, if (dmp.body_format == FREE_TEXT_SUBJECT) { len = tvb_strsize (tvb, offset); if (dmp_subject_as_id) { - dmp.struct_id = tvb_get_string (wmem_packet_scope(), tvb, offset, len); + dmp.struct_id = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); } proto_tree_add_item (message_tree, hf_message_subject, tvb, offset, len, ENC_ASCII|ENC_NA); offset += len; diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 2b2428be18..d915f08af6 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -1948,8 +1948,8 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, da_len = tvb_get_guint8(tvb, offset+1); proto_tree_add_item(point_tree, hf_dnp3_al_da_length, tvb, offset+1, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_text(point_tree, tvb, offset+2, da_len, "Value: %s", tvb_get_string(wmem_packet_scope(), tvb, offset+2, da_len)); - proto_item_append_text(object_item, ", Value: %s", tvb_get_string(wmem_packet_scope(), tvb, offset+2, da_len)); + proto_tree_add_text(point_tree, tvb, offset+2, da_len, "Value: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, da_len, ENC_ASCII)); + proto_item_append_text(object_item, ", Value: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, da_len, ENC_ASCII)); offset += 2 + da_len; @@ -2678,7 +2678,7 @@ dnp3_al_process_object(tvbuff_t *tvb, packet_info *pinfo, int offset, if (al_filename_len > 0) { const gchar *al_filename; - al_filename = tvb_get_string(wmem_packet_scope(), tvb, data_pos, al_filename_len); + al_filename = tvb_get_string_enc(wmem_packet_scope(), tvb, data_pos, al_filename_len, ENC_ASCII); proto_tree_add_text(point_tree, tvb, data_pos, al_filename_len, "File Name: %s", al_filename); } data_pos += al_filename_len; diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index bbfbf37842..a42839ba82 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -637,20 +637,20 @@ dissect_dictionary(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs */ col_add_fstr(pinfo->cinfo, COL_INFO, "%s:%s > %s:%s", - tvb_get_stringz(wmem_packet_scope(), tvb, offset + dict_data->source_scheme_offset, NULL), - tvb_get_stringz(wmem_packet_scope(), tvb, offset + dict_data->source_ssp_offset, NULL), - tvb_get_stringz(wmem_packet_scope(), tvb, offset + dict_data->dest_scheme_offset, NULL), - tvb_get_stringz(wmem_packet_scope(), tvb, offset + dict_data->dest_ssp_offset, NULL)); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + dict_data->source_scheme_offset, NULL, ENC_ASCII), + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + dict_data->source_ssp_offset, NULL, ENC_ASCII), + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + dict_data->dest_scheme_offset, NULL, ENC_ASCII), + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + dict_data->dest_ssp_offset, NULL, ENC_ASCII)); /* remember custodian, for use in checking cteb validity */ *bundle_custodian = wmem_strdup_printf(wmem_packet_scope(), "%s:%s", - tvb_get_stringz(wmem_packet_scope(), + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + dict_data->cust_scheme_offset, - NULL), - tvb_get_stringz(wmem_packet_scope(), + NULL, ENC_ASCII), + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + dict_data->cust_ssp_offset, - NULL)); + NULL, ENC_ASCII)); } offset += dict_data->bundle_header_dict_length; /*Skip over dictionary*/ @@ -1567,7 +1567,7 @@ display_metadata_block(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int /* and second is the creator custodian EID */ cteb_creator_custodian_eid_length = block_length - sdnv_length; - cteb_creator_custodian_eid = (char *) tvb_get_string(wmem_packet_scope(), tvb, offset, cteb_creator_custodian_eid_length); + cteb_creator_custodian_eid = (char *) tvb_get_string_enc(wmem_packet_scope(), tvb, offset, cteb_creator_custodian_eid_length, ENC_ASCII); ti = proto_tree_add_string(block_tree, hf_block_control_block_cteb_creator_custodian_eid, tvb, offset, cteb_creator_custodian_eid_length, cteb_creator_custodian_eid); diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index d8e1375fd4..b42b49470e 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.c @@ -112,7 +112,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII)); } #define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET @@ -126,7 +126,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII)); } #define DLCI_LENGTH 2 diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index a4448c8500..b4fcee3ecf 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -3610,8 +3610,8 @@ dissect_dvbci_ami_file_ack(tvbuff_t *tvb, gint offset, proto_tree_add_text(tree, tvb, offset, 1, "File name length %d", file_name_len); offset++; - file_name_str = tvb_get_string(wmem_packet_scope(), - tvb, offset, file_name_len); + file_name_str = tvb_get_string_enc(wmem_packet_scope(), + tvb, offset, file_name_len, ENC_ASCII); if (!file_name_str) return; col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", @@ -3696,7 +3696,7 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, offset++; proto_tree_add_item(tree, hf_dvbci_app_dom_id, tvb, offset, app_dom_id_len, ENC_ASCII|ENC_NA); - app_dom_id = tvb_get_string(wmem_packet_scope(), tvb, offset, app_dom_id_len); + app_dom_id = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, app_dom_id_len, ENC_ASCII); if (app_dom_id) { col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "for %s", app_dom_id); @@ -3726,8 +3726,8 @@ dissect_dvbci_payload_ami(guint32 tag, gint len_field _U_, if (tvb_reported_length_remaining(tvb, offset) <= 0) break; if (req_type==REQ_TYPE_FILE || req_type==REQ_TYPE_FILE_HASH) { - req_str = tvb_get_string(wmem_packet_scope(), tvb, offset, - tvb_reported_length_remaining(tvb, offset)); + req_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, + tvb_reported_length_remaining(tvb, offset), ENC_ASCII); if (!req_str) break; col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "%s", req_str); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 43c339dbb5..0eb1326e98 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -947,7 +947,7 @@ static int dissect_kademlia_string(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); /* TODO: ASCII or UTF-8? */ - string_value = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, string_length ); + string_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, string_length , ENC_ASCII); proto_tree_add_text(tree, tvb, offset+2, string_length, "String: %s", string_value); diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 310b6add99..01c8737ca8 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -1336,8 +1336,8 @@ dissect_eigrp_service (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, * followed by a '<'), try XML. Otherwise, try plain-text. */ xml_tvb = tvb_new_subset_length(sub_tvb, sub_offset, length); - test_string = tvb_get_string(wmem_packet_scope(), xml_tvb, 0, (length < 32 ? - length : 32)); + test_string = tvb_get_string_enc(wmem_packet_scope(), xml_tvb, 0, (length < 32 ? + length : 32), ENC_ASCII); tok = strtok(test_string, " \t\r\n"); if (tok && tok[0] == '<') { diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index b7b7339aee..d9194a97fd 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -216,7 +216,7 @@ dissect_lower_address(proto_item *ti_arg, gint ett_arg, offset += 8; /* skip the zero bytes */ /* SUFFIX */ - suffix = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len2); + suffix = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len2, ENC_ASCII); ti = proto_tree_add_item(tree, hf_suff, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN); offset += len2+1; @@ -448,7 +448,7 @@ dissect_elcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_get_guint8(tvb, 3+1+TOTAL_LEN+LOWADR_LEN) != SUFFIX_LEN) return; /* finally believe that there is valid suffix */ - suffix = tvb_get_string(wmem_packet_scope(), tvb, 3+2+LOWADR_LEN, 2); + suffix = tvb_get_string_enc(wmem_packet_scope(), tvb, 3+2+LOWADR_LEN, 2, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, " %s Connect", suffix); break; diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index d255e370fd..3d101dc71a 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -495,7 +495,7 @@ dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre handle_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; pi = proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, ENC_NA); - tmp = (gchar*)tvb_get_string(wmem_packet_scope(), parameter_tvb, POOL_HANDLE_OFFSET, handle_length); + tmp = (gchar*)tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, POOL_HANDLE_OFFSET, handle_length, ENC_ASCII); proto_item_append_text(pi, " (%s)", tmp); } diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index c30118c81f..000b8322f1 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -145,7 +145,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree name_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_epmd_name_len, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, name_length, ENC_ASCII); offset += 2 + name_length; if (tvb_length_remaining(tvb, offset) >= 2) { guint16 elen=0; @@ -161,7 +161,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree case EPMD_PORT2_REQ: name_length = tvb_length_remaining(tvb, offset); proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); break; case EPMD_ALIVE_REQ: @@ -169,7 +169,7 @@ dissect_epmd_request(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree offset += 2; name_length = tvb_length_remaining(tvb, offset); proto_tree_add_item(tree, hf_epmd_name, tvb, offset, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); break; case EPMD_NAMES_REQ: @@ -248,7 +248,7 @@ dissect_epmd_response(packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree name_length = tvb_get_ntohs(tvb, offset); proto_tree_add_item(tree, hf_epmd_name_len, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_epmd_name, tvb, offset + 2, name_length, ENC_ASCII|ENC_NA); - name = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, name_length); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, name_length, ENC_ASCII); offset += 2 + name_length; if (tvb_length_remaining(tvb, offset) >= 2) { guint16 elen=0; diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 064c5a763d..a2f445981c 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -234,7 +234,7 @@ static gint dissect_etf_dist_header(packet_info *pinfo _U_, tvbuff_t *tvb, gint proto_tree_add_uint(acr_tree, hf_erldp_atom_length, tvb, offset, 1, atom_txt_len); offset++; } - str = tvb_get_string(wmem_packet_scope(), tvb, offset, atom_txt_len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, atom_txt_len, ENC_ASCII); proto_tree_add_item(acr_tree, hf_erldp_atom_text, tvb, offset, atom_txt_len, ENC_NA|ENC_ASCII); proto_item_append_text(ti_acr, " - '%s'", str); offset += atom_txt_len; @@ -443,7 +443,7 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre offset += 4; } str_len = tvb_length_remaining(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset, str_len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, str_len, ENC_ASCII); proto_tree_add_item(tree, hf_erldp_name, tvb, offset, str_len, ENC_ASCII|ENC_NA); col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s", (is_challenge) ? "SEND_CHALLENGE" : "SEND_NAME", str); break; @@ -464,7 +464,7 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre case 's' : str_len = tvb_length_remaining(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset, str_len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, str_len, ENC_ASCII); proto_tree_add_item(tree, hf_erldp_status, tvb, offset, str_len, ENC_ASCII|ENC_NA); col_add_fstr(pinfo->cinfo, COL_INFO, "SEND_STATUS %s", str); break; diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index 4de87ac659..8877de5e3c 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -1314,7 +1314,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; case 0x78: /* NMEA sentence / IMS Status-Code */ if (ims_event) { - guint8 *status_code = tvb_get_string(wmem_packet_scope(), tvb, pos, len); + guint8 *status_code = tvb_get_string_enc(wmem_packet_scope(), tvb, pos, len, ENC_ASCII); proto_tree_add_string_format_value(elem_tree, hf_ctlv_ims_status_code, tvb, pos, len, status_code, "%s (%s)", status_code, str_to_str(status_code, ims_status_code, "Unknown")); } diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index f9d9dd4a0d..27f829619f 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -224,7 +224,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_STDERR_PORT && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the stderr_port field. * It is optional, so it may only be 1 character long @@ -247,7 +247,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_USERNAME && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the username field */ if(length != 1 && length <= EXEC_USERNAME_LEN @@ -275,7 +275,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_PASSWORD && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the password field */ if(length != 1 && length <= EXEC_PASSWORD_LEN @@ -298,7 +298,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_COMMAND && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the command field */ if(length != 1 && length <= EXEC_COMMAND_LEN diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index f92ed96262..69f23049d2 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -430,7 +430,7 @@ dissect_display_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, p offset += 4; length -= 4; - display_name = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + display_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); proto_item_append_text(display_item, ": \"%s\"", format_text(display_name, strlen(display_name))); proto_tree_add_string(display_tree, hf_edp_display_string, tvb, offset, length, @@ -624,7 +624,7 @@ dissect_vlan_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot offset += 4; length -= 4; - vlan_name = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + vlan_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); proto_item_append_text(vlan_item, ", Name \"%s\"", format_text(vlan_name, strlen(vlan_name))); proto_tree_add_string(vlan_tree, hf_edp_vlan_name, tvb, offset, length, diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 702d3f7dc9..4bd49d173f 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1005,9 +1005,9 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean /* Yes - dissect it. */ if (tree) { proto_tree_add_string (fc_tree, hf_fc_nh_da, tvb, next_offset, 8, - fcwwn_to_str (tvb_get_string (wmem_packet_scope(), tvb, offset, 8))); + fcwwn_to_str (tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII))); proto_tree_add_string (fc_tree, hf_fc_nh_sa, tvb, offset+8, 8, - fcwwn_to_str (tvb_get_string (wmem_packet_scope(), tvb, offset+8, 8))); + fcwwn_to_str (tvb_get_string_enc(wmem_packet_scope(), tvb, offset+8, 8, ENC_ASCII))); } next_offset += 16; } diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index 3e7aea9861..5a61c731a6 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -1276,7 +1276,7 @@ static guint8 * zonenm_to_str (tvbuff_t *tvb, gint offset) { int len = tvb_get_guint8 (tvb, offset); - return tvb_get_string (wmem_packet_scope(), tvb, offset+4, len); + return tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); } static void @@ -1342,8 +1342,8 @@ dissect_fcdns_swils_entries (tvbuff_t *tvb, proto_tree *tree, int offset) proto_tree_add_item (tree, &hfi_fcdns_sw2_objfmt, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_string (tree, &hfi_fcdns_rply_ownerid, tvb, offset+1, - 3, fc_to_str (tvb_get_string (wmem_packet_scope(), tvb, offset+1, - 3))); + 3, fc_to_str (tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, + 3, ENC_ASCII))); proto_tree_add_item (tree, &hfi_fcdns_rply_ptype, tvb, offset+4, 1, ENC_BIG_ENDIAN); proto_tree_add_string (tree, &hfi_fcdns_rply_portid, tvb, offset+5, 3, diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c index ebfb52c177..7b6f7855aa 100644 --- a/epan/dissectors/packet-fcgi.c +++ b/epan/dissectors/packet-fcgi.c @@ -126,11 +126,11 @@ dissect_nv_pairs(tvbuff_t *tvb, proto_tree *fcgi_tree, gint offset, guint16 len) offset += 4; } - name = tvb_get_string(wmem_packet_scope(), tvb, offset, namelen); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, namelen, ENC_ASCII); offset += namelen; if (valuelen > 0) { - value = tvb_get_string(wmem_packet_scope(), tvb, offset, valuelen); + value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, valuelen, ENC_ASCII); offset += valuelen; proto_tree_add_text(fcgi_tree, tvb, start_offset, offset - start_offset, "%s = %s", name, value); diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index e6ffc3390a..de839afbab 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -470,7 +470,7 @@ static guint8 * zonenm_to_str(tvbuff_t *tvb, gint offset) { int len = tvb_get_guint8(tvb, offset); - return tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); + return tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); } /* Offset points to the start of the zone object */ diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 48efa3f588..8529d83a94 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -119,7 +119,7 @@ static int fix_next_header(tvbuff_t *tvb, int offset) { /* try to resync to the next start */ guint min_len = tvb_length_remaining(tvb, offset); - const guint8 *data = tvb_get_string(wmem_packet_scope(), tvb, offset, min_len); + const guint8 *data = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, min_len, ENC_ASCII); const guint8 *start = data; while ((start = strstr(start, "\0018"))) { @@ -193,7 +193,7 @@ static int fix_header_len(tvbuff_t *tvb, int offset) return fix_next_header(tvb, offset); } - value = tvb_get_string(wmem_packet_scope(), tvb, tag->value_offset, tag->value_len); + value = tvb_get_string_enc(wmem_packet_scope(), tvb, tag->value_offset, tag->value_len, ENC_ASCII); /* Fix version, msg type, length and checksum aren't in body length. * If the packet is big enough find the checksum */ @@ -271,7 +271,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da return tvb_length(tvb); } - value = tvb_get_string(wmem_packet_scope(), tvb, tag->value_offset, tag->value_len); + value = tvb_get_string_enc(wmem_packet_scope(), tvb, tag->value_offset, tag->value_len, ENC_ASCII); msg_type = str_to_str(value, messages_val, "FIX Message (%s)"); col_add_str(pinfo->cinfo, COL_INFO, msg_type); @@ -288,7 +288,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da continue; } - tag_str = tvb_get_string(wmem_packet_scope(), tvb, field_offset, tag->tag_len); + tag_str = tvb_get_string_enc(wmem_packet_scope(), tvb, field_offset, tag->tag_len, ENC_ASCII); tag_value = atoi(tag_str); if (tag->value_len < 1) { proto_tree *field_tree; @@ -312,7 +312,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da found = 1; } - value = tvb_get_string(wmem_packet_scope(), tvb, tag->value_offset, tag->value_len); + value = tvb_get_string_enc(wmem_packet_scope(), tvb, tag->value_offset, tag->value_len, ENC_ASCII); if (found) { if (fix_fields[i].table) { if (tree) { diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c index 329aea823d..6652011408 100644 --- a/epan/dissectors/packet-fmtp.c +++ b/epan/dissectors/packet-fmtp.c @@ -95,15 +95,15 @@ dissect_fmtp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* case FMTP_TYP_IDENTIFICATION: proto_item_append_text(ti, " (%s)", - tvb_get_string(wmem_packet_scope(), tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN)); + tvb_get_string_enc(wmem_packet_scope(), tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN, ENC_ASCII)); col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", val_to_str(packet_type, packet_type_names, "Unknown (0x%02x)"), - tvb_get_string(wmem_packet_scope(), tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN)); + tvb_get_string_enc(wmem_packet_scope(), tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN, ENC_ASCII)); break; case FMTP_TYP_SYSTEM: proto_item_append_text(ti, " (%s)", - tvb_get_string(wmem_packet_scope(), tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN)); + tvb_get_string_enc(wmem_packet_scope(), tvb, FMTP_HEADER_LEN, packet_len-FMTP_HEADER_LEN, ENC_ASCII)); col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", val_to_str(packet_type, packet_type_names, "Unknown (0x%02x)"), val_to_str(tvb_get_ntohs(tvb, FMTP_HEADER_LEN), system_message_names, "Unknown (0x%02x)")); diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c index d2e71b3bcb..c3fa37930e 100644 --- a/epan/dissectors/packet-foundry.c +++ b/epan/dissectors/packet-foundry.c @@ -150,7 +150,7 @@ dissect_string_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, pr offset += 4; length -= 4; - string_value = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + string_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); proto_item_append_text(string_item, ": \"%s\"", format_text(string_value, strlen(string_value))); diff --git a/epan/dissectors/packet-gearman.c b/epan/dissectors/packet-gearman.c index 0e7228f826..cb7004e470 100644 --- a/epan/dissectors/packet-gearman.c +++ b/epan/dissectors/packet-gearman.c @@ -191,7 +191,7 @@ dissect_binary_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gearman"); col_clear(pinfo->cinfo,COL_INFO); - magic_code = tvb_get_string(wmem_packet_scope(), tvb, 1, 3); + magic_code = tvb_get_string_enc(wmem_packet_scope(), tvb, 1, 3, ENC_ASCII); type = tvb_get_ntohl(tvb, 4); size = tvb_get_ntohl(tvb, 8); @@ -442,7 +442,7 @@ dissect_management_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cmdlen == linelen && 0 == tvb_strneql(tvb, offset, GEARMAN_MGR_CMDS[i], cmdlen)) { proto_tree_add_item(gearman_tree, hf_gearman_mgr_cmd, tvb, offset, cmdlen, ENC_ASCII|ENC_NA); - col_add_fstr(pinfo->cinfo, COL_INFO, "[MGR] %s", tvb_get_string(wmem_packet_scope(), tvb, offset, linelen)); + col_add_fstr(pinfo->cinfo, COL_INFO, "[MGR] %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII)); type = 1; break; } @@ -454,12 +454,12 @@ dissect_management_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (type == 0) { - col_add_fstr(pinfo->cinfo, COL_INFO, "[MGR] %s", tvb_get_string(wmem_packet_scope(), tvb, offset, linelen)); + col_add_fstr(pinfo->cinfo, COL_INFO, "[MGR] %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII)); type = -1; } else { - col_append_sep_fstr(pinfo->cinfo, COL_INFO, ",", "%s", tvb_get_string(wmem_packet_scope(), tvb, offset, linelen)); + col_append_sep_fstr(pinfo->cinfo, COL_INFO, ",", "%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII)); } } diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 58d2b5d976..dc24268af1 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -4025,7 +4025,7 @@ dissect_reply_body (tvbuff_t *tvb, guint offset, packet_info *pinfo, if (sequence_length != 0 && sequence_length < ITEM_LABEL_LENGTH) { - header->exception_id = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &sequence_length); + header->exception_id = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &sequence_length, ENC_ASCII); proto_tree_add_string(tree, hf_giop_exception_id, tvb, offset, sequence_length, header->exception_id); diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c index e529834367..9158900676 100644 --- a/epan/dissectors/packet-git.c +++ b/epan/dissectors/packet-git.c @@ -57,7 +57,7 @@ static gboolean get_packet_length(tvbuff_t *tvb, int offset, { guint8 *lenstr; - lenstr = tvb_get_string(wmem_packet_scope(), tvb, offset, 4); + lenstr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII); return (sscanf(lenstr, "%hx", length) == 1); } diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 968d0155c8..23a2d45f97 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -530,7 +530,7 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offse offset += 4; /* read the key, '\0' terminated */ - key = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &key_len); + key = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &key_len, ENC_ASCII); start_offset2 = offset; offset += key_len; @@ -558,7 +558,7 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offse tvb_get_letohl(tvb, offset + 4), tvb_get_letohl(tvb, offset + 8)); } else { - value = tvb_get_string(wmem_packet_scope(), tvb, offset, value_len); + value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_len, ENC_ASCII); dict_item = proto_tree_add_text(subtree, tvb, offset, -1, "%s: %s", key, value); } diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index 431de090c7..d6001bbe9c 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -148,7 +148,7 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (line_len == 0) { request = "[Directory list]"; } else if (line_len > 0) { - request = tvb_get_string(wmem_packet_scope(), tvb, 0, line_len); + request = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, line_len, ENC_ASCII); } col_add_fstr(pinfo->cinfo, COL_INFO, "Request: %s", request); } else { @@ -173,7 +173,7 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ col_append_str(pinfo->cinfo, COL_INFO, ": [Directory list]"); } - name = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, sel_start - offset - 2); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, sel_start - offset - 2, ENC_ASCII); ti = proto_tree_add_string(gopher_tree, hf_gopher_dir_item, tvb, offset, line_len + 1, name); dir_tree = proto_item_add_subtree(ti, ett_dir_item); diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index 4653a36f28..bb693bca52 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -359,7 +359,7 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (global_ipa_in_info == TRUE) col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", - tvb_get_stringz(wmem_packet_scope(), next_tvb, 0, NULL)); + tvb_get_stringz_enc(wmem_packet_scope(), next_tvb, 0, NULL, ENC_ASCII)); break; default: if (msg_type < ABISIP_RSL_MAX) { diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 0845e6a134..da422a680c 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -4641,7 +4641,7 @@ decode_fqdn(tvbuff_t * tvb, int offset, guint16 length, proto_tree * tree) name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, length - 1); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, length - 1, ENC_ASCII); for (;;) { if (name_len >= length - 1) break; @@ -4650,7 +4650,7 @@ decode_fqdn(tvbuff_t * tvb, int offset, guint16 length, proto_tree * tree) fqdn[tmp] = '.'; } } else - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); proto_tree_add_string(tree, hf_gtp_fqdn, tvb, offset, length, fqdn); } diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 819633e493..1c03b4943f 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1461,7 +1461,7 @@ dissect_gtpv2_apn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - apn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, length - 1); + apn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, length - 1, ENC_ASCII); for (;;) { if (name_len >= length - 1) break; @@ -1470,7 +1470,7 @@ dissect_gtpv2_apn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto apn[tmp] = '.'; } } else{ - apn = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + apn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); } proto_tree_add_string(tree, hf_gtpv2_apn, tvb, offset, length, apn); } @@ -4474,7 +4474,7 @@ dissect_gtpv2_fqdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, length - 1); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, length - 1, ENC_ASCII); for (;;) { if (name_len >= length - 1) break; @@ -4483,7 +4483,7 @@ dissect_gtpv2_fqdn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot fqdn[tmp] = '.'; } } else { - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); } proto_tree_add_string(tree, hf_gtpv2_fqdn, tvb, offset, length, fqdn); proto_item_append_text(item, "%s", fqdn); diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 3c3ebf93b4..b273f17109 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -1031,11 +1031,11 @@ dissect_hip_tlv(tvbuff_t *tvb, int offset, proto_item *ti, int type, int tlv_len if (di_type == 1) { /* RFC 1035 */ proto_tree_add_text(t, tvb, offset+16+hi_len, di_len, - "FQDN: %s", tvb_get_string (wmem_packet_scope(), tvb, offset+16+hi_len, di_len)); + "FQDN: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+16+hi_len, di_len, ENC_ASCII)); } else if (di_type == 2) { /* RFC 4282 */ proto_tree_add_text(t, tvb, offset+16+hi_len, di_len, - "NAI: %s", tvb_get_string (wmem_packet_scope(), tvb, offset+16+hi_len, di_len)); + "NAI: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+16+hi_len, di_len, ENC_ASCII)); } break; case PARAM_CERT: /* CERT */ diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 4d45cf3190..151b590396 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -133,7 +133,7 @@ dissect_hpfeeds_info_pdu(tvbuff_t *tvb, proto_tree *tree, guint offset) len = tvb_get_guint8(tvb, offset); /* don't move the offset yet as we need to get data after this operation */ - strptr = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, len); + strptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, len, ENC_ASCII); ti = proto_tree_add_text(tree, tvb, offset, -1, "Broker: %s", strptr); data_subtree = proto_item_add_subtree(ti, ett_hpfeeds); @@ -190,7 +190,7 @@ dissect_hpfeeds_publish_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* get the channel name as ephemeral string just to make an attempt * in order to decode more payload if channel is "well known" */ - strptr = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + strptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); proto_tree_add_item(tree, hf_hpfeeds_channel, tvb, offset, len, ENC_ASCII|ENC_NA); offset += len; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index e652e3293a..13abd2c9d1 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1539,7 +1539,7 @@ basic_request_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, tokenlen = get_token_len(line, lineend, &next_token); /* Save the request URI for various later uses */ - request_uri = tvb_get_string(wmem_packet_scope(), tvb, offset, tokenlen); + request_uri = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_ASCII); stat_info->request_uri = wmem_strdup(wmem_packet_scope(), request_uri); conv_data->request_uri = wmem_strdup(wmem_file_scope(), request_uri); @@ -1659,7 +1659,7 @@ chunked_encoding_dissector(tvbuff_t **tvb_ptr, packet_info *pinfo, break; } - chunk_string = tvb_get_string(wmem_packet_scope(), tvb, offset, linelen); + chunk_string = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII); if (chunk_string == NULL) { /* Can't get the chunk size line */ @@ -1851,7 +1851,7 @@ chunked_encoding_dissector(tvbuff_t **tvb_ptr, packet_info *pinfo, break; } - chunk_string = tvb_get_string(wmem_packet_scope(), tvb, offset, linelen); + chunk_string = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII); if (chunk_string == NULL) { /* Can't get the chunk size line */ diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index b525544353..dd60ab58b3 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1477,7 +1477,7 @@ static guint32 dissect_ies(tvbuff_t *tvb, packet_info *pinfo, guint32 offset, break; default: - ptr = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, ies_len); + ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, ies_len, ENC_ASCII); ie_item = proto_tree_add_string_format(ies_tree, hf_IAX_IE_UNKNOWN_BYTES, tvb, offset+2, ies_len, ptr, diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index d281d46a19..a59e85b453 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -242,7 +242,7 @@ static void dissect_ice_string(packet_info *pinfo, proto_tree *tree, proto_item if ( Size != 0 ) { - s = tvb_get_string(wmem_packet_scope(), tvb, offset, Size); + s = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, Size, ENC_ASCII); proto_tree_add_string(tree, hf_icep, tvb, offset, Size, s); } else { s = wmem_strdup(wmem_packet_scope(), "(empty)"); diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 4ee2bf889e..e3b53be6ce 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -98,7 +98,7 @@ static void dissect_icp_payload(tvbuff_t *tvb, int offset, /* null terminated URL */ stringlength = tvb_strsize(tvb, offset); proto_tree_add_text(pload_tree, tvb, offset, stringlength, - "URL: %s", tvb_get_string(wmem_packet_scope(), tvb, offset, stringlength)); + "URL: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, stringlength, ENC_ASCII)); break; case CODE_ICP_OP_SECHO: @@ -110,14 +110,14 @@ static void dissect_icp_payload(tvbuff_t *tvb, int offset, case CODE_ICP_OP_DENIED: stringlength = tvb_strsize(tvb, offset); proto_tree_add_text(pload_tree, tvb, offset, stringlength, - "URL: %s", tvb_get_string(wmem_packet_scope(), tvb, offset, stringlength)); + "URL: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, stringlength, ENC_ASCII)); break; case CODE_ICP_OP_HIT_OBJ: /* null terminated URL */ stringlength = tvb_strsize(tvb, offset); proto_tree_add_text(pload_tree, tvb, offset, stringlength, - "URL: %s", tvb_get_string(wmem_packet_scope(), tvb, offset, stringlength)); + "URL: %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, stringlength, ENC_ASCII)); offset += stringlength; /* 2 byte object size */ diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index dc9b28260a..26b0104558 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -446,7 +446,7 @@ proto_add_icq_attr(proto_tree* tree, /* The tree to add to */ return -1; /* length goes past end of packet */ proto_tree_add_text(tree, tvb, offset, len+2, "%s[%u]: %.*s", descr, len, len, - tvb_get_string(wmem_packet_scope(), tvb, offset + 2, len)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, len, ENC_ASCII)); return len + 2; } @@ -520,7 +520,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, break; case MSG_TEXT: proto_tree_add_text(subtree, tvb, offset, left, "Msg: %.*s", left-1, - tvb_get_string(wmem_packet_scope(), tvb, offset, left)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, left, ENC_ASCII)); break; case MSG_URL: for (n = 0; n < N_URL_FIELDS; n++) { @@ -534,7 +534,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s", url_field_descr[n], sz - 1, - tvb_get_string(wmem_packet_scope(), tvb, offset, sz)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sz, ENC_ASCII)); } else { proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s", url_field_descr[n], "(empty)"); @@ -555,7 +555,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s", email_field_descr[n], sz - 1, - tvb_get_string(wmem_packet_scope(), tvb, offset, sz)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sz, ENC_ASCII)); } else { proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s", email_field_descr[n], "(empty)"); @@ -590,7 +590,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, if (sz != 0) { proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s", auth_req_field_descr[n], sz - 1, - tvb_get_string(wmem_packet_scope(), tvb, offset, sz)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sz, ENC_ASCII)); } else { proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s", auth_req_field_descr[n], "(empty)"); @@ -610,7 +610,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, if (sz != 0) { proto_tree_add_text(subtree, tvb, offset, sz, "%s: %.*s", user_added_field_descr[n], sz - 1, - tvb_get_string(wmem_packet_scope(), tvb, offset, sz)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sz, ENC_ASCII)); } else { proto_tree_add_text(subtree, tvb, offset, 0, "%s: %s", user_added_field_descr[n], "(empty)"); @@ -640,7 +640,7 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, /* The first element is the number of Nick/UIN pairs follow */ proto_tree_add_text(subtree, tvb, offset, sz_local, "Number of pairs: %.*s", sz_local - 1, - tvb_get_string(wmem_packet_scope(), tvb, offset, sz_local)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, sz_local, ENC_ASCII)); n_local++; } else if (!last) { int svsz = sz_local; @@ -656,8 +656,8 @@ icqv5_decode_msgType(proto_tree* tree, tvbuff_t *tvb, int offset, int size, } proto_tree_add_text(subtree, tvb, offset, sz_local + svsz, "%.*s: %.*s", svsz - 1, - tvb_get_string(wmem_packet_scope(), tvb, offset, svsz), sz_local - 1, - tvb_get_string(wmem_packet_scope(), tvb, sep_offset_prev + 1, sz_local)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, svsz, ENC_ASCII), sz_local - 1, + tvb_get_string_enc(wmem_packet_scope(), tvb, sep_offset_prev + 1, sz_local, ENC_ASCII)); n_local += 2; } @@ -690,8 +690,8 @@ icqv5_cmd_send_text_code(proto_tree* tree, /* Tree to put the data in */ if (len>0) { proto_tree_add_text(subtree, tvb, offset + CMD_SEND_TEXT_CODE_TEXT, len, "Text: %.*s", len, - tvb_get_string(wmem_packet_scope(), tvb, offset + CMD_SEND_TEXT_CODE_TEXT, - len)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset + CMD_SEND_TEXT_CODE_TEXT, + len, ENC_ASCII)); } x1 = tvb_get_letohs(tvb, offset + CMD_SEND_TEXT_CODE_TEXT + len); @@ -733,8 +733,8 @@ icqv5_cmd_login(proto_tree* tree, tvbuff_t *tvb, int offset) passwdLen = tvb_get_letohs(tvb, offset + CMD_LOGIN_PASSLEN); proto_tree_add_text(subtree, tvb, offset + CMD_LOGIN_PASSLEN, 2 + passwdLen, "Passwd: %.*s", (int)passwdLen, - tvb_get_string(wmem_packet_scope(), tvb, offset + CMD_LOGIN_PASSWD, - passwdLen)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset + CMD_LOGIN_PASSWD, + passwdLen, ENC_ASCII)); proto_tree_add_text(subtree, tvb, offset + CMD_LOGIN_PASSWD + passwdLen + CMD_LOGIN_IP, 4, "IP: %s", tvb_ip_to_str(tvb, offset + CMD_LOGIN_PASSWD + passwdLen + CMD_LOGIN_IP)); @@ -918,7 +918,7 @@ icqv5_srv_meta_user(proto_tree* tree, /* Tree to put the data in */ offset+=2; proto_tree_add_text(sstree, tvb, offset - 2, len+2, "About(%d): %.*s", len, - len, tvb_get_string(wmem_packet_scope(), tvb, offset, len)); + len, tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII)); break; } case META_USER_INFO: diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index fbd93368cd..7168d69a79 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -354,7 +354,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(tree) { proto_tree_add_item(prism_tree, hf_ieee80211_prism_devname, tvb, offset, 16, ENC_ASCII|ENC_NA); } - devname_p = tvb_get_string(wmem_packet_scope(), tvb, offset, 16); + devname_p = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 16, ENC_ASCII); offset += 16; col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %s, Message 0x%x, Length %d", devname_p, msgcode, msglen); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 6277f6c487..01d0072dcd 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6197,7 +6197,7 @@ dissect_nai_realm_list(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int } proto_tree_add_item(realm_tree, hf_ieee80211_ff_anqp_nai_realm, tvb, offset, nai_len, ENC_ASCII|ENC_NA); - realm = tvb_get_string(wmem_packet_scope(), tvb, offset, nai_len); + realm = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, nai_len, ENC_ASCII); if (realm) { proto_item_append_text(r_item, " (%s)", realm); } @@ -10159,7 +10159,7 @@ dissect_vendor_ie_aruba(proto_item *item, proto_tree *ietree, proto_tree_add_item (ietree, hf_ieee80211_vs_aruba_apname, tvb, offset, tag_len, ENC_ASCII|ENC_NA); - proto_item_append_text(item, " (%s)", tvb_get_string(wmem_packet_scope(), tvb, offset, tag_len)); + proto_item_append_text(item, " (%s)", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tag_len, ENC_ASCII)); break; default: @@ -10965,7 +10965,7 @@ dissect_ssid_list(proto_tree *tree, tvbuff_t *tvb, int offset, guint32 tag_len) if (offset + 2 + len > end) break; - str = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, len, ENC_ASCII); proto_item_append_text(tree, "%c %s", (first ? ':' : ','), str); first = FALSE; ssid = proto_tree_add_text(tree, tvb, offset, 2 + len, "SSID: %s", str); @@ -12758,7 +12758,7 @@ ieee80211_tag_ssid(packet_info *pinfo, proto_tree *tree, ssid_len = MAX_SSID_LEN; } - ssid = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, ssid_len); + ssid = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, ssid_len, ENC_ASCII); if (ssid_len == (gint)tag_len) { AirPDcapSetLastSSID(&airpdcap_ctx, (CHAR *) ssid, ssid_len); } @@ -13125,7 +13125,7 @@ ieee80211_tag_country_info(packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_ieee80211_tag_country_info_code, tvb, offset, 2, ENC_ASCII|ENC_NA); proto_item_append_text(ti, ": Country Code %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, 2)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 2, ENC_ASCII)); offset += 2; proto_tree_add_item(tree, hf_ieee80211_tag_country_info_env, @@ -14631,8 +14631,8 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset proto_tree_add_item(tree, hf_ieee80211_mesh_id, tvb, offset, tag_len, ENC_ASCII|ENC_NA); if (tag_len > 0) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", MESHID=%s", tvb_get_string(wmem_packet_scope(), tvb, offset, tag_len)); - proto_item_append_text(ti, ": %s", tvb_get_string(wmem_packet_scope(), tvb, offset, tag_len)); + col_append_fstr(pinfo->cinfo, COL_INFO, ", MESHID=%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tag_len, ENC_ASCII)); + proto_item_append_text(ti, ": %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tag_len, ENC_ASCII)); } break; diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 0877d404b7..102b9f9aeb 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -540,7 +540,7 @@ dissect_imf_siolabel(tvbuff_t *tvb, int offset, int length, proto_item *item, pa } if (tvb_strneql(tvb, item_offset, "marking", 7) == 0) { - proto_item_append_text(item, ": %s", tvb_get_string(wmem_packet_scope(), tvb, value_offset, value_length)); + proto_item_append_text(item, ": %s", tvb_get_string_enc(wmem_packet_scope(), tvb, value_offset, value_length, ENC_ASCII)); proto_tree_add_item(tree, hf_imf_siolabel_marking, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); } else if (tvb_strneql(tvb, item_offset, "fgcolor", 7) == 0) { @@ -550,15 +550,15 @@ dissect_imf_siolabel(tvbuff_t *tvb, int offset, int length, proto_item *item, pa proto_tree_add_item(tree, hf_imf_siolabel_bgcolor, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); } else if (tvb_strneql(tvb, item_offset, "type", 4) == 0) { - type = tvb_get_string(wmem_packet_scope(), tvb, value_offset + 1, value_length - 2); /* quoted */ + type = tvb_get_string_enc(wmem_packet_scope(), tvb, value_offset + 1, value_length - 2, ENC_ASCII); /* quoted */ proto_tree_add_item(tree, hf_imf_siolabel_type, tvb, value_offset, value_length, ENC_ASCII|ENC_NA); } else if (tvb_strneql(tvb, item_offset, "label", 5) == 0) { - gchar *label = tvb_get_string(wmem_packet_scope(), tvb, value_offset + 1, value_length - 2); /* quoted */ + gchar *label = tvb_get_string_enc(wmem_packet_scope(), tvb, value_offset + 1, value_length - 2, ENC_ASCII); /* quoted */ wmem_strbuf_append(label_string, label); if (tvb_get_guint8(tvb, item_offset + 5) == '*') { /* continuations */ - int num = (int)strtol(tvb_get_string(wmem_packet_scope(), tvb, item_offset + 6, value_offset - item_offset + 6), NULL, 10); + int num = (int)strtol(tvb_get_string_enc(wmem_packet_scope(), tvb, item_offset + 6, value_offset - item_offset + 6, ENC_ASCII), NULL, 10); proto_tree_add_string_format(tree, hf_imf_siolabel_label, tvb, value_offset, value_length, label, "Label[%d]: \"%s\"", num, label); } else { @@ -616,7 +616,7 @@ dissect_imf_content_type(tvbuff_t *tvb, int offset, int length, proto_item *item proto_tree_add_item(ct_tree, hf_imf_content_type_type, tvb, offset, len, ENC_ASCII|ENC_NA); if(type) { /* This string will be automatically freed */ - (*type) = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + (*type) = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); } end_offset = imf_find_field_end (tvb, first_colon + 1, offset + length, NULL); if (end_offset == -1) { @@ -627,7 +627,7 @@ dissect_imf_content_type(tvbuff_t *tvb, int offset, int length, proto_item *item proto_tree_add_item(ct_tree, hf_imf_content_type_parameters, tvb, first_colon + 1, len, ENC_ASCII|ENC_NA); if(parameters) { /* This string will be automatically freed */ - (*parameters) = tvb_get_string(wmem_packet_scope(), tvb, first_colon + 1, len); + (*parameters) = tvb_get_string_enc(wmem_packet_scope(), tvb, first_colon + 1, len, ENC_ASCII); } } } @@ -719,7 +719,7 @@ dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* XXX: flag an error */ break; } else { - key = tvb_get_string(wmem_packet_scope(), tvb, start_offset, end_offset - start_offset); + key = tvb_get_string_enc(wmem_packet_scope(), tvb, start_offset, end_offset - start_offset, ENC_ASCII); /* convert to lower case */ ascii_strdown_inplace (key); diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index b02ac279fb..c2f35e5a28 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -675,7 +675,7 @@ add_value_head(const gchar *tag_desc, proto_tree *tree, tvbuff_t *tvb, offset += 2; if (name_length != 0) { guint8 *nv; - nv = tvb_get_string(wmem_packet_scope(), tvb, offset, name_length); + nv = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_length, ENC_ASCII); proto_tree_add_text(tree, tvb, offset, name_length, "Name: %s", format_text(nv, name_length)); if (name_val) { diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 38edee2f73..4f18eaa60d 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -3727,11 +3727,11 @@ dissect_id(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v break; case IKE_ID_FQDN: proto_tree_add_item(idtree, hf_isakmp_id_data_fqdn, tvb, offset, length, ENC_ASCII|ENC_NA); - proto_item_append_text(idit, "%s", tvb_get_string(wmem_packet_scope(), tvb, offset,length)); + proto_item_append_text(idit, "%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,length, ENC_ASCII)); break; case IKE_ID_USER_FQDN: proto_tree_add_item(idtree, hf_isakmp_id_data_user_fqdn, tvb, offset, length, ENC_ASCII|ENC_NA); - proto_item_append_text(idit, "%s", tvb_get_string(wmem_packet_scope(), tvb, offset,length)); + proto_item_append_text(idit, "%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,length, ENC_ASCII)); break; case IKE_ID_IPV4_ADDR_SUBNET: proto_tree_add_item(idtree, hf_isakmp_id_data_ipv4_addr, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -4270,7 +4270,7 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs break; case APPLICATION_VERSION: /* 7 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_application_version, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case INTERNAL_IP6_ADDRESS: /* 8 */ offset_end = offset + optlen; @@ -4395,27 +4395,27 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs break; case XAUTH_USER_NAME: /* 16521 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_user_name, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_USER_PASSWORD: /* 16522 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_user_password, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_PASSCODE: /* 16523 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_passcode, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_MESSAGE: /* 16524 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_message, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_CHALLENGE: /* 16525 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_challenge, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_DOMAIN: /* 16526 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_domain, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_STATUS: /* 16527 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_status, tvb, offset, optlen, ENC_BIG_ENDIAN); @@ -4423,20 +4423,20 @@ dissect_config_attribute(tvbuff_t *tvb, proto_tree *cfg_attr_type_tree, int offs break; case XAUTH_NEXT_PIN: /* 16528 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_next_pin, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case XAUTH_ANSWER: /* 16527 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_xauth_answer, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case UNITY_BANNER: /* 28672 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_unity_banner, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; case UNITY_DEF_DOMAIN: /* 28674 */ proto_tree_add_item(sub_cfg_attr_type_tree, hf_isakmp_cfg_attr_unity_def_domain, tvb, offset, optlen, ENC_ASCII|ENC_NA); - proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string(wmem_packet_scope(), tvb, offset,optlen)); + proto_item_append_text(cfg_attr_type_item," : %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset,optlen, ENC_ASCII)); break; /* TODO: Support other UNITY Attributes ! */ default: diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index c6e75e5349..7cb68aaa1d 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -611,7 +611,7 @@ addTextKeys(packet_info *pinfo, proto_tree *tt, tvbuff_t *tvb, gint offset, guin len = len + 1; } - key = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + key = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); if (key == NULL) { break; } diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index 8e26a41393..0b6e43c9c5 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.c @@ -208,7 +208,7 @@ isis_dissect_ip_authentication_clv(tvbuff_t *tvb, proto_tree *tree, int offset, if ( length != 0 ) { proto_tree_add_text ( tree, tvb, offset, length, "IP Authentication: %.*s", length, - tvb_get_string(wmem_packet_scope(), tvb, offset, length) ); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); } } @@ -242,7 +242,7 @@ isis_dissect_hostname_clv(tvbuff_t *tvb, proto_tree *tree, int offset, proto_tree_add_text ( tree, tvb, offset, length, "Hostname: --none--" ); } else { - const char* value = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + const char* value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); proto_tree_add_string_format ( tree, tree_id, tvb, offset, length, value, "Hostname: %.*s", length, value); diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 19fd34d052..30c79fda03 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -444,7 +444,7 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp proto_tree_add_text(edp_tuples_leaf_tree, tvb, offset, tuple_length, "Interface IPX_address = %s", ipx_addr_to_str(tvb_get_ntohl(tvb, offset), - tvb_get_string(wmem_packet_scope(), tvb, offset+4, tuple_length-4))); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, tuple_length-4, ENC_ASCII))); break; case EDP_TUPLE_UNKNOWN: default: diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 25959ac268..ac62d15fc3 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -6958,7 +6958,7 @@ dissect_isup_generic_name_parameter(tvbuff_t *parameter_tvb, proto_tree *paramet proto_tree_add_uint(parameter_tree, hf_isup_generic_name_presentation, parameter_tvb, 1, 1, indicator); proto_tree_add_boolean(parameter_tree, hf_isup_generic_name_availability, parameter_tvb, 1, 1, indicator); proto_tree_add_uint(parameter_tree, hf_isup_generic_name_type, parameter_tvb, 1, 1, indicator); - gen_name = tvb_get_string(wmem_packet_scope(), parameter_tvb, 1, gen_name_length); + gen_name = tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, 1, gen_name_length, ENC_ASCII); gen_name[gen_name_length] = '\0'; proto_tree_add_string(parameter_tree, hf_isup_generic_name_ia5, parameter_tvb, 2, gen_name_length, gen_name); proto_item_set_text(parameter_item, "Generic name: %s", gen_name); diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c index c323753033..ad9f8b3d51 100644 --- a/epan/dissectors/packet-iua.c +++ b/epan/dissectors/packet-iua.c @@ -139,7 +139,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree_add_item(parameter_tree, hf_text_interface_id, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII)); } #define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET @@ -152,7 +152,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII)); } #define DLCI_SAPI_LENGTH 1 diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index dc64e7c86b..71ae0ba28c 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -221,7 +221,7 @@ static void after_member(void *tvbparse_data, const void *wanted_data _U_, tvbpa tvbparse_elem_t *key_tok = tok->sub; if (key_tok && key_tok->id == JSON_TOKEN_STRING) { - char *key = tvb_get_string(wmem_packet_scope(), key_tok->tvb, key_tok->offset, key_tok->len); + char *key = tvb_get_string_enc(wmem_packet_scope(), key_tok->tvb, key_tok->offset, key_tok->len, ENC_ASCII); proto_item_append_text(tree, " Key: %s", key); } diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 0fd5d1a6c1..09a2cfc23a 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -791,7 +791,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree col_set_str(pinfo->cinfo, COL_INFO, "Welcome"); { - gchar *welcomeline = tvb_get_string(wmem_packet_scope(), tvb, offset, first_linelen); + gchar *welcomeline = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, first_linelen, ENC_ASCII); gchar **current_token; guint token_offset = offset; proto_item *jxta_welcome_tree_item = NULL; @@ -1022,7 +1022,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro if (content_type && (sizeof("content-type") - 1) == headername_len) { if (0 == tvb_strncaseeql(tvb, headername_offset, "content-type", sizeof("content-type") - 1)) { - *content_type = tvb_get_string(wmem_packet_scope(), tvb, headervalue_offset, headervalue_len); + *content_type = tvb_get_string_enc(wmem_packet_scope(), tvb, headervalue_offset, headervalue_len, ENC_ASCII); } } @@ -1385,7 +1385,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree for (each_name = 0; each_name < msg_names_count; each_name++) { guint16 name_len = tvb_get_ntohs(tvb, tree_offset); - names_table[2 + each_name] = tvb_get_string(wmem_packet_scope(), tvb, tree_offset + (int)sizeof(name_len), name_len); + names_table[2 + each_name] = tvb_get_string_enc(wmem_packet_scope(), tvb, tree_offset + (int)sizeof(name_len), name_len, ENC_ASCII); proto_tree_add_item(jxta_msg_tree, hf_jxta_message_names_name, tvb, tree_offset, (int)sizeof(name_len), ENC_ASCII|ENC_NA); tree_offset += (int)sizeof(name_len) + name_len; } @@ -1636,7 +1636,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p proto_tree_add_item(jxta_elem_tree, hf_jxta_element_type, tvb, tree_offset, (int)sizeof(guint16), ENC_ASCII|ENC_NA); tree_offset += (int)sizeof(guint16); - mediatype = tvb_get_string(wmem_packet_scope(), tvb, tree_offset, type_len); + mediatype = tvb_get_string_enc(wmem_packet_scope(), tvb, tree_offset, type_len, ENC_ASCII); tree_offset += type_len; } diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 5978d75c3c..57da5d5ff7 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -164,7 +164,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da tokenlen = get_token_len(line, line + linelen, &next_token); if (tokenlen != 0) { guint8 *reqresp; - reqresp = tvb_get_string(wmem_packet_scope(), tvb, offset, tokenlen); + reqresp = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_ASCII); if (is_request) { /* * No request dissection diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index d34d6f9151..5cbf7a2dac 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -291,7 +291,7 @@ static void dissect_getnamebyaddr_response(tvbuff_t* tvb, proto_tree* lwres_tree for(i=0; i<naliases; i++) { aliaslen = tvb_get_ntohs(tvb, offset); - aliasname = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, aliaslen); + aliasname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, aliaslen, ENC_ASCII); alias_item = proto_tree_add_text(nba_resp_tree, tvb, offset, 2 + aliaslen, "Alias %s",aliasname); alias_tree = proto_item_add_subtree(alias_item, ett_adn_alias); @@ -417,7 +417,7 @@ static void dissect_getaddrsbyname_response(tvbuff_t* tvb, proto_tree* lwres_tre for(i=0; i<naliases; i++) { aliaslen = tvb_get_ntohs(tvb, offset); - aliasname = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, aliaslen); + aliasname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, aliaslen, ENC_ASCII); alias_item = proto_tree_add_text(adn_resp_tree, tvb, offset, 2 + aliaslen, "Alias %s",aliasname); alias_tree = proto_item_add_subtree(alias_item, ett_adn_alias); diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index 025a4f2b27..62b030ebf9 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -335,7 +335,7 @@ dissect_m2tp_info_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, if (parameter_tree) { length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); info_string_length = length - PARAMETER_HEADER_LENGTH; - info_string = tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length); + info_string = tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII); proto_tree_add_string(parameter_tree, hf_m2tp_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, info_string); proto_item_set_text(parameter_item, "Info String (%.*s)", info_string_length, info_string); } diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index c869e1db09..95ec7a62a1 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -286,7 +286,7 @@ dissect_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", interface_id_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, ENC_ASCII)); } #define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET @@ -299,7 +299,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII)); } #define DIAGNOSTIC_INFO_OFFSET PARAMETER_VALUE_OFFSET diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 917d3ba4ef..a7637c2ffb 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -410,7 +410,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII)); } #define AFFECTED_MASK_LENGTH 1 diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index 27f12025e6..b58880654c 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -648,7 +648,7 @@ get_payload_length (tvbuff_t *tvb, const int token_number, int offset, return FALSE; } - bytes_val = tvb_get_string (wmem_packet_scope(), tvb, offset, tokenlen); + bytes_val = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_ASCII); if (bytes_val) { if (sscanf (bytes_val, "%u", bytes) == 1) { *content_length_found = TRUE; diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index 82d1e072bc..d1bbc741d3 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1343,7 +1343,7 @@ static gint tvb_parse_param(tvbuff_t* tvb, gint offset, gint len, int** hf) /* set the observedEvents or signalReq used in Voip Calls analysis */ if (buf != NULL) { - *buf = tvb_get_string(wmem_packet_scope(), tvb, tvb_current_offset, (len - tvb_current_offset + offset)); + *buf = tvb_get_string_enc(wmem_packet_scope(), tvb, tvb_current_offset, (len - tvb_current_offset + offset), ENC_ASCII); } } } @@ -1848,7 +1848,7 @@ dissect_mgcp_connectionparams(proto_tree *parent_tree, tvbuff_t *tvb, gint offse /* The P: line */ offset += param_type_len; /* skip the P: */ - tokenline = tvb_get_string(wmem_packet_scope(), tvb, offset, param_val_len); + tokenline = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, param_val_len, ENC_ASCII); /* Split into type=value pairs separated by comma */ tokens = wmem_strsplit(wmem_packet_scope(), tokenline, ",", -1); @@ -1960,7 +1960,7 @@ dissect_mgcp_localconnectionoptions(proto_tree *parent_tree, tvbuff_t *tvb, gint /* The L: line */ offset += param_type_len; /* skip the L: */ - tokenline = tvb_get_string(wmem_packet_scope(), tvb, offset, param_val_len); + tokenline = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, param_val_len, ENC_ASCII); /* Split into type=value pairs separated by comma */ tokens = wmem_strsplit(wmem_packet_scope(), tokenline, ",", -1); diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c index 2cabd662dc..def5217599 100644 --- a/epan/dissectors/packet-mih.c +++ b/epan/dissectors/packet-mih.c @@ -1949,7 +1949,7 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin case VEND_SPECIFIC_TLV : /*Vendor specific tlv*/ - proto_tree_add_text(tlv_tree, tvb, offset, length, "Vendor Specific TLV :%s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + proto_tree_add_text(tlv_tree, tvb, offset, length, "Vendor Specific TLV :%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); break; default :/*did not match type*/ @@ -1957,15 +1957,15 @@ static void dissect_mih_tlv(tvbuff_t *tvb,int offset, proto_tree *tlv_tree, guin /*RESERVED TLVs*/ if(type > 63 && type < 100) - proto_tree_add_text(tlv_tree, tvb, offset, length, "Reserved TLV :%s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + proto_tree_add_text(tlv_tree, tvb, offset, length, "Reserved TLV :%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); /*EXPERIMENTAL TLVs*/ else if(type > 100 && type < 255) - proto_tree_add_text(tlv_tree, tvb, offset, length, "Experimental TLV :%s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + proto_tree_add_text(tlv_tree, tvb, offset, length, "Experimental TLV :%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); /*UNKNOWN TLVs*/ else - proto_tree_add_text(tlv_tree, tvb, offset, length, "UNKNOWN TLV :%s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + proto_tree_add_text(tlv_tree, tvb, offset, length, "UNKNOWN TLV :%s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); } return; } diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c index c946854f22..8062e22fe4 100644 --- a/epan/dissectors/packet-mikey.c +++ b/epan/dissectors/packet-mikey.c @@ -938,7 +938,7 @@ dissect_payload_id(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, pr parent = proto_tree_get_parent(tree); proto_item_append_text(parent, " %s: %s", val_to_str_const(type, id_type_vals, "Unknown"), - tvb_get_string(wmem_packet_scope(), tvb, 4, length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, 4, length, ENC_ASCII)); } return 4 + length; @@ -968,7 +968,7 @@ dissect_payload_idr(mikey_t *mikey _U_, tvbuff_t *tvb, packet_info *pinfo _U_, p parent = proto_tree_get_parent(tree); proto_item_append_text(parent, " %s: %s", val_to_str_const(type, id_type_vals, "Unknown"), - tvb_get_string(wmem_packet_scope(), tvb, 5, length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, 5, length, ENC_ASCII)); } return 5 + length; diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 482acf3fd7..eef33948ae 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -526,7 +526,7 @@ get_encoded_strval(tvbuff_t *tvb, guint offset, const char **strval) *strval = ""; } else { /* \todo Something with "Char-set", skip for now */ - *strval = (char *)tvb_get_string(wmem_packet_scope(), tvb, offset + count + 1, length - 1); + *strval = (char *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset + count + 1, length - 1, ENC_ASCII); } return count + length; } else @@ -1279,8 +1279,8 @@ dissect_mmse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 pdut, proto_tree_add_string_format(mmse_tree, hf_mmse_ffheader, tvb, offset, length + length2, - tvb_get_string(wmem_packet_scope(), tvb, offset, - length + length2), + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, + length + length2, ENC_ASCII), "%s: %s", format_text(strval, strlen(strval)), format_text(strval2, strlen(strval2))); diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c index f0b80e6a38..478546f683 100644 --- a/epan/dissectors/packet-mongo.c +++ b/epan/dissectors/packet-mongo.c @@ -297,7 +297,7 @@ dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre gint doc_len = -1; /* Document length */ e_type = tvb_get_guint8(tvb, offset); - tvb_get_stringz(wmem_packet_scope(), tvb, offset+1, &str_len); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset+1, &str_len, ENC_ASCII); element = proto_tree_add_item(elements_tree, hf_mongo_element_name, tvb, offset+1, str_len-1, ENC_UTF_8|ENC_NA); element_sub_tree = proto_item_add_subtree(element, ett_mongo_element); @@ -351,11 +351,11 @@ dissect_bson_document(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tre break; case BSON_ELEMENT_TYPE_REGEX: /* regex pattern */ - tvb_get_stringz(wmem_packet_scope(), tvb, offset, &str_len); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &str_len, ENC_ASCII); proto_tree_add_item(element_sub_tree, hf_mongo_element_value_regex_pattern, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len; /* regex options */ - tvb_get_stringz(wmem_packet_scope(), tvb, offset, &str_len); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &str_len, ENC_ASCII); proto_tree_add_item(element_sub_tree, hf_mongo_element_value_regex_options, tvb, offset, str_len, ENC_UTF_8|ENC_NA); offset += str_len; break; diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 869d8a7947..7faed73596 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -473,35 +473,35 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sp_end = tvb_find_guint8(tvb, 0, linelen, ' '); if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen)) return -1; - field1 = tvb_get_string(wmem_packet_scope(), tvb, 0, sp_end); + field1 = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, sp_end, ENC_ASCII); sp_start = sp_end + 1; /* length */ sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' '); if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen)) return -1; - field2 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); + field2 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII); sp_start = sp_end + 1; /* method, request ID or event */ sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' '); if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen)) return -1; - field3 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); + field3 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII); sp_start = sp_end + 1; /* request ID or status code */ sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' '); if (sp_end == -1) { - field4 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, linelen - sp_start); + field4 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, linelen - sp_start, ENC_ASCII); line_type = REQUEST_LINE; /* only request line has 4 parameters */ } else { if ((sp_end > tvb_len) || (sp_end > linelen)) return -1; - field4 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); + field4 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII); if (isdigit(field3[0])) /* request ID is number, so it has to be response */ line_type = RESPONSE_LINE; @@ -512,7 +512,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sp_end = linelen; if ((sp_end > tvb_len) || (sp_end > linelen)) return -1; - field5 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); + field5 = tvb_get_string_enc(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start, ENC_ASCII); } /* check pdu size */ @@ -641,10 +641,10 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8|ENC_NA); continue; } - header_name = tvb_get_string(wmem_packet_scope(), tvb, offset, colon_offset - offset); + header_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, colon_offset - offset, ENC_ASCII); ascii_strdown_inplace(header_name); value_offset = tvb_skip_wsp(tvb, colon_offset + 1, offset + linelen - (colon_offset + 1)); - header_value = tvb_get_string(wmem_packet_scope(), tvb, value_offset, offset + linelen - value_offset); + header_value = tvb_get_string_enc(wmem_packet_scope(), tvb, value_offset, offset + linelen - value_offset, ENC_ASCII); /* find out header type */ header_type = UNKNOWN; @@ -979,9 +979,9 @@ get_mrcpv2_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) /* second string is message length */ len_end = tvb_find_guint8(tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start, ' '); if (len_end == -1) - msg_len = tvb_get_string(wmem_packet_scope(), tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start); + msg_len = tvb_get_string_enc(wmem_packet_scope(), tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start, ENC_ASCII); else - msg_len = tvb_get_string(wmem_packet_scope(), tvb, len_start, len_end - len_start); + msg_len = tvb_get_string_enc(wmem_packet_scope(), tvb, len_start, len_end - len_start, ENC_ASCII); num_msg_len = atoi(msg_len); return num_msg_len; @@ -1014,7 +1014,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da slash_offset = tvb_find_guint8(tvb, 0, MRCPV2_MIN_LENGTH, '/'); if (slash_offset != 4) return 0; - version = tvb_get_string(wmem_packet_scope(), tvb, 0, slash_offset); + version = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, slash_offset, ENC_ASCII); if (strcmp(version, "MRCP") != 0) return 0; @@ -1025,7 +1025,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da value_size = dot_offset - slash_offset - 1; if ((value_size != 1) && (value_size != 2)) return 0; - major = tvb_get_string(wmem_packet_scope(), tvb, slash_offset + 1, dot_offset - 1); + major = tvb_get_string_enc(wmem_packet_scope(), tvb, slash_offset + 1, dot_offset - 1, ENC_ASCII); value = atoi(major); if (value != 2) return 0; @@ -1034,12 +1034,12 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da sp_offset = tvb_find_guint8(tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1, ' '); if (sp_offset == -1) { - minor = tvb_get_string(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1); + minor = tvb_get_string_enc(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1, ENC_ASCII); len = MRCPV2_MIN_LENGTH; } else { - minor = tvb_get_string(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - sp_offset - 1); + minor = tvb_get_string_enc(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - sp_offset - 1, ENC_ASCII); len = sp_offset; } value = atoi(minor); diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 05c66862c0..75fa35ca8b 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -440,7 +440,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree offset += 4; /* Protocol name. Must be "MMS"... */ - if (strncmp((char*)tvb_get_string(wmem_packet_scope(), tvb, offset, 3), "MMS", 3) != 0) + if (strncmp((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 3, ENC_ASCII), "MMS", 3) != 0) { return 0; } diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index a970c2b264..882312dcba 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -312,7 +312,7 @@ static int display_application_name(tvbuff_t *tvb, int offset, length = tvb_strnlen( tvb, offset, 255); proto_tree_add_text( tree, tvb, offset, length, "Application: %.*s", - length, tvb_get_string( wmem_packet_scope(), tvb, offset, length)); + length, tvb_get_string_enc( wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); return length; } @@ -375,7 +375,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset, return; proto_tree_add_text( tree, tvb, offset, length + 1, "User name: %.*s", length, - tvb_get_string( wmem_packet_scope(), tvb, offset, length)); + tvb_get_string_enc( wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); offset += length + 2; length = tvb_strnlen( tvb, offset, 255); @@ -383,7 +383,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset, return; proto_tree_add_text( tree, tvb, offset, length + 1, "Application name: %.*s", length, - tvb_get_string( wmem_packet_scope(), tvb, offset, length)); + tvb_get_string_enc( wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); offset += length + 1; length = tvb_strnlen( tvb, offset, 255); @@ -391,7 +391,7 @@ static void dissect_user_info_2(tvbuff_t *tvb, int offset, return; proto_tree_add_text( tree, tvb, offset, length + 1, "Client computer name: %.*s", length, - tvb_get_string( wmem_packet_scope(), tvb, offset, length)); + tvb_get_string_enc( wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); } } @@ -580,7 +580,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset, if ( tree){ ti = proto_tree_add_text(tree, tvb, offset, length + 1, "Host Name: %.*s", length, - tvb_get_string( wmem_packet_scope(), tvb, offset + 18, length)); + tvb_get_string_enc( wmem_packet_scope(), tvb, offset + 18, length, ENC_ASCII)); name_tree = proto_item_add_subtree(ti, ett_msproxy_name); @@ -591,7 +591,7 @@ static void dissect_request_resolve(tvbuff_t *tvb, int offset, offset += 17; proto_tree_add_text( name_tree, tvb, offset, length, "String: %s", - tvb_get_string( wmem_packet_scope(), tvb, offset, length)); + tvb_get_string_enc( wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); } } @@ -811,7 +811,7 @@ static void dissect_auth_1_ack(tvbuff_t *tvb, int offset, /* XXX - always 255? */ proto_tree_add_text( tree, tvb, offset, 255, "NT domain: %.255s", - tvb_get_string( wmem_packet_scope(), tvb, offset, 255)); + tvb_get_string_enc( wmem_packet_scope(), tvb, offset, 255, ENC_ASCII)); } } diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index c1dae370a0..4708091917 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -175,7 +175,7 @@ base64_decode(packet_info *pinfo, tvbuff_t *b64_tvb, char *name) { char *data; tvbuff_t *tvb; - data = tvb_get_string(wmem_packet_scope(), b64_tvb, 0, tvb_length(b64_tvb)); + data = tvb_get_string_enc(wmem_packet_scope(), b64_tvb, 0, tvb_length(b64_tvb), ENC_ASCII); tvb = base64_to_tvb(b64_tvb, data); add_new_data_source(pinfo, tvb, name); @@ -610,7 +610,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary, break; } - hdr_str = tvb_get_string(wmem_packet_scope(), tvb, offset, next_offset - offset); + hdr_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, next_offset - offset, ENC_ASCII); header_str = unfold_and_compact_mime_header(hdr_str, &colon_offset); if (colon_offset <= 0) { diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index e643d34584..a7793fb216 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -732,7 +732,7 @@ getFrameInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *field_tree, int offset, guint16 length_info){ /*Get the data from information field as string*/ - char *information_field = tvb_get_string(wmem_packet_scope(), tvb,offset,length_info); + char *information_field = tvb_get_string_enc(wmem_packet_scope(), tvb,offset,length_info, ENC_ASCII); /*delete unneeded signs out of info field -> for info column: CR (0x0d) and LF (0x0a)*/ information_field = g_strdelimit(information_field, "\r\n", ' '); diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index cb611afce8..548778d90a 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -150,7 +150,7 @@ static int hf_nasdaq_itch_cross = -1; static int order_ref_number(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int offset) { - const char *str_value = tvb_get_string(wmem_packet_scope(), tvb, offset, 9); + const char *str_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 9, ENC_ASCII); guint32 value = (guint32)strtoul(str_value, NULL, 10); proto_tree_add_uint(nasdaq_itch_tree, hf_nasdaq_itch_order_reference, tvb, offset, 9, value); @@ -167,7 +167,7 @@ time_stamp(tvbuff_t *tvb, proto_tree *nasdaq_itch_tree, int id, int offset, int if (nasdaq_itch_tree) { guint32 ms, val; const char *display = ""; - const char *str_value = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + const char *str_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); ms = val = (guint32)strtoul(str_value, NULL, 10); switch (size) { @@ -191,7 +191,7 @@ static int number_of_shares(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int id, int offset, int big) { gint size = (big) ? 10 : 6; - const char *str_value = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + const char *str_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); guint32 value = (guint32)strtoul(str_value, NULL, 10); @@ -207,7 +207,7 @@ price(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int id, i { gint size = (big) ? 19 : 10; - const char *str_value = tvb_get_string(wmem_packet_scope(), tvb, offset, size); + const char *str_value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, size, ENC_ASCII); gdouble value = guint64_to_gdouble(g_ascii_strtoull(str_value, NULL, 10))/((big)?1000000.0:10000.0); proto_tree_add_double(nasdaq_itch_tree, id, tvb, offset, size, value); @@ -220,7 +220,7 @@ price(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int id, i static int stock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *nasdaq_itch_tree, int offset) { - char *stock_p = tvb_get_string(wmem_packet_scope(), tvb, offset, 6); + char *stock_p = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 6, ENC_ASCII); proto_tree_add_item(nasdaq_itch_tree, hf_nasdaq_itch_stock, tvb, offset, 6, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "<%s> ", stock_p); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 2340bb418a..7c682bf999 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -2187,7 +2187,7 @@ dissect_fhandle_data_GLUSTER(tvbuff_t* tvb, packet_info *pinfo _U_, proto_tree * if (fhlen != 36) return; - ident = tvb_get_string(NULL, tvb, offset, 4); + ident = tvb_get_string_enc(NULL, tvb, offset, 4, ENC_ASCII); if (strncmp(":OGL", ident, 4)) return; offset += 4; @@ -2371,7 +2371,7 @@ dissect_fhandle_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree * guint8 *fh_array; proto_item *fh_item = NULL; - fh_array = tvb_get_string(NULL, tvb, offset, fhlen); + fh_array = tvb_get_string_enc(NULL, tvb, offset, fhlen, ENC_ASCII); fhhash = crc32_ccitt(fh_array, fhlen); g_free(fh_array); @@ -8028,7 +8028,7 @@ dissect_nfs4_stateid(tvbuff_t *tvb, int offset, proto_tree *tree, guint16 *hash) newftree = proto_item_add_subtree(fitem, ett_nfs4_stateid); } - sidh_array = tvb_get_string(NULL, tvb, offset, 16); + sidh_array = tvb_get_string_enc(NULL, tvb, offset, 16, ENC_ASCII); sid_hash = crc16_ccitt(sidh_array, 16); g_free(sidh_array); @@ -9233,7 +9233,7 @@ dissect_nfs4_request_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre break; case NFS4_OP_RENEW: - clientid_array = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); + clientid_array = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII); clientid_hash = crc16_ccitt(clientid_array, 8); offset = dissect_rpc_uint64(tvb, newftree, hf_nfs4_clientid, offset); g_string_append_printf (op_summary[ops_counter].optext, " CID: 0x%04x", clientid_hash); diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 76ed643db1..9a4753b0ce 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -870,7 +870,7 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) buff = (gchar *)wmem_alloc(wmem_packet_scope(), NTP_TS_SIZE); if (stratum <= 1) { g_snprintf (buff, NTP_TS_SIZE, "Unidentified reference source '%.4s'", - tvb_get_string(wmem_packet_scope(), tvb, 12, 4)); + tvb_get_string_enc(wmem_packet_scope(), tvb, 12, 4, ENC_ASCII)); for (i = 0; primary_sources[i].id; i++) { if (tvb_memeql(tvb, 12, primary_sources[i].id, 4) == 0) { g_snprintf(buff, NTP_TS_SIZE, "%s", diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index bfeb80b2ed..848f67a03c 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -436,7 +436,7 @@ decode_string_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pro return; } - pbuffer=tvb_get_string(wmem_packet_scope(), tvb, offset+4, length-4); + pbuffer=tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, length-4, ENC_ASCII); proto_tree_add_string(tree, *hfValue, tvb, offset+4, length-4, pbuffer); } diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c index 38e3b9d888..78020566c6 100644 --- a/epan/dissectors/packet-pagp.c +++ b/epan/dissectors/packet-pagp.c @@ -343,12 +343,12 @@ dissect_pagp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (tlv) { case PAGP_TLV_DEVICE_NAME: - ch = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len-4); + ch = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len-4, ENC_ASCII); proto_tree_add_string(tlv_tree, hf_pagp_tlv_device_name, tvb, offset+4, len-4, ch); break; case PAGP_TLV_PORT_NAME: - ch = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len-4); + ch = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len-4, ENC_ASCII); proto_tree_add_string(tlv_tree, hf_pagp_tlv_port_name, tvb, offset+4, len-4, ch); break; diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index 55328c744b..8c73e183c0 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -198,7 +198,7 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; proto_tree_add_item(pflog_tree, hf_pflog_ifname, tvb, offset, 16, ENC_ASCII|ENC_NA); - ifname = tvb_get_string(wmem_packet_scope(), tvb, offset, 16); + ifname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 16, ENC_ASCII); offset += 16; proto_tree_add_item(pflog_tree, hf_pflog_ruleset, tvb, offset, 16, ENC_ASCII|ENC_NA); @@ -437,7 +437,7 @@ dissect_old_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (tree) { proto_tree_add_item(pflog_tree, hf_old_pflog_ifname, tvb, offset, 16, ENC_ASCII|ENC_NA); } - ifname = tvb_get_string(wmem_packet_scope(), tvb, offset, 16); + ifname = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 16, ENC_ASCII); offset +=16; if (tree) { diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index f3072b22b9..ee1d3e7797 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -269,7 +269,7 @@ static void dissect_pgsql_fe_msg(guchar type, guint length, tvbuff_t *tvb, if (i != 0) { n += 1; - s = tvb_get_stringz(wmem_packet_scope(), tvb, n, &siz); + s = tvb_get_stringz_enc(wmem_packet_scope(), tvb, n, &siz, ENC_ASCII); hidden_item = proto_tree_add_string(tree, i, tvb, n, siz, s); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text( @@ -393,11 +393,11 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, /* Parameter status */ case 'S': - s = tvb_get_stringz(wmem_packet_scope(), tvb, n, &siz); + s = tvb_get_stringz_enc(wmem_packet_scope(), tvb, n, &siz, ENC_ASCII); hidden_item = proto_tree_add_string(tree, hf_parameter_name, tvb, n, siz, s); PROTO_ITEM_SET_HIDDEN(hidden_item); n += siz; - t = tvb_get_stringz(wmem_packet_scope(), tvb, n, &i); + t = tvb_get_stringz_enc(wmem_packet_scope(), tvb, n, &i, ENC_ASCII); hidden_item = proto_tree_add_string(tree, hf_parameter_value, tvb, n, i, t); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_text(tree, tvb, n-siz, siz+i, "%s: %s", s, t); @@ -477,7 +477,7 @@ static void dissect_pgsql_be_msg(guchar type, guint length, tvbuff_t *tvb, c = tvb_get_guint8(tvb, n); if (c == '\0') break; - s = tvb_get_stringz(wmem_packet_scope(), tvb, n+1, &siz); + s = tvb_get_stringz_enc(wmem_packet_scope(), tvb, n+1, &siz, ENC_ASCII); i = hf_text; switch (c) { case 'S': i = hf_severity; break; diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index de62122c10..5d97f3ea07 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -870,8 +870,8 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, if (string_data) { char *tmpstr; - tmpstr = (char *) tvb_get_string(wmem_packet_scope(), tvb, data_offset, - string_length_copy); + tmpstr = (char *) tvb_get_string_enc(wmem_packet_scope(), tvb, data_offset, + string_length_copy, ENC_ASCII); string_buffer = (char *)memcpy(wmem_alloc(wmem_packet_scope(), string_length_copy+1), tmpstr, string_length_copy); } else { @@ -1184,7 +1184,7 @@ dissect_pvfs_distribution(tvbuff_t *tvb, proto_tree *tree, int offset) distlen = tvb_get_letohl(tvb, offset); /* Get distribution name */ - tmpstr = (char *) tvb_get_string(wmem_packet_scope(), tvb, offset + 4, distlen); + tmpstr = (char *) tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4, distlen, ENC_ASCII); if (tree) { diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index a085bfb8c9..f5e449c574 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1031,7 +1031,7 @@ dissect_q933_cause_ie(tvbuff_t *tvb, int offset, int len, if (len < 3) return; proto_tree_add_text(tree, tvb, offset, 3, - "Timer: %.3s", tvb_get_string(wmem_packet_scope(), tvb, offset, 3)); + "Timer: %.3s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 3, ENC_ASCII)); break; default: diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index b9a99022c8..38b9212d23 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -107,7 +107,7 @@ dissect_quake2_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo _U_, offset = 4; len = tvb_length_remaining(tvb, offset); - text = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + text = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); proto_tree_add_string(cl_tree, hf_quake2_connectionless_text, tvb, offset, len, text); /*offset += len;*/ @@ -339,7 +339,7 @@ dissect_quake2_client_commands_uinfo(tvbuff_t *tvb, packet_info *pinfo _U_, len = tvb_strsize(tvb, 0); proto_tree_add_text(tree, tvb, 0, len, "Userinfo: %s", - tvb_get_string(wmem_packet_scope(), tvb, 0, len)); + tvb_get_string_enc(wmem_packet_scope(), tvb, 0, len, ENC_ASCII)); return len; } @@ -353,7 +353,7 @@ dissect_quake2_client_commands_stringcmd(tvbuff_t *tvb, packet_info *pinfo _U_, len = tvb_strsize(tvb, 0); proto_tree_add_text(tree, tvb, 0, len, "Command: %s", - tvb_get_string(wmem_packet_scope(), tvb, 0, len)); + tvb_get_string_enc(wmem_packet_scope(), tvb, 0, len, ENC_ASCII)); return len; } diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c index 019b1ad856..8cf275dffd 100644 --- a/epan/dissectors/packet-rdp.c +++ b/epan/dissectors/packet-rdp.c @@ -1002,7 +1002,7 @@ dissect_rdp_clientNetworkData(tvbuff_t *tvb, int offset, packet_info *pinfo, pro for (i = 0; i < MIN(channelCount, MAX_CHANNELS); i++) { if (rdp_info) { rdp_info->channels[i].value = -1; /* unset */ - rdp_info->channels[i].strptr = tvb_get_string(wmem_packet_scope(), tvb, offset, 8); + rdp_info->channels[i].strptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 8, ENC_ASCII); } offset = dissect_rdp_fields(tvb, offset, pinfo, next_tree, def_fields, 0); } diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index e19e446713..89167111a7 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -3828,7 +3828,7 @@ extern gint dissect_reload_messagecontents(tvbuff_t *tvb, packet_info *pinfo, pr if (error_code <= 19) { guint16 info_length = tvb_get_ntohs(tvb,offset+2); if (info_length>0) { - proto_item_append_text(ti_error, " (%s)", tvb_get_string(wmem_packet_scope(), tvb, offset+4, info_length)); + proto_item_append_text(ti_error, " (%s)", tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, info_length, ENC_ASCII)); } } break; diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 8534c01d81..8b16754071 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -642,7 +642,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, } if (string_data) { - string_buffer = tvb_get_string(wmem_packet_scope(), tvb, data_offset, string_length_copy); + string_buffer = tvb_get_string_enc(wmem_packet_scope(), tvb, data_offset, string_length_copy, ENC_ASCII); } else { string_buffer = (char *)tvb_memcpy(tvb, wmem_alloc(wmem_packet_scope(), string_length_copy+1), data_offset, string_length_copy); } diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index c58ce9de5c..7cfbbf3e70 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -499,7 +499,7 @@ dissect_rpcap_findalldevs_if (tvbuff_t *tvb, packet_info *pinfo _U_, offset += 2; if (namelen) { - proto_item_append_text (ti, ": %s", tvb_get_string (wmem_packet_scope(), tvb, offset, namelen)); + proto_item_append_text (ti, ": %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, namelen, ENC_ASCII)); proto_tree_add_item (tree, hf_if_name, tvb, offset, namelen, ENC_ASCII|ENC_NA); offset += namelen; } @@ -666,11 +666,11 @@ dissect_rpcap_auth_request (tvbuff_t *tvb, packet_info *pinfo _U_, } else if (type == RPCAP_RMTAUTH_PWD) { guint8 *username, *password; - username = tvb_get_string (wmem_packet_scope(), tvb, offset, slen1); + username = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, slen1, ENC_ASCII); proto_tree_add_item (tree, hf_auth_username, tvb, offset, slen1, ENC_ASCII|ENC_NA); offset += slen1; - password = tvb_get_string (wmem_packet_scope(), tvb, offset, slen2); + password = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, slen2, ENC_ASCII); proto_tree_add_item (tree, hf_auth_password, tvb, offset, slen2, ENC_ASCII|ENC_NA); offset += slen2; diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index 47429ee6ab..c5436229fe 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.c @@ -237,7 +237,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_STDERR_PORT && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the stderr_port field. * It is optional, so it may only be 1 character long @@ -260,7 +260,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_CLIENT_USERNAME && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the username field */ if(length != 1 && length <= RSH_CLIENT_USERNAME_LEN @@ -288,7 +288,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_SERVER_USERNAME && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the password field */ if(length != 1 && length <= RSH_SERVER_USERNAME_LEN @@ -318,7 +318,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(hash_info->state == WAIT_FOR_COMMAND && tvb_length_remaining(tvb, offset)){ - field_stringz = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &length); + field_stringz = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &length, ENC_ASCII); /* Check if this looks like the command field */ if(length != 1 && length <= RSH_COMMAND_LEN diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index f4cd8a297b..0c4dc26ee3 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -5916,11 +5916,11 @@ dissect_rsvp_call_id(proto_tree *ti, proto_tree *rsvp_object_tree, proto_tree_add_uint_format_value(rsvp_object_tree, hf_rsvp_ctype, tvb, offset+3, 1, c_type, "2 (globally unique)"); proto_tree_add_item(rsvp_object_tree, hf_rsvp_call_id_address_type, tvb, offset2, 1, ENC_NA); - str = tvb_get_string (wmem_packet_scope(), tvb, offset2 + 1, 3); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset2 + 1, 3, ENC_ASCII); proto_tree_add_item(rsvp_object_tree, hf_rsvp_call_id_international_segment, tvb, offset2 + 1, 3, ENC_NA|ENC_ASCII); proto_item_append_text(ti, "Globally-Unique. Addr Type: %s. Intl Segment: %s. ", val_to_str(type, address_type_vals, "Unknown (%u)"), str); - str = tvb_get_string (wmem_packet_scope(), tvb, offset2 + 4, 12); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset2 + 4, 12, ENC_ASCII); proto_tree_add_item(rsvp_object_tree, hf_rsvp_call_id_national_segment, tvb, offset2 + 4, 12, ENC_NA|ENC_ASCII); proto_item_append_text(ti, "Natl Segment: %s. ", str); } diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 0f1f420c7b..dc8773c3e0 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -1303,7 +1303,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree offset++; col_append_fstr(pinfo->cinfo, COL_INFO, " CNAME=\"%s\"", - tvb_get_string(wmem_packet_scope(), tvb, offset, item_len)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, item_len, ENC_ASCII)); offset += item_len; packet_len = packet_len - item_len - 1; @@ -1334,7 +1334,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree offset++; col_append_fstr(pinfo->cinfo, COL_INFO, " DISPLAY-NAME=\"%s\"", - tvb_get_string(wmem_packet_scope(), tvb, offset, item_len)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, item_len, ENC_ASCII)); offset += item_len; packet_len = packet_len - item_len - 1; @@ -1697,7 +1697,7 @@ dissect_rtcp_bye( tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tre offset++; reason_offset = offset; - reason_text = (char*)tvb_get_string(wmem_packet_scope(), tvb, offset, reason_length); + reason_text = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, reason_length, ENC_ASCII); proto_tree_add_string( tree, hf_rtcp_sdes_text, tvb, offset, reason_length, reason_text ); offset += reason_length; } diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index faa899aa8c..19470834cb 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -661,7 +661,7 @@ rtmpt_get_amf_param(tvbuff_t *tvb, gint offset, gint param, const gchar *prop) if (!prop && iObjType == AMF0_STRING && remain >= 3) { iStringLength = tvb_get_ntohs(tvb, offset+1); if (remain >= iStringLength+3) { - return tvb_get_string(wmem_packet_scope(), tvb, offset+3, iStringLength); + return tvb_get_string_enc(wmem_packet_scope(), tvb, offset+3, iStringLength, ENC_ASCII); } } @@ -682,7 +682,7 @@ rtmpt_get_amf_param(tvbuff_t *tvb, gint offset, gint param, const gchar *prop) if (remain < 2+iPropLength+3+iStringLength) break; - return tvb_get_string(wmem_packet_scope(), tvb, offset+2+iPropLength+3, iStringLength); + return tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2+iPropLength+3, iStringLength, ENC_ASCII); } itemlen = rtmpt_get_amf_length(tvb, offset+2+iPropLength); @@ -785,7 +785,7 @@ rtmpt_get_packet_desc(tvbuff_t *tvb, guint32 offset, guint32 remain, rtmpt_conv_ slen = tvb_get_ntohs(tvb, offset+1+soff); } if (slen > 0) { - sFunc = tvb_get_string(wmem_packet_scope(), tvb, offset+3+soff, slen); + sFunc = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+3+soff, slen, ENC_ASCII); RTMPT_DEBUG("got function call '%s'\n", sFunc); if (strcmp(sFunc, "connect") == 0) { @@ -897,7 +897,7 @@ dissect_amf0_property_list(tvbuff_t *tvb, gint offset, proto_tree *tree, guint * tvb_get_guint8(tvb, offset + 2) == AMF0_END_OF_OBJECT) break; count++; - iStringValue = tvb_get_string(wmem_packet_scope(), tvb, offset + 2, iStringLength); + iStringValue = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 2, iStringLength, ENC_ASCII); prop_ti = proto_tree_add_text(tree, tvb, offset, -1, "Property '%s'", iStringValue); diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c index 1522815f78..c0b60ebfb4 100644 --- a/epan/dissectors/packet-rtpproxy.c +++ b/epan/dissectors/packet-rtpproxy.c @@ -312,7 +312,7 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t /* Extract the entire parameters line. */ /* Something like "t4p1iic8,0,2,4,18,96,97,98,100,101" */ - rawstr = tvb_get_string(wmem_packet_scope(), tvb, begin, realsize); + rawstr = tvb_get_string_enc(wmem_packet_scope(), tvb, begin, realsize, ENC_ASCII); while(offset < realsize){ ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_command_parameter, tvb, begin + offset, 1, ENC_NA); @@ -323,13 +323,13 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t case 'c': new_offset = (gint)strspn(rawstr+offset, "0123456789,"); another_tree = proto_item_add_subtree(ti, ett_rtpproxy_command_parameters_codecs); - codecs = g_strsplit(tvb_get_string(wmem_packet_scope(), tvb, begin+offset, new_offset), ",", 0); + codecs = g_strsplit(tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, new_offset, ENC_ASCII), ",", 0); i = 0; while(codecs[i]){ /* We assume strings < 2^32-1 bytes long. :-) */ codec_len = (guint)strlen(codecs[i]); ti = proto_tree_add_uint(another_tree, hf_rtpproxy_command_parameter_codec, tvb, begin+offset, codec_len, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, begin+offset, codec_len), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, codec_len, ENC_ASCII), NULL, 10)); proto_item_append_text(ti, " (%s)", val_to_str_ext((guint)strtoul(tvb_format_text(tvb,begin+offset,codec_len),NULL,10), &rtp_payload_type_vals_ext, "Unknown")); offset += codec_len; if(codecs[i+1]) @@ -341,7 +341,7 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t case 'l': new_offset = (gint)strspn(rawstr+offset, "0123456789."); another_tree = proto_item_add_subtree(ti, ett_rtpproxy_command_parameters_local); - if(str_to_ip((char*)tvb_get_string(wmem_packet_scope(), tvb, begin+offset, new_offset), ipaddr)) + if(str_to_ip((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, new_offset, ENC_ASCII), ipaddr)) proto_tree_add_ipv4(another_tree, hf_rtpproxy_command_parameter_local_ipv4, tvb, begin+offset, new_offset, ipaddr[0]); else proto_tree_add_expert(another_tree, pinfo, &ei_rtpproxy_bad_ipv4, tvb, begin+offset, new_offset); @@ -350,7 +350,7 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t case 'r': new_offset = (gint)strspn(rawstr+offset, "0123456789."); another_tree = proto_item_add_subtree(ti, ett_rtpproxy_command_parameters_remote); - if(str_to_ip((char*)tvb_get_string(wmem_packet_scope(), tvb, begin+offset, new_offset), ipaddr)) + if(str_to_ip((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, new_offset, ENC_ASCII), ipaddr)) proto_tree_add_ipv4(another_tree, hf_rtpproxy_command_parameter_remote_ipv4, tvb, begin+offset, new_offset, ipaddr[0]); else proto_tree_add_expert(another_tree, pinfo, &ei_rtpproxy_bad_ipv4, tvb, begin+offset, new_offset); @@ -360,7 +360,7 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t new_offset = (gint)strspn(rawstr+offset, "0123456789"); another_tree = proto_item_add_subtree(ti, ett_rtpproxy_command_parameters_repacketize); proto_tree_add_uint(another_tree, hf_rtpproxy_command_parameter_repacketize, tvb, begin+offset, new_offset, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, begin+offset, new_offset), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, new_offset, ENC_ASCII), NULL, 10)); offset += new_offset; break; /* Unofficial long parameters */ @@ -368,7 +368,7 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t new_offset = (gint)strspn(rawstr+offset, "0123456789"); another_tree = proto_item_add_subtree(ti, ett_rtpproxy_command_parameters_dtmf); proto_tree_add_uint(another_tree, hf_rtpproxy_command_parameter_dtmf, tvb, begin+offset, new_offset, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, begin+offset, new_offset), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, new_offset, ENC_ASCII), NULL, 10)); if(rtpproxy_establish_conversation){ pt = (guint)strtoul(tvb_format_text(tvb,begin+offset,new_offset),NULL,10); dissector_add_uint("rtp.pt", pt, rtp_events_handle); @@ -389,7 +389,7 @@ rtpproxy_add_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy_t new_offset = (gint)strspn(rawstr+offset, "0123456789"); another_tree = proto_item_add_subtree(ti, ett_rtpproxy_command_parameters_transcode); ti = proto_tree_add_uint(another_tree, hf_rtpproxy_command_parameter_transcode, tvb, begin+offset, new_offset, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, begin+offset, new_offset), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin+offset, new_offset, ENC_ASCII), NULL, 10)); proto_item_append_text(ti, " (%s)", val_to_str_ext((guint)strtoul(tvb_format_text(tvb,begin+offset, new_offset),NULL,10), &rtp_payload_type_vals_ext, "Unknown")); offset += new_offset; break; @@ -465,19 +465,19 @@ rtpproxy_add_notify_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy } /* We have ip:port */ if(ipv6){ - if(str_to_ip6((char*)tvb_get_string(wmem_packet_scope(), tvb, begin, offset - begin), ipaddr)) + if(str_to_ip6((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin, offset - begin, ENC_ASCII), ipaddr)) proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, offset - begin, (const guint8 *)ipaddr); else proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv6, tvb, begin, offset - begin); } else{ - if(str_to_ip((char*)tvb_get_string(wmem_packet_scope(), tvb, begin, offset - begin), ipaddr)) + if(str_to_ip((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin, offset - begin, ENC_ASCII), ipaddr)) proto_tree_add_ipv4(rtpproxy_tree, hf_rtpproxy_notify_ipv4, tvb, begin, offset - begin, ipaddr[0]); else proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv4, tvb, begin, offset - begin); } proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_notify_port, tvb, offset+1, end - (offset+1), - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset+1, end - (offset+1)), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, end - (offset+1), ENC_ASCII), NULL, 10)); } else{ /* Only port is supplied - take IPv4/IPv6 from ip.src/ipv6.src respectively */ @@ -488,7 +488,7 @@ rtpproxy_add_notify_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy ti = proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, 0, (const guint8 *)(pinfo->src.data)); PROTO_ITEM_SET_GENERATED(ti); proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_notify_port, tvb, begin, end - begin, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, begin, end - begin), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin, end - begin, ENC_ASCII), NULL, 10)); } } @@ -532,7 +532,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data rtpproxy_tree = proto_item_add_subtree(ti, ett_rtpproxy); proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_cookie, tvb, 0, offset, ENC_ASCII | ENC_NA); - cookie = tvb_get_string(wmem_packet_scope(), tvb, 0, offset); + cookie = tvb_get_string_enc(wmem_packet_scope(), tvb, 0, offset, ENC_ASCII); /* Skip whitespace */ offset = tvb_skip_wsp(tvb, offset+1, -1); @@ -562,7 +562,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data } /* Get payload string */ - rawstr = tvb_get_string(wmem_packet_scope(), tvb, offset, realsize - offset); + rawstr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, realsize - offset, ENC_ASCII); /* Extract command */ tmp = g_ascii_tolower(tvb_get_guint8(tvb, offset)); @@ -609,7 +609,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Skip whitespace */ new_offset = tvb_skip_wsp(tvb, offset + ((guint)strlen("VF") + 1), -1); ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_version_request, tvb, new_offset, (gint)strlen("YYYYMMDD"), ENC_ASCII | ENC_NA); - tmpstr = tvb_get_string(wmem_packet_scope(), tvb, new_offset, (gint)strlen("YYYYMMDD")); + tmpstr = tvb_get_string_enc(wmem_packet_scope(), tvb, new_offset, (gint)strlen("YYYYMMDD"), ENC_ASCII); proto_item_append_text(ti, " (%s)", str_to_str(tmpstr, versiontypenames, "Unknown")); break; } @@ -647,7 +647,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data new_offset = tvb_find_guint8(tvb, offset, -1, ' '); proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_callid, tvb, offset, new_offset - offset, ENC_ASCII | ENC_NA); if(rtpproxy_info && !rtpproxy_info->callid) - rtpproxy_info->callid = tvb_get_string(wmem_file_scope(), tvb, offset, new_offset - offset); + rtpproxy_info->callid = tvb_get_string_enc(wmem_file_scope(), tvb, offset, new_offset - offset, ENC_ASCII); /* Skip whitespace */ offset = tvb_skip_wsp(tvb, new_offset+1, -1); @@ -656,13 +656,13 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Extract IP */ new_offset = tvb_find_guint8(tvb, offset, -1, ' '); if (tvb_find_guint8(tvb, offset, new_offset - offset, ':') == -1){ - if(str_to_ip((char*)tvb_get_string(wmem_packet_scope(), tvb, offset, new_offset - offset), ipaddr)) + if(str_to_ip((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, new_offset - offset, ENC_ASCII), ipaddr)) proto_tree_add_ipv4(rtpproxy_tree, hf_rtpproxy_ipv4, tvb, offset, new_offset - offset, ipaddr[0]); else proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv4, tvb, offset, new_offset - offset); } else{ - if(str_to_ip6((char*)tvb_get_string(wmem_packet_scope(), tvb, offset, new_offset - offset), ipaddr)) + if(str_to_ip6((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, new_offset - offset, ENC_ASCII), ipaddr)) proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_ipv6, tvb, offset, new_offset - offset, (const guint8 *)ipaddr); else proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv6, tvb, offset, new_offset - offset); @@ -673,7 +673,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Extract Port */ new_offset = tvb_find_guint8(tvb, offset, -1, ' '); proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_port, tvb, offset, new_offset - offset, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset, new_offset - offset), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, new_offset - offset, ENC_ASCII), NULL, 10)); /* Skip whitespace */ offset = tvb_skip_wsp(tvb, new_offset+1, -1); } @@ -697,7 +697,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Extract codec */ new_offset = tvb_find_guint8(tvb, offset, -1, ' '); proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_playback_codec, tvb, offset, new_offset - offset, - (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset, new_offset - offset), NULL, 10)); + (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, new_offset - offset, ENC_ASCII), NULL, 10)); /* Skip whitespace */ offset = tvb_skip_wsp(tvb, new_offset+1, -1); } @@ -766,7 +766,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (tmp == 'e'){ tmp = tvb_find_line_end(tvb, offset, -1, &new_offset, FALSE); - tmpstr = tvb_get_string(wmem_packet_scope(), tvb, offset, tmp); + tmpstr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tmp, ENC_ASCII); ti = proto_tree_add_item(rtpproxy_tree, hf_rtpproxy_error, tvb, offset, (gint)strlen(tmpstr), ENC_ASCII | ENC_NA); proto_item_append_text(ti, " (%s)", str_to_str(tmpstr, errortypenames, "Unknown")); break; @@ -794,7 +794,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Extract Port */ new_offset = tvb_find_guint8(tvb, offset, -1, ' '); /* Convert port to unsigned 16-bit number */ - port = (guint16) g_ascii_strtoull((gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset, new_offset - offset), NULL, 10); + port = (guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, new_offset - offset, ENC_ASCII), NULL, 10); proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_port, tvb, offset, new_offset - offset, port); /* Skip whitespace */ offset = tvb_skip_wsp(tvb, new_offset+1, -1); @@ -816,7 +816,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data } if (tvb_find_guint8(tvb, offset, -1, ':') == -1){ - if (str_to_ip((char*)tvb_get_string(wmem_packet_scope(), tvb, offset, tmp), ipaddr)){ + if (str_to_ip((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tmp, ENC_ASCII), ipaddr)){ addr.type = AT_IPv4; addr.len = 4; addr.data = wmem_memdup(wmem_packet_scope(), ipaddr, 4); @@ -826,7 +826,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv4, tvb, offset, tmp); } else{ - if (str_to_ip6((char*)tvb_get_string(wmem_packet_scope(), tvb, offset, tmp), ipaddr)){ + if (str_to_ip6((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tmp, ENC_ASCII), ipaddr)){ addr.type = AT_IPv6; addr.len = 16; addr.data = wmem_memdup(wmem_packet_scope(), ipaddr, 16); diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 429880bd11..c2dbfa7645 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -1481,7 +1481,7 @@ gint rtps_util_add_string(proto_tree *tree, tvbuff_t* tvb, gint offset, guint32 size = NEXT_guint32(tvb, offset, little_endian); if (size > 0) { - retVal = tvb_get_string(wmem_packet_scope(), tvb, offset+4, size); + retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII); } proto_tree_add_string(tree, hf_item, tvb, offset, size+4, @@ -1583,7 +1583,7 @@ gint rtps_util_add_seq_string(proto_tree *tree, tvbuff_t* tvb, gint offset, size = NEXT_guint32(tvb, offset, little_endian); if (size > 0) { - retVal = tvb_get_string(wmem_packet_scope(), tvb, offset+4, size); + retVal = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, size, ENC_ASCII); } else { retVal = (const guint8 *)""; } @@ -1786,7 +1786,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset /* Get structure name length */ struct_name_len = NEXT_guint32(tvb, offset, little_endian); offset += 4; - struct_name = tvb_get_string(wmem_packet_scope(), tvb, offset, struct_name_len); + struct_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, struct_name_len, ENC_ASCII); offset += struct_name_len; /* - - - - - - - Default index - - - - - - - */ @@ -1808,7 +1808,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset /* Enums has also a name that we should print */ LONG_ALIGN(offset); discriminator_enum_name_length = NEXT_guint32(tvb, offset, little_endian); - discriminator_enum_name = tvb_get_string(wmem_packet_scope(), tvb, offset+4, discriminator_enum_name_length); + discriminator_enum_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, discriminator_enum_name_length, ENC_ASCII); } offset = disc_offset_begin + disc_size; #if 0 @@ -1867,7 +1867,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset offset += 4; /* Name */ - member_name = tvb_get_string(wmem_packet_scope(), tvb, offset, member_name_len); + member_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, member_name_len, ENC_ASCII); offset += member_name_len; /* is Pointer ? */ @@ -1965,7 +1965,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset offset += 4; /* struct name */ - struct_name = tvb_get_string(wmem_packet_scope(), tvb, offset, struct_name_len); + struct_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, struct_name_len, ENC_ASCII); offset += struct_name_len; @@ -2009,7 +2009,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset offset += 4; /* Name */ - member_name = tvb_get_string(wmem_packet_scope(), tvb, offset, member_name_len); + member_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, member_name_len, ENC_ASCII); offset += member_name_len; if (tk_id == RTI_CDR_TK_ENUM) { @@ -2132,7 +2132,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset LONG_ALIGN(offset); alias_name_length = NEXT_guint32(tvb, offset, little_endian); offset += 4; - alias_name = tvb_get_string(wmem_packet_scope(), tvb, offset, alias_name_length); + alias_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, alias_name_length, ENC_ASCII); offset += alias_name_length; g_strlcpy(type_name, alias_name, 40); break; @@ -2161,7 +2161,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t * tvb, gint offset offset += 4; /* value name */ - value_name = tvb_get_string(wmem_packet_scope(), tvb, offset, value_name_len); + value_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_name_len, ENC_ASCII); offset += value_name_len; g_snprintf(type_name, 40, "valuetype %s", value_name); @@ -3171,7 +3171,7 @@ static gboolean dissect_parameter_sequence_v1(proto_tree *rtps_parameter_tree, p prev_offset = temp_offset; prop_size = NEXT_guint32(tvb, temp_offset, little_endian); if (prop_size > 0) { - propName = tvb_get_string(wmem_packet_scope(), tvb, temp_offset+4, prop_size); + propName = tvb_get_string_enc(wmem_packet_scope(), tvb, temp_offset+4, prop_size, ENC_ASCII); } else { propName = (const guint8 *)""; } @@ -3180,7 +3180,7 @@ static gboolean dissect_parameter_sequence_v1(proto_tree *rtps_parameter_tree, p prop_size = NEXT_guint32(tvb, temp_offset, little_endian); if (prop_size > 0) { - propValue = tvb_get_string(wmem_packet_scope(), tvb, temp_offset+4, prop_size); + propValue = tvb_get_string_enc(wmem_packet_scope(), tvb, temp_offset+4, prop_size, ENC_ASCII); } else { propValue = (const guint8 *)""; } diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 06f3c27c8c..f177115d91 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -1062,7 +1062,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, } media_type_str_lower_case = ascii_strdown_inplace( - (gchar *)tvb_get_string(wmem_packet_scope(), tvb, offset, value_len)); + (gchar *)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_len, ENC_ASCII)); } else if (HDR_MATCHES(rtsp_content_length)) { @@ -1101,8 +1101,8 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, e164_info.e164_number_type = CALLING_PARTY_NUMBER; e164_info.nature_of_address = 0; - e164_info.E164_number_str = tvb_get_string(wmem_packet_scope(), tvb, value_offset, - value_len); + e164_info.E164_number_str = tvb_get_string_enc(wmem_packet_scope(), tvb, value_offset, + value_len, ENC_ASCII); e164_info.E164_number_length = value_len; dissect_e164_number(tvb, sub_tree, value_offset, value_len, e164_info); diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index b8e7153c6c..7d791b0c88 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -264,7 +264,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pt_len = pt_string_len + 1; } - pt_str = tvb_get_string(wmem_packet_scope(), tvb, offset, pt_string_len); + pt_str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, pt_string_len, ENC_ASCII); proto_tree_add_string_format_value(sap_tree, hf_sap_payload_type, tvb, offset, pt_len, pt_str, "%.*s", pt_string_len, pt_str); offset += pt_len; diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index f3f68e4811..6ffa97f0c3 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -795,8 +795,8 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb , 19, - sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb , 19, + sbus_quint8_helper0, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ": (File: %s)", tmp_string); } @@ -812,8 +812,8 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb , 15, - sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb , 15, + sbus_quint8_helper0, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ": (File: %s)", tmp_string); } @@ -1261,7 +1261,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb , 19, sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb , 19, sbus_quint8_helper0, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_rdwr_file_name, tvb, offset, sbus_quint8_helper0, tmp_string); @@ -1326,7 +1326,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 19, sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb, 19, sbus_quint8_helper0, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_rdwr_file_name, tvb, offset, sbus_quint8_helper0, tmp_string); @@ -1368,7 +1368,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 14, sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb, 14, sbus_quint8_helper0, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_rdwr_file_name, tvb, offset, sbus_quint8_helper0, tmp_string); @@ -1412,7 +1412,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 22, sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb, 22, sbus_quint8_helper0, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_rdwr_file_name, tvb, offset, sbus_quint8_helper0, tmp_string); @@ -1451,7 +1451,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } sbus_quint8_helper0 += 1; } - tmp_string = tvb_get_string(wmem_packet_scope(), tvb, 14, sbus_quint8_helper0); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb, 14, sbus_quint8_helper0, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_rdwr_file_name, tvb, offset, sbus_quint8_helper0, tmp_string); @@ -1610,12 +1610,12 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ /* Response: Firmware version */ case SBUS_RD_PROGRAM_VERSION: /*PCD type*/ - tmp_string = tvb_get_string(wmem_packet_scope(), tvb , offset, 5); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb , offset, 5, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_cpu_type, tvb, offset, 5, tmp_string); offset += 5; /*FW version*/ - tmp_string = tvb_get_string(wmem_packet_scope(), tvb , offset, 3); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), tvb , offset, 3, ENC_ASCII); proto_tree_add_string(sbus_tree, hf_sbus_fw_version, tvb, offset, 3, tmp_string); offset += 4; diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 95046afaf1..ed04b741c2 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -1348,7 +1348,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, hostname_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII|ENC_NA); - proto_item_append_text(parameter_item, " (Hostname: %.*s)", hostname_length, tvb_get_string(wmem_packet_scope(), parameter_tvb, HOSTNAME_OFFSET, hostname_length)); + proto_item_append_text(parameter_item, " (Hostname: %.*s)", hostname_length, tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII)); } diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 16414e0172..a62eb19166 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -1110,7 +1110,7 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, gint offset #if 0 proto_tree_add_text(tree, tvb, offset, tokenlen, "Debug; Analysed string: '%s'", - tvb_get_string(wmem_packet_scope(), tvb, offset, tokenlen)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_ASCII)); #endif /* Look for an '=' within this value - this may indicate that there is a @@ -1333,7 +1333,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_field, tvb, offset, tokenlen, ENC_UTF_8|ENC_NA); - /*??field_name = tvb_get_string(wmem_packet_scope(), tvb, offset, tokenlen);*/ + /*??field_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_ASCII);*/ sdp_media_attrbute_code = find_sdp_media_attribute_names(tvb, offset, tokenlen); /* Skip colon */ @@ -1454,7 +1454,7 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, packet_info *pinfo, proto transport_info->encoding_name[media_format]); #if 0 /* XXX: ?? */ - payload_type = tvb_get_string(wmem_packet_scope(), tvb, offset, tokenlen); + payload_type = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_ASCII); #endif /* Move offset past the payload type */ offset = next_offset + 1; @@ -2406,8 +2406,8 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tokenoffset = 2; if (hf == hf_unknown) tokenoffset = 0; - string = (char*)tvb_get_string(wmem_packet_scope(), tvb, offset + tokenoffset, - linelen - tokenoffset); + string = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset + tokenoffset, + linelen - tokenoffset, ENC_ASCII); sub_ti = proto_tree_add_string(sdp_tree, hf, tvb, offset, linelen, string); diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 6158e14ef5..5512034b9e 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -1757,7 +1757,7 @@ dissect_fastser_readresp_frame(tvbuff_t *tvb, proto_tree *fastser_tree, packet_i case FAST_SER_TAGTYPE_CHAR8: case FAST_SER_TAGTYPE_CHAR16: - item_val_str_ptr = tvb_get_string(wmem_packet_scope(), payload_tvb, payload_offset, data_size); + item_val_str_ptr = tvb_get_string_enc(wmem_packet_scope(), payload_tvb, payload_offset, data_size, ENC_ASCII); proto_tree_add_text(fastser_tag_tree, payload_tvb, payload_offset, data_size, "Value: %s", item_val_str_ptr); payload_offset += data_size; break; @@ -2158,8 +2158,8 @@ dissect_fastser_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o case FAST_SER_DEVDESC_RESP: /* 0xB0 (resp to 0x30) - Device Description Response */ /* Add FID / RID ASCII data to tree */ - fid_str_ptr = tvb_get_string(wmem_packet_scope(), tvb, offset, 50); - rid_str_ptr = tvb_get_string(wmem_packet_scope(), tvb, offset+50, 40); + fid_str_ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 50, ENC_ASCII); + rid_str_ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+50, 40, ENC_ASCII); proto_tree_add_text(fastser_tree, tvb, offset, 50, "FID: %s", fid_str_ptr); proto_tree_add_text(fastser_tree, tvb, offset+50, 40, "RID: %s", rid_str_ptr); offset += 90; @@ -2190,7 +2190,7 @@ dissect_fastser_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o fastser_datareg_tree = proto_item_add_subtree(fastser_datareg_item, ett_selfm_fastser_datareg); /* 10-Byte Region description */ - region_name_ptr = tvb_get_string(wmem_packet_scope(), tvb, offset, 10); + region_name_ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 10, ENC_ASCII); proto_tree_add_text(fastser_datareg_tree, tvb, offset, 10, "Data Region Name: %s", region_name_ptr); offset += 10; @@ -2238,7 +2238,7 @@ dissect_fastser_frame(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, int o while ((tvb_reported_length_remaining(tvb, offset)) > 2) { /* Data Item record name 10 bytes */ - tag_name_ptr = tvb_get_string(wmem_packet_scope(), tvb, offset, 10); + tag_name_ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 10, ENC_ASCII); fastser_tag_item = proto_tree_add_text(fastser_tree, tvb, offset, 14, "Data Item Record Name: %s", tag_name_ptr); fastser_tag_tree = proto_item_add_subtree(fastser_tag_item, ett_selfm_fastser_tag); diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index ae516d3c6f..84a706b40c 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -333,7 +333,7 @@ de_sgsap_mme_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, len - 1); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, len - 1, ENC_ASCII); for (;;) { if (name_len >= len - 1) break; @@ -342,7 +342,7 @@ de_sgsap_mme_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint fqdn[tmp] = '.'; } } else{ - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); } proto_tree_add_string(tree, hf_sgsap_mme_name, tvb, offset, len, fqdn); if (add_string) @@ -533,7 +533,7 @@ de_sgsap_vlr_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint name_len = tvb_get_guint8(tvb, offset); if (name_len < 0x20) { - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, len - 1); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, len - 1, ENC_ASCII); for (;;) { if (name_len >= len - 1) break; @@ -542,7 +542,7 @@ de_sgsap_vlr_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint fqdn[tmp] = '.'; } } else{ - fqdn = tvb_get_string(wmem_packet_scope(), tvb, offset, len); + fqdn = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); } proto_tree_add_string(tree, hf_sgsap_vlr_name, tvb, offset, len, fqdn); if (add_string) diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index 220acd0f2b..d4b28f9253 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.c @@ -73,7 +73,7 @@ static void dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* For now, add all lines as unparsed strings */ /* Extract & add the string. */ - string = (char*)tvb_get_string(wmem_packet_scope(), tvb, offset, linelen); + string = (char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII); proto_tree_add_string_format(sipfrag_tree, hf_sipfrag_line, tvb, offset, linelen, string, diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 8e3286b5d6..0f37fb1fec 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -970,7 +970,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); proto_tree_add_string_format_value(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "%s (Char: %s)", connection_type(str), format_text(str, len)); @@ -990,7 +990,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); proto_tree_add_string_format_value(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "%s (Char: %s)", connection_type(str), format_text(str, len)); @@ -2347,7 +2347,7 @@ static int dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+4, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, len, ENC_ASCII); proto_tree_add_string_format_value(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "%s (Char: %s)", connection_type(str), format_text(str, len)); diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 2d5b1162ce..474a03861a 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -697,7 +697,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr offset += 1; /* name of computer to which to send reply */ - computer_name = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &namelen); + computer_name = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &namelen, ENC_ASCII); proto_tree_add_string(tree, hf_response_computer_name, tvb, offset, namelen, computer_name); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", computer_name); diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c index 4353fe83b2..4dc0368ef4 100644 --- a/epan/dissectors/packet-smb-common.c +++ b/epan/dissectors/packet-smb-common.c @@ -63,7 +63,7 @@ int display_ms_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, /* display a string from the tree and return the new offset */ - str = tvb_get_stringz(wmem_packet_scope(), tvb, offset, &len); + str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &len, ENC_ASCII); proto_tree_add_string(tree, hf_index, tvb, offset, len, str); /* Return a copy of the string if requested */ diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index cf70014f40..aabb34fc45 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -790,7 +790,7 @@ netshareenum_share_entry(tvbuff_t *tvb, proto_tree *tree, int offset) { if (tree) { return proto_tree_add_text(tree, tvb, offset, -1, - "Share %.13s", tvb_get_string(wmem_packet_scope(), tvb, offset, 13)); + "Share %.13s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 13, ENC_ASCII)); } else return NULL; } @@ -990,7 +990,7 @@ netserverenum2_server_entry(tvbuff_t *tvb, proto_tree *tree, int offset) { if (tree) { return proto_tree_add_text(tree, tvb, offset, -1, - "Server %.16s", tvb_get_string(wmem_packet_scope(), tvb, offset, 16)); + "Server %.16s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 16, ENC_ASCII)); } else return NULL; } diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 92924204ba..18169cfa22 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -7767,7 +7767,7 @@ dissect_tree_connect_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* XXX - what if this runs past bc? */ an_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(an_len); - an = tvb_get_string(wmem_packet_scope(), tvb, offset, an_len); + an = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, an_len, ENC_ASCII); proto_tree_add_string(tree, hf_smb_service, tvb, offset, an_len, an); COUNT_BYTES(an_len); @@ -7886,7 +7886,7 @@ dissect_tree_connect_andx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* XXX - what if this runs past bc? */ an_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(an_len); - an = tvb_get_string(wmem_packet_scope(), tvb, offset, an_len); + an = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, an_len, ENC_ASCII); proto_tree_add_string(tree, hf_smb_service, tvb, offset, an_len, an); COUNT_BYTES(an_len); @@ -12033,7 +12033,7 @@ dissect_4_2_16_2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, /* EA name */ - name = tvb_get_string(wmem_packet_scope(), tvb, offset, name_len); + name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, name_len, ENC_ASCII); proto_item_append_text(item, ": %s", format_text(name, strlen(name))); CHECK_BYTE_COUNT_SUBR(name_len + 1); diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 19df18c242..5ae1054583 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1249,7 +1249,7 @@ smpp_handle_string_return(proto_tree *tree, tvbuff_t *tvb, int field, int *offse len = tvb_strsize(tvb, *offset); if (len > 1) { - str = (char *)tvb_get_stringz(wmem_packet_scope(), tvb, *offset, &len); + str = (char *)tvb_get_stringz_enc(wmem_packet_scope(), tvb, *offset, &len, ENC_ASCII); proto_tree_add_string(tree, field, tvb, *offset, len, str); } else { str = ""; @@ -1311,7 +1311,7 @@ smpp_handle_time(proto_tree *tree, tvbuff_t *tvb, gint len; nstime_t tmptime; - strval = (char *) tvb_get_stringz(wmem_packet_scope(), tvb, *offset, &len); + strval = (char *) tvb_get_stringz_enc(wmem_packet_scope(), tvb, *offset, &len, ENC_ASCII); if (*strval) { if (len >= 16) diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index e3b9a00e0a..8a3d6ef63a 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -317,7 +317,7 @@ decode_plain_auth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint length_pass; guint8 *decrypt = NULL; - decrypt = tvb_get_string(wmem_packet_scope(), tvb, a_offset, a_linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, a_offset, a_linelen, ENC_ASCII); if (stmp_decryption_enabled) { returncode = (gint)ws_base64_decode_inplace(decrypt); if (returncode) { @@ -576,7 +576,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((session_state->auth_state != SMTP_AUTH_STATE_NONE) && (pinfo->fd->num >= session_state->first_auth_frame) && ((session_state->last_auth_frame == 0) || (pinfo->fd->num <= session_state->last_auth_frame))) { - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); if ((stmp_decryption_enabled) && (ws_base64_decode_inplace(decrypt) > 0)) { line = decrypt; } else { @@ -833,11 +833,11 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (session_state->username_frame == pinfo->fd->num) { if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); if (stmp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); } } } @@ -847,11 +847,11 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (session_state->password_frame == pinfo->fd->num) { if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); if (stmp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); } } } @@ -859,17 +859,17 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) loffset, linelen, decrypt); col_append_fstr(pinfo->cinfo, COL_INFO, "Pass: %s", decrypt); } else if (session_state->ntlm_rsp_frame == pinfo->fd->num) { - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); if (stmp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); col_append_str(pinfo->cinfo, COL_INFO, decrypt); proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb, loffset, linelen, ENC_ASCII|ENC_NA); } else { - base64_string = tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen); + base64_string = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII); dissect_ntlm_auth(tvb, pinfo, smtp_tree, base64_string); } } @@ -903,53 +903,53 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (decrypt == NULL) { /* This line wasn't already decrypted through the state machine */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 11, linelen - 11); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 11, linelen - 11, ENC_ASCII); if (stmp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 11, linelen - 11); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 11, linelen - 11, ENC_ASCII); } } } proto_tree_add_string(cmdresp_tree, hf_smtp_username, tvb, loffset + 11, linelen - 11, decrypt); - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 11)); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, 11, ENC_ASCII)); col_append_fstr(pinfo->cinfo, COL_INFO, "User: %s", decrypt); } else if ((linelen > 5) && (session_state->ntlm_req_frame == pinfo->fd->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 10, linelen - 10); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 10, linelen - 10, ENC_ASCII); if (stmp_decryption_enabled) { if (ws_base64_decode_inplace(decrypt) == 0) { /* Go back to the original string */ - decrypt = tvb_get_string(wmem_packet_scope(), tvb, loffset + 10, linelen - 10); - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 10)); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 10, linelen - 10, ENC_ASCII); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, 10, ENC_ASCII)); col_append_str(pinfo->cinfo, COL_INFO, decrypt); } else { - base64_string = tvb_get_string(wmem_packet_scope(), tvb, loffset + 10, linelen - 10); - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 10)); + base64_string = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 10, linelen - 10, ENC_ASCII); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, 10, ENC_ASCII)); dissect_ntlm_auth(tvb, pinfo, cmdresp_tree, base64_string); } } else { - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 10)); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, 10, ENC_ASCII)); col_append_str(pinfo->cinfo, COL_INFO, decrypt); } } else if ((linelen > 5) && (session_state->user_pass_cmd_frame == pinfo->fd->num) ) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, 11)); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, 11, ENC_ASCII)); decode_plain_auth(tvb, pinfo, cmdresp_tree, loffset + 11, linelen - 11); } else if (linelen > 5) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen)); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII)); } else { - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, loffset, linelen)); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII)); } if (smtp_data_desegment && !spd_frame_data->more_frags) { @@ -1094,10 +1094,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) decrypt = NULL; if (linelen >= 4) { if ((stmp_decryption_enabled) && (code == 334)) { - decrypt = tvb_get_string(wmem_packet_scope(), tvb, offset + 4, linelen - 4); + decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4, linelen - 4, ENC_ASCII); if (ws_base64_decode_inplace(decrypt) > 0) { if (g_ascii_strncasecmp(decrypt, "NTLMSSP", 7) == 0) { - base64_string = tvb_get_string(wmem_packet_scope(), tvb, loffset + 4, linelen - 4); + base64_string = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset + 4, linelen - 4, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, "%d ", code); proto_tree_add_string(cmdresp_tree, hf_smtp_rsp_parameter, tvb, offset + 4, linelen - 4, (const char*)base64_string); @@ -1119,10 +1119,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset + 4, linelen - 4, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "%d %s", code, - tvb_get_string(wmem_packet_scope(), tvb, offset + 4, linelen - 4)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4, linelen - 4, ENC_ASCII)); } } else { - col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string(wmem_packet_scope(), tvb, offset, linelen)); + col_append_str(pinfo->cinfo, COL_INFO, tvb_get_string_enc(wmem_packet_scope(), tvb, offset, linelen, ENC_ASCII)); } } } diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 23d711ee43..e692558604 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -267,7 +267,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { gchar* str; len = tvb_get_guint8(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len, ENC_ASCII); proto_tree_add_string(tree, hf_socks_remote_name, tvb, offset, len+1, str); offset += (len+1); } @@ -568,12 +568,12 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, case USER_NAME_AUTHENTICATION: /* process user name */ len = tvb_get_guint8(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len, ENC_ASCII); proto_tree_add_string(tree, hf_socks_username, tvb, offset, len+1, str); offset += (len+1); len = tvb_get_guint8(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len, ENC_ASCII); proto_tree_add_string(tree, hf_socks_password, tvb, offset, len+1, str); /* offset += (len+1); */ break; diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index dd0033a67d..04337dd437 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -234,7 +234,7 @@ dissect_soupbintcp_common( /* If first dissection of Login Accept, save sequence number */ if (pkt_type == 'A' && !PINFO_FD_VISITED(pinfo)) { - tmp_buf = tvb_get_string(wmem_packet_scope(), tvb, 13, 20); + tmp_buf = tvb_get_string_enc(wmem_packet_scope(), tvb, 13, 20, ENC_ASCII); next_seq = atoi(tmp_buf); /* Create new conversation for this session */ @@ -328,7 +328,7 @@ dissect_soupbintcp_common( tvb, offset, 10, ENC_ASCII|ENC_NA); offset += 10; - tmp_buf = tvb_get_string(wmem_packet_scope(), tvb, offset, 20); + tmp_buf = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 20, ENC_ASCII); proto_tree_add_string_format_value(soupbintcp_tree, hf_soupbintcp_next_seq_num, tvb, offset, 20, @@ -373,7 +373,7 @@ dissect_soupbintcp_common( tvb, offset, 10, ENC_ASCII|ENC_NA); offset += 10; - tmp_buf = tvb_get_string(wmem_packet_scope(), tvb, offset, 20); + tmp_buf = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 20, ENC_ASCII); proto_tree_add_string_format_value(soupbintcp_tree, hf_soupbintcp_req_seq_num, tvb, offset, 20, diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 7a5d20caff..d3d73697b2 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -446,7 +446,7 @@ add_v1_string(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length, static const guint8* unicode_to_bytes(tvbuff_t *tvb, int offset, int length, gboolean endianness) { - const guint8 *ascii_text = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + const guint8 *ascii_text = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); int i, j=0; guint8 c_char, c_char1; guint8 *byte_array; @@ -629,7 +629,7 @@ attr_list(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length, break; case CHARSET_UTF_8: - type_len = (int)strcspn(tvb_get_string(wmem_packet_scope(), tvb, offset, length), "="); + type_len = (int)strcspn(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII), "="); attr_type = unicode_to_bytes(tvb, offset+1, type_len-1, FALSE); proto_tree_add_string(tree, hf, tvb, offset+1, type_len-1, attr_type); i=1; @@ -723,7 +723,7 @@ attr_list2(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length, guin attr_tree = proto_item_add_subtree(ti, ett_srvloc_attr); /* this will ensure there is a terminating null */ - start = tvb_get_string(wmem_packet_scope(), tvb, offset, length); + start = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII); cnt = 0; x = 0; diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 2574b2b25f..6a81252b3b 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -1137,7 +1137,7 @@ ssh_dissect_proposal(tvbuff_t *tvb, int offset, proto_tree *tree, proto_tree_add_item(tree, hf_index_value, tvb, offset, len, ENC_ASCII); if (store) - *store = tvb_get_string(wmem_file_scope(), tvb, offset, len); + *store = tvb_get_string_enc(wmem_file_scope(), tvb, offset, len, ENC_ASCII); offset += len; return offset; diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 257f253035..01b55e489e 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -1512,7 +1512,7 @@ dissect_hostname_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, hostname_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, source ? hf_sua_source_hostname : hf_sua_dest_hostname, parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", hostname_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, HOSTNAME_OFFSET, hostname_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, HOSTNAME_OFFSET, hostname_length, ENC_ASCII)); } #define IPV6_ADDRESS_LENGTH 16 diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 61a920cca1..5374844350 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -669,7 +669,7 @@ static int dissect_config_frame(tvbuff_t *tvb, proto_item *config_item) gint oldoffset = offset; /* to calculate the length of the whole PMU block later */ /* STN with new tree to add the rest of the PMU block */ - str = tvb_get_string(wmem_packet_scope(), tvb, offset, CHNAM_LEN); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, CHNAM_LEN, ENC_ASCII); station_item = proto_tree_add_text(config_tree, tvb, offset, CHNAM_LEN, "Station #%i: \"%s\"", j + 1, str); station_tree = proto_item_add_subtree(station_item, ett_conf_station); offset += CHNAM_LEN; @@ -1148,7 +1148,7 @@ static gint dissect_CHNAM(tvbuff_t *tvb, proto_tree *tree, gint offset, gint cnt /* dissect the 'cnt' channel names */ for (i = 0; i < cnt; i++) { char *str; - str = tvb_get_string(wmem_packet_scope(), tvb, offset, CHNAM_LEN); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, CHNAM_LEN, ENC_ASCII); proto_tree_add_text(temp_tree, tvb, offset, CHNAM_LEN, "%s #%i: \"%s\"", prefix, i+1, str); offset += CHNAM_LEN; diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c index 9c1bf8326a..aef7b5de25 100644 --- a/epan/dissectors/packet-sysex.c +++ b/epan/dissectors/packet-sysex.c @@ -1041,7 +1041,7 @@ dissect_digitech_procedure(guint8 procedure, const gint offset, while ((count > 0) && (str_size = tvb_strsize(data_tvb, data_offset))) { - tmp_string = tvb_get_string(wmem_packet_scope(), data_tvb, data_offset, str_size - 1); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), data_tvb, data_offset, str_size - 1, ENC_ASCII); proto_tree_add_string(tree, hf_digitech_preset_name, data_tvb, data_offset, str_size, tmp_string); data_offset += (gint)str_size; count--; @@ -1065,7 +1065,7 @@ dissect_digitech_procedure(guint8 procedure, const gint offset, /* Preset name (NULL-terminated) */ str_size = tvb_strsize(data_tvb, data_offset); - tmp_string = tvb_get_string(wmem_packet_scope(), data_tvb, data_offset, str_size - 1); + tmp_string = tvb_get_string_enc(wmem_packet_scope(), data_tvb, data_offset, str_size - 1, ENC_ASCII); proto_tree_add_string(tree, hf_digitech_preset_name, data_tvb, data_offset, str_size, tmp_string); data_offset += (gint)str_size; diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 0772979422..48e811fb4d 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1010,7 +1010,7 @@ dissect_tds5_lang_token(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree offset += 1; len -= 1; - msg = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset, len); + msg = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); proto_tree_add_text(tree, tvb, offset, len, "Language text: %s", msg); } @@ -1182,7 +1182,7 @@ dissect_tds7_login(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ len *= 2; - val = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, offset2, len); + val = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset2, len, ENC_ASCII); val2 = (char *)wmem_alloc(wmem_packet_scope(), len/2+1); for(j = 0, k = 0; j < len; j += 2, k++) { diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index 45674d6544..0fd921ab3b 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -632,13 +632,13 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree) offset+=2; proto_tree_add_item(ts2_tree, hf_ts2_max_users, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - tvb_get_stringz(wmem_packet_scope(), tvb, offset, &string_len); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &string_len, ENC_ASCII); proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset,string_len , ENC_ASCII|ENC_NA); offset+=string_len; - tvb_get_stringz(wmem_packet_scope(), tvb, offset, &string_len); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &string_len, ENC_ASCII); proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset,string_len ,ENC_ASCII|ENC_NA); offset+=string_len; - tvb_get_stringz(wmem_packet_scope(), tvb, offset, &string_len); + tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &string_len, ENC_ASCII); proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset,string_len , ENC_ASCII|ENC_NA); offset+=string_len; } diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 77a5cf5242..8274beff16 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -661,7 +661,7 @@ dissect_comport_subopt(packet_info *pinfo, const char *optname, tvbuff_t *tvb, i if (len == 0) { proto_tree_add_text(tree, tvb, offset, 1, "%s Requests Signature",source); } else { - guint8 *sig = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, len); + guint8 *sig = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1, len, ENC_ASCII); proto_tree_add_string_format_value(tree, hf_telnet_comport_subopt_signature, tvb, offset, 1 + len, sig, "%s Signature: %s",source, sig); } diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 2c640a7555..426feb7924 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -241,7 +241,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, proto_tree_add_item(tftp_tree, hf_tftp_source_file, tvb, offset, i1, ENC_ASCII|ENC_NA); - tftp_info->source_file = tvb_get_string(wmem_file_scope(), tvb, offset, i1); + tftp_info->source_file = tvb_get_string_enc(wmem_file_scope(), tvb, offset, i1, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s", tvb_format_stringzpad(tvb, offset, i1)); @@ -267,7 +267,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, tvb, offset, i1, ENC_ASCII|ENC_NA); tftp_info->destination_file = - tvb_get_string(wmem_file_scope(), tvb, offset, i1); + tvb_get_string_enc(wmem_file_scope(), tvb, offset, i1, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s", tvb_format_stringzpad(tvb, offset, i1)); diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index a33bb259ed..c55fa14556 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -78,7 +78,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea } length = tvb_length(tvb); - string = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, 0, length); + string = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, 0, length, ENC_ASCII); /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TiVoConnect"); diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 37a0ffa45f..66bc51e8ae 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -599,7 +599,7 @@ static void dissect_tnef(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case ATP_STRING: proto_tree_add_item(attr_tree, hf_tnef_attribute_string, tvb, offset, length, ENC_ASCII|ENC_NA); - proto_item_append_text(attr_item, " %s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + proto_item_append_text(attr_item, " %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); break; default: proto_tree_add_item(attr_tree, hf_tnef_attribute_value, tvb, offset, length, ENC_NA); diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index c9bcb1e346..8fd0947652 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -180,7 +180,7 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, ENC_ASCII|ENC_NA); network_tree = proto_item_add_subtree(name_item, ett_network); - str_name=tvb_get_stringz(wmem_packet_scope(), tvb, 0x14, &str_len); + str_name=tvb_get_stringz_enc(wmem_packet_scope(), tvb, 0x14, &str_len, ENC_ASCII); col_append_fstr(pinfo->cinfo, COL_INFO, ", Network=\"%s\"",format_text(str_name, str_len-1)); while(tvb_get_guint8(tvb, 0x34 + 8*i)==0x00 && (tvb_length_remaining(tvb,0x34 + 8*i) > 6) && (i<32)) { diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c index 4e79595811..4ac66a3d62 100644 --- a/epan/dissectors/packet-ubertooth.c +++ b/epan/dissectors/packet-ubertooth.c @@ -1778,7 +1778,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat offset += 1; proto_tree_add_item(main_tree, hf_firmware_revision, tvb, offset, length, ENC_NA | ENC_ASCII); - col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); offset += length; break; @@ -1850,7 +1850,7 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat offset += 1; proto_tree_add_item(main_tree, hf_firmware_compile_info, tvb, offset, length, ENC_NA | ENC_ASCII); - col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", tvb_get_string(wmem_packet_scope(), tvb, offset, length)); + col_append_fstr(pinfo->cinfo, COL_INFO, " = %s", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, length, ENC_ASCII)); offset += length; break; diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 017aa0cacf..38c8a7401e 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -896,7 +896,7 @@ ucp_handle_int(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) tvb_ensure_bytes_exist(tvb, *offset, len + 1); } else len = idx - *offset; - strval = tvb_get_string(wmem_packet_scope(), tvb, *offset, len); + strval = tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, len, ENC_ASCII); if (len > 0) { intval = atoi(strval); proto_tree_add_uint(tree, field, tvb, *offset, len, intval); @@ -922,7 +922,7 @@ ucp_handle_time(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) tvb_ensure_bytes_exist(tvb, *offset, len + 1); } else len = idx - *offset; - strval = tvb_get_string(wmem_packet_scope(), tvb, *offset, len); + strval = tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, len, ENC_ASCII); if (len > 0) { tval = ucp_mktime(len, strval); tmptime.secs = tval; diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 1cc213b57a..75fc509568 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -974,7 +974,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) break; case 10: /* UNC SGW Fully Qualified Domain/Host Name */ if ( ie_len > 0){ - string = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, ie_offset, ie_len); + string = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, ie_offset, ie_len, ENC_ASCII); proto_tree_add_string(urr_ie_tree, hf_uma_urr_FQDN, tvb, ie_offset, ie_len, string); }else{ proto_tree_add_text(urr_ie_tree,tvb,offset,1,"FQDN not present"); @@ -1440,7 +1440,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) case 98: /* UNC Fully Qualified Domain/Host Name */ if ( ie_len > 0){ - string = (gchar*)tvb_get_string(wmem_packet_scope(), tvb, ie_offset, ie_len); + string = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, ie_offset, ie_len, ENC_ASCII); proto_tree_add_string(urr_ie_tree, hf_uma_unc_FQDN, tvb, ie_offset, ie_len, string); }else{ proto_tree_add_text(urr_ie_tree,tvb,offset,1,"UNC FQDN not present"); diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index f6d12fa396..24fbce752e 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -304,7 +304,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) if (etx_start) length = (etx_start - stx_start - 1); /* and the data part is the rest... */ /* whatever preceeds the ETX if it exists */ - data_ptr = tvb_get_string(wmem_packet_scope(), tvb, stx_start+1, length); /* copy the string for dissecting */ + data_ptr = tvb_get_string_enc(wmem_packet_scope(), tvb, stx_start+1, length, ENC_ASCII); /* copy the string for dissecting */ proto_tree_add_string_format(uts_tree, hf_data, tvb, stx_start + 1, length, data_ptr, "Text (%d byte%s)", length, plurality(length, "", "s")); } diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index cc412805e0..a50ef51f78 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -197,7 +197,7 @@ dissect_text_interface_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree proto_tree_add_item(parameter_tree, hf_text_if_id, parameter_tvb, TEXT_IF_ID_VALUE_OFFSET, if_id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (0x%.*s)", if_id_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, TEXT_IF_ID_VALUE_OFFSET, if_id_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, TEXT_IF_ID_VALUE_OFFSET, if_id_length, ENC_ASCII)); } /*----------------------Text Interface Identifier (RFC)------------------------*/ @@ -507,7 +507,7 @@ dissect_asp_msg_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, p proto_tree_add_item(parameter_tree, hf_adaptation_layer_id, parameter_tvb, PARAMETER_VALUE_OFFSET, adaptation_layer_id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", adaptation_layer_id_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, PARAMETER_VALUE_OFFSET, adaptation_layer_id_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, PARAMETER_VALUE_OFFSET, adaptation_layer_id_length, ENC_ASCII)); } static void @@ -516,7 +516,7 @@ dissect_scn_protocol_id_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter guint16 id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); proto_tree_add_item(parameter_tree, hf_scn_protocol_id, parameter_tvb, PARAMETER_VALUE_OFFSET, id_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", id_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, PARAMETER_VALUE_OFFSET, id_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, PARAMETER_VALUE_OFFSET, id_length, ENC_ASCII)); } /*----------------------ASP (Draft)--------------------------------------------*/ @@ -808,7 +808,7 @@ dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tre info_string_length -= PARAMETER_HEADER_LENGTH; proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII|ENC_NA); proto_item_append_text(parameter_item, " (%.*s)", info_string_length, - tvb_get_string(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length)); + tvb_get_string_enc(wmem_packet_scope(), parameter_tvb, INFO_STRING_OFFSET, info_string_length, ENC_ASCII)); } } diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 2d6a62d97d..c3b5f3f42d 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -890,7 +890,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); @@ -923,7 +923,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; } @@ -1029,7 +1029,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, @@ -1046,7 +1046,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", @@ -1198,10 +1198,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; diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index a413f6f45c..01b0e8a4bc 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -178,7 +178,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(vtp_tree, hf_vtp_upd_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - upd_timestamp = tvb_get_string(wmem_packet_scope(), tvb, offset, 12); + upd_timestamp = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 12, ENC_ASCII); proto_tree_add_string_format_value(vtp_tree, hf_vtp_upd_ts, tvb, offset, 12, (gchar*)upd_timestamp, "%.2s-%.2s-%.2s %.2s:%.2s:%.2s", diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 90959bf123..f6006d29e4 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -202,7 +202,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - string = g_strreverse(tvb_get_string(wmem_packet_scope(), tvb, offset, 4)); + string = g_strreverse(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII)); proto_tree_add_string(wow_tree, hf_wow_gamename, tvb, offset, 4, string); offset += 4; @@ -223,17 +223,17 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - string = g_strreverse(tvb_get_string(wmem_packet_scope(), tvb, offset, 4)); + string = g_strreverse(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII)); proto_tree_add_string(wow_tree, hf_wow_platform, tvb, offset, 4, string); offset += 4; - string = g_strreverse(tvb_get_string(wmem_packet_scope(), tvb, offset, 4)); + string = g_strreverse(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII)); proto_tree_add_string(wow_tree, hf_wow_os, tvb, offset, 4, string); offset += 4; - string = g_strreverse(tvb_get_string(wmem_packet_scope(), tvb, offset, 4)); + string = g_strreverse(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ENC_ASCII)); proto_tree_add_string(wow_tree, hf_wow_country, tvb, offset, 4, string); offset += 4; @@ -354,9 +354,9 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data offset += 2; for(ii = 0; ii < num_realms; ii++) { - realm_name = tvb_get_stringz(wmem_packet_scope(), tvb, + realm_name = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset + 3, - &len); + &len, ENC_ASCII); ti = proto_tree_add_text(wow_tree, tvb, offset, 0, @@ -376,8 +376,8 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data proto_tree_add_string(wow_realms_tree, hf_wow_realm_name, tvb, offset, len, realm_name); offset += len; - string = tvb_get_stringz(wmem_packet_scope(), tvb, offset, - &len); + string = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, + &len, ENC_ASCII); proto_tree_add_string(wow_realms_tree, hf_wow_realm_socket, tvb, offset, len, string); offset += len; diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index a5484c1e1d..b48fdf3250 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1625,7 +1625,7 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset, break; case FT_STRING: fmt = ": %s"; - valuep = tvb_get_string(wmem_packet_scope(), tvb, offset+4, tlv_len); + valuep = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+4, tlv_len, ENC_ASCII); break; default: /* make compiler happy */ diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index ad8492bcba..2c2fef9107 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -1287,7 +1287,7 @@ static void add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *p * get_text_string() macro now returns wmem_alloc'd memory. */ #define get_text_string(str,tvb,start,len,ok) \ if (is_text_string(tvb_get_guint8(tvb,start))) { \ - str = (gchar *)tvb_get_stringz(wmem_packet_scope(), tvb,start,(gint *)&len); \ + str = (gchar *)tvb_get_stringz_enc(wmem_packet_scope(), tvb,start,(gint *)&len,ENC_ASCII); \ ok = TRUE; \ } else { len = 0; str = NULL; ok = FALSE; } #define get_token_text(str,tvb,start,len,ok) \ @@ -1786,13 +1786,13 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo) tvb, offset, 2, codepage); offset += 2; } else if (hdr_id >= 0x20) { /* Textual header */ - /* Header name MUST be NUL-ended string ==> tvb_get_stringz() */ - hdr_str = (gchar *)tvb_get_stringz(wmem_packet_scope(), tvb, hdr_start, (gint *)&hdr_len); + /* Header name MUST be NUL-ended string ==> tvb_get_stringz_enc() */ + hdr_str = (gchar *)tvb_get_stringz_enc(wmem_packet_scope(), tvb, hdr_start, (gint *)&hdr_len, ENC_ASCII); val_start = hdr_start + hdr_len; val_id = tvb_get_guint8(tvb, val_start); /* Call header value dissector for given header */ if (val_id >= 0x20 && val_id <=0x7E) { /* OK! */ - val_str = (gchar *)tvb_get_stringz(wmem_packet_scope(), tvb, val_start, (gint *)&val_len); + val_str = (gchar *)tvb_get_stringz_enc(wmem_packet_scope(), tvb, val_start, (gint *)&val_len, ENC_ASCII); offset = val_start + val_len; tvb_ensure_bytes_exist(tvb, hdr_start, offset-hdr_start); proto_tree_add_text(wsp_headers,tvb,hdr_start,offset-hdr_start, @@ -1916,7 +1916,7 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo) #define wkh_2_TextualValue /* Parse Textual Value */ \ /* END */ \ } else if ((val_id == 0) || (val_id >= 0x20)) { /* Textual value */ \ - val_str = (gchar *)tvb_get_stringz (wmem_packet_scope(), tvb, val_start, (gint *)&val_len); \ + val_str = (gchar *)tvb_get_stringz_enc(wmem_packet_scope(), tvb, val_start, (gint *)&val_len, ENC_ASCII); \ offset = val_start + val_len; \ /* Textual value processing starts HERE \ * \ @@ -1925,7 +1925,7 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo) #define wkh_2_TextualValueInv /* Parse Textual Value */ \ /* END */ \ } else if ((val_id == 0) || (val_id >= 0x20)) { /* Textual value */ \ - /*val_str = (gchar *)*/tvb_get_stringz (wmem_packet_scope(), tvb, val_start, (gint *)&val_len); \ + /*val_str = (gchar *)*/tvb_get_stringz_enc(wmem_packet_scope(), tvb, val_start, (gint *)&val_len, ENC_ASCII); \ offset = val_start + val_len; \ /* Textual value processing starts HERE \ * \ @@ -5815,7 +5815,7 @@ add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint v char *variableBuffer; char *valueBuffer; - variableBuffer = tvb_get_string(wmem_packet_scope(), tvb, variableStart, variableLength); + variableBuffer = tvb_get_string_enc(wmem_packet_scope(), tvb, variableStart, variableLength, ENC_ASCII); if (valueEnd < valueStart) { @@ -5828,7 +5828,7 @@ add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint v valueLength = valueEnd-valueStart; /* XXX - if this throws an exception, "variableBuffer" is leaked */ - valueBuffer = tvb_get_string(wmem_packet_scope(), tvb, valueStart, valueLength); + valueBuffer = tvb_get_string_enc(wmem_packet_scope(), tvb, valueStart, valueLength, ENC_ASCII); } /* Check for variables with no value */ diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index cbb0fd725b..338d61b975 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -2130,7 +2130,7 @@ static void listOfString8(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, while(length--) { guint l = VALUE8(tvb, *offsetp); - s = tvb_get_string(wmem_packet_scope(), tvb, *offsetp + 1, l); + s = tvb_get_string_enc(wmem_packet_scope(), tvb, *offsetp + 1, l, ENC_ASCII); proto_tree_add_string_format(tt, hf_item, tvb, *offsetp, l + 1, s, "\"%s\"", s); *offsetp += l + 1; } @@ -2228,7 +2228,7 @@ static void listOfTextItem(tvbuff_t *tvb, int *offsetp, proto_tree *t, int hf, proto_tree *ttt; gint8 delta = VALUE8(tvb, *offsetp + 1); if (sizeIs16) l += l; - s = tvb_get_string(wmem_packet_scope(), tvb, *offsetp + 2, l); + s = tvb_get_string_enc(wmem_packet_scope(), tvb, *offsetp + 2, l, ENC_ASCII); tti = proto_tree_add_none_format(tt, hf_x11_textitem_string, tvb, *offsetp, l + 2, "textitem (string): delta = %d, \"%s\"", delta, s); @@ -3265,7 +3265,7 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, /* necessary processing even if tree == NULL */ v16 = VALUE16(tvb, 4); - name = tvb_get_string(wmem_file_scope(), tvb, 8, v16); + name = tvb_get_string_enc(wmem_file_scope(), tvb, 8, v16, ENC_ASCII); /* store string of extension, opcode will be set at reply */ i = 0; diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index 18ebb2ac23..3e6b90dd23 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -307,7 +307,7 @@ static gboolean dissect_xcsl_tcp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_t guint8 *protocol; if (tvb_length_remaining (tvb, offset) >= 5) { - protocol = tvb_get_string(wmem_packet_scope(), tvb, offset, 5); + protocol = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 5, ENC_ASCII); if (strncmp(protocol,"xcsl",4) == 0 && (protocol[4] == ';' || protocol[4] == '-')) { diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 63ae88b702..fd3d287d78 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -126,7 +126,7 @@ static gint xdmcp_add_string(proto_tree *tree, gint hf, guint len; len = tvb_get_ntohs(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+2, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+2, len, ENC_ASCII); proto_tree_add_string(tree, hf, tvb, offset, len+2, str); return len+2; diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 5db656771c..d087cb56c2 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -439,14 +439,14 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, proto_tree_add_item(attr_tree, xmcp_attr_username, tvb, offset, attr_length, ENC_ASCII|ENC_NA); proto_item_append_text(attr_tree, ": %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); /* * Many message methods may include this attribute, * but it's only interesting when Registering at first */ if (xmcp_msg_type_method == XMCP_METHOD_REGISTER) { col_append_fstr(pinfo->cinfo, COL_INFO, ", user \"%s\"", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); } break; case XMCP_MESSAGE_INTEGRITY: @@ -509,15 +509,15 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, proto_tree_add_item(attr_tree, xmcp_attr_error_reason, tvb, (offset+4), (attr_length - 4), ENC_ASCII|ENC_NA); proto_item_append_text(attr_tree, " (%s)", - tvb_get_string(wmem_packet_scope(), tvb, (offset+4), - (attr_length-4))); + tvb_get_string_enc(wmem_packet_scope(), tvb, (offset+4), + (attr_length-4), ENC_ASCII)); break; case XMCP_REALM: it = proto_tree_add_item(attr_tree, xmcp_attr_realm, tvb, offset, attr_length, ENC_ASCII|ENC_NA); { guint8 *realm; - realm = tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length); + realm = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII); proto_item_append_text(attr_tree, ": %s", realm); /* In XMCP the REALM string should always be "SAF" including the quotes */ if (attr_length != 5 || strncmp(realm, "\"SAF\"", attr_length)) { @@ -529,15 +529,15 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, proto_tree_add_item(attr_tree, xmcp_attr_nonce, tvb, offset, attr_length, ENC_ASCII|ENC_NA); proto_item_append_text(attr_tree, ": %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); break; case XMCP_CLIENT_NAME: proto_tree_add_item(attr_tree, xmcp_attr_client_name, tvb, offset, attr_length, ENC_ASCII|ENC_NA); proto_item_append_text(attr_tree, ": %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); col_append_fstr(pinfo->cinfo, COL_INFO, ", name \"%s\"", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); break; case XMCP_CLIENT_HANDLE: if (attr_length < 4) @@ -578,9 +578,9 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, proto_tree_add_item(attr_tree, xmcp_attr_client_label, tvb, offset, attr_length, ENC_ASCII|ENC_NA); proto_item_append_text(attr_tree, ": %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); col_append_fstr(pinfo->cinfo, COL_INFO, ", label \"%s\"", - tvb_get_string(wmem_packet_scope(), tvb, offset, attr_length)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, attr_length, ENC_ASCII)); break; case XMCP_KEEPALIVE: if (attr_length < 4) @@ -770,8 +770,8 @@ decode_xmcp_attr_value (proto_tree *attr_tree, guint16 attr_type, * a '<'), try XML. * Otherwise, try plain-text. */ - test_string = tvb_get_string(wmem_packet_scope(), next_tvb, 0, (attr_length < 32 ? - attr_length : 32)); + test_string = tvb_get_string_enc(wmem_packet_scope(), next_tvb, 0, (attr_length < 32 ? + attr_length : 32), ENC_ASCII); tok = strtok(test_string, " \t\r\n"); if (tok && tok[0] == '<') { /* Looks like XML */ diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index ac311e0a72..2e98786680 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -350,7 +350,7 @@ static void before_xmpli(void *tvbparse_data, const void *wanted_data _U_, tvbpa proto_item *pi; proto_tree *pt; tvbparse_elem_t *name_tok = tok->sub->next; - gchar *name = tvb_get_string(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len); + gchar *name = tvb_get_string_enc(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len, ENC_ASCII); xml_ns_t *ns = (xml_ns_t *)g_hash_table_lookup(xmpli_names, name); xml_frame_t *new_frame; @@ -420,8 +420,8 @@ static void before_tag(void *tvbparse_data, const void *wanted_data _U_, tvbpars tvbparse_elem_t *leaf_tok = name_tok->sub->sub->next->next; xml_ns_t *nameroot_ns; - root_name = (gchar *)tvb_get_string(wmem_packet_scope(), root_tok->tvb, root_tok->offset, root_tok->len); - name = (gchar *)tvb_get_string(wmem_packet_scope(), leaf_tok->tvb, leaf_tok->offset, leaf_tok->len); + root_name = (gchar *)tvb_get_string_enc(wmem_packet_scope(), root_tok->tvb, root_tok->offset, root_tok->len, ENC_ASCII); + name = (gchar *)tvb_get_string_enc(wmem_packet_scope(), leaf_tok->tvb, leaf_tok->offset, leaf_tok->len, ENC_ASCII); name_orig_case = name; nameroot_ns = (xml_ns_t *)g_hash_table_lookup(xml_ns.elements, root_name); @@ -436,7 +436,7 @@ static void before_tag(void *tvbparse_data, const void *wanted_data _U_, tvbpars } } else { - name = tvb_get_string(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len); + name = tvb_get_string_enc(wmem_packet_scope(), name_tok->tvb, name_tok->offset, name_tok->len, ENC_ASCII); name_orig_case = wmem_strdup(wmem_packet_scope(), name); ascii_strdown_inplace(name); @@ -529,9 +529,9 @@ static void before_dtd_doctype(void *tvbparse_data, const void *wanted_data _U_, new_frame = (xml_frame_t *)wmem_alloc(wmem_packet_scope(), sizeof(xml_frame_t)); new_frame->type = XML_FRAME_DTD_DOCTYPE; - new_frame->name = (gchar *)tvb_get_string(wmem_packet_scope(), name_tok->tvb, + new_frame->name = (gchar *)tvb_get_string_enc(wmem_packet_scope(), name_tok->tvb, name_tok->offset, - name_tok->len); + name_tok->len, ENC_ASCII); new_frame->name_orig_case = new_frame->name; new_frame->value = NULL; insert_xml_frame(current_frame, new_frame); @@ -587,7 +587,7 @@ static void after_attrib(void *tvbparse_data, const void *wanted_data _U_, tvbpa proto_item *pi; xml_frame_t *new_frame; - name = tvb_get_string(wmem_packet_scope(), tok->sub->tvb, tok->sub->offset, tok->sub->len); + name = tvb_get_string_enc(wmem_packet_scope(), tok->sub->tvb, tok->sub->offset, tok->sub->len, ENC_ASCII); name_orig_case = wmem_strdup(wmem_packet_scope(), name); ascii_strdown_inplace(name); diff --git a/epan/dissectors/packet-xmpp-utils.c b/epan/dissectors/packet-xmpp-utils.c index e27d783bca..5e013bb9a6 100644 --- a/epan/dissectors/packet-xmpp-utils.c +++ b/epan/dissectors/packet-xmpp-utils.c @@ -551,7 +551,7 @@ xmpp_xml_frame_to_element_t(xml_frame_t *xml_frame, xmpp_element_t *parent, tvbu if((elem = tvbparse_get(tt,want_stream_end_with_ns))!=NULL) { - node->default_ns_abbrev = tvb_get_string(wmem_packet_scope(), elem->sub->tvb, elem->sub->offset, elem->sub->len); + node->default_ns_abbrev = tvb_get_string_enc(wmem_packet_scope(), elem->sub->tvb, elem->sub->offset, elem->sub->len, ENC_ASCII); } child = xml_frame->first_child; @@ -727,7 +727,7 @@ xmpp_element_to_string(tvbuff_t *tvb, xmpp_element_t *element) if(tvb_offset_exists(tvb, element->offset+element->length-1)) { - buff = tvb_get_string(wmem_packet_scope(), tvb, element->offset, element->length); + buff = tvb_get_string_enc(wmem_packet_scope(), tvb, element->offset, element->length, ENC_ASCII); } return buff; } @@ -739,7 +739,7 @@ xmpp_attr_to_string(tvbuff_t *tvb, xmpp_attr_t *attr) if(tvb_offset_exists(tvb, attr->offset + attr->length-1)) { - buff = tvb_get_string(wmem_packet_scope(), tvb, attr->offset, attr->length); + buff = tvb_get_string_enc(wmem_packet_scope(), tvb, attr->offset, attr->length, ENC_ASCII); } return buff; } diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 0402379474..66800be0a1 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -880,7 +880,7 @@ dissect_xtp_diag(tvbuff_t *tvb, proto_tree *tree, guint32 offset) { offset += 4; /* message(n) */ msg_len = tvb_length_remaining(tvb, offset); - diag->msg = tvb_get_string(NULL, tvb, offset, msg_len); + diag->msg = tvb_get_string_enc(NULL, tvb, offset, msg_len, ENC_ASCII); /** display **/ offset = start; diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 0a5ed1db17..43f4d2baec 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -694,7 +694,7 @@ dissect_zbee_nwk_gp_cmd_commissioning(tvbuff_t *tvb, packet_info *pinfo _U_, pro if (comm_ext_options & ZBEE_NWK_GP_CMD_COMMISSIONING_EXT_OPT_GPD_KEY_PRESENT) { /* Get security key and display it. */ proto_tree_add_text(tree, tvb, offset, NWK_CMD_SECURITY_KEY_LEN, "Security Key: %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, NWK_CMD_SECURITY_KEY_LEN)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, NWK_CMD_SECURITY_KEY_LEN, ENC_ASCII)); offset += NWK_CMD_SECURITY_KEY_LEN; } if (comm_ext_options & ZBEE_NWK_GP_CMD_COMMISSIONING_EXT_OPT_GPD_KEY_ENCR) { @@ -888,7 +888,7 @@ dissect_zbee_nwk_gp_cmd_commissioning_reply(tvbuff_t *tvb, packet_info *pinfo _U /* Parse and display security key. */ if (cr_options & ZBEE_NWK_GP_CMD_COMMISSIONING_REP_OPT_SEC_KEY_PRESENT) { proto_tree_add_text(tree, tvb, offset, NWK_CMD_SECURITY_KEY_LEN, "Security Key: %s", - tvb_get_string(wmem_packet_scope(), tvb, offset, NWK_CMD_SECURITY_KEY_LEN)); + tvb_get_string_enc(wmem_packet_scope(), tvb, offset, NWK_CMD_SECURITY_KEY_LEN, ENC_ASCII)); offset += NWK_CMD_SECURITY_KEY_LEN; } /* Parse and display security MIC. */ diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c index c877d4db15..bb01f72279 100644 --- a/epan/dissectors/packet-zbee-zcl.c +++ b/epan/dissectors/packet-zbee-zcl.c @@ -2203,7 +2203,7 @@ void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset, guint *offset += 1; - attr_string = tvb_get_string(wmem_packet_scope(), tvb, *offset, attr_uint); + attr_string = tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, attr_uint, ENC_ASCII); proto_item_append_text(tree, ", String: %s", attr_string); proto_tree_add_string(tree, hf_zbee_zcl_attr_str, tvb, *offset, attr_uint, attr_string); @@ -2236,7 +2236,7 @@ void dissect_zcl_attr_data(tvbuff_t *tvb, proto_tree *tree, guint *offset, guint proto_tree_add_uint(tree, hf_zbee_zcl_attr_str_len, tvb, *offset, 2, attr_uint); *offset += 2; - attr_string = tvb_get_string(wmem_packet_scope(), tvb, *offset, attr_uint); + attr_string = tvb_get_string_enc(wmem_packet_scope(), tvb, *offset, attr_uint, ENC_ASCII); proto_item_append_text(tree, ", String: %s", attr_string); proto_tree_add_string(tree, hf_zbee_zcl_attr_str, tvb, *offset, attr_uint, attr_string); diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c index df8477b6e5..360b64bc84 100644 --- a/epan/dissectors/packet-zbee-zdp-discovery.c +++ b/epan/dissectors/packet-zbee-zdp-discovery.c @@ -1147,7 +1147,7 @@ dissect_zbee_zdp_rsp_user_desc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } else user_length = 0; - user = tvb_get_string(wmem_packet_scope(), tvb, offset, user_length); + user = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, user_length, ENC_ASCII); if (tree) { proto_tree_add_string(tree, hf_zbee_zdp_user, tvb, offset, user_length, user); } diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 1e41eb1555..924bb08aa1 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -113,7 +113,7 @@ static void dissect_zep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissector_handle_t next_dissector; /* Determine whether this is a Q51/IEEE 802.15.4 sniffer packet or not */ - if(strcmp(tvb_get_string(wmem_packet_scope(), tvb, 0, 2), ZEP_PREAMBLE)){ + if(strcmp(tvb_get_string_enc(wmem_packet_scope(), tvb, 0, 2, ENC_ASCII), ZEP_PREAMBLE)){ /* This is not a Q51/ZigBee sniffer packet */ call_dissector(data_handle, tvb, pinfo, tree); return; |