Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:

 1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426

1 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 12a6e597dd..2e5fd3d20a 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -509,7 +509,7 @@ static void ts2_parse_newplayerjoined(tvbuff_t *tvb, proto_tree *ts2_tree)
 	offset+=4;
 	proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 6, ENC_NA);
 	offset+=6;
-	proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+	proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 	offset+=30;
 }
 
@@ -539,7 +539,7 @@ static void ts2_parse_switchchannel(tvbuff_t *tvb, proto_tree *ts2_tree)
 	offset=0;
 	proto_tree_add_item(ts2_tree, hf_ts2_channel_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
 	offset+=4;
-	proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+	proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 	offset+=30;
 }
 
@@ -589,11 +589,11 @@ static void ts2_parse_loginpart2(tvbuff_t *tvb, proto_tree *ts2_tree)
 	offset=0;
 	proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 0, 2, ENC_NA);
 	offset+=2;
-	proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+	proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 	offset+=30;
-	proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+	proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 	offset+=30;
-	proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+	proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 	offset+=30;
 	proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA);
 
@@ -635,13 +635,13 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree)
 		proto_tree_add_item(ts2_tree, hf_ts2_max_users, tvb, offset, 2, ENC_LITTLE_ENDIAN);
 		offset+=2;
 		tvb_get_ephemeral_stringz(tvb, offset, &string_len);
-		proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset,string_len , TRUE);
+		proto_tree_add_item(ts2_tree, hf_ts2_channel_name, tvb, offset,string_len , ENC_ASCII|ENC_NA);
 		offset+=string_len;
 		tvb_get_ephemeral_stringz(tvb, offset, &string_len);
-		proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset,string_len ,TRUE);
+		proto_tree_add_item(ts2_tree, hf_ts2_channel_topic, tvb, offset,string_len ,ENC_ASCII|ENC_NA);
 		offset+=string_len;
 		tvb_get_ephemeral_stringz(tvb, offset, &string_len);
-		proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset,string_len , TRUE);
+		proto_tree_add_item(ts2_tree, hf_ts2_channel_description, tvb, offset,string_len , ENC_ASCII|ENC_NA);
 		offset+=string_len;
 	}
 }
@@ -678,7 +678,7 @@ static void ts2_parse_playerlist(tvbuff_t *tvb, proto_tree *ts2_tree)
 		proto_tree_add_item(ts2_tree, hf_ts2_player_status_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN);
 		ts2_add_statusflags(tvb, ts2_tree, offset);
 		offset+=2;
-		proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+		proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 		offset+=30;
 		x++;
 	}
@@ -782,27 +782,27 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 						proto_tree_add_item(ts2_tree, hf_ts2_ackto, tvb, 20, 4, ENC_LITTLE_ENDIAN);
 						break;
 					case TS2T_LOGINREQUEST:
-						proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_LITTLE_ENDIAN);
-						proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_protocol_string, tvb, 20, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 						proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA);
 						proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, ENC_LITTLE_ENDIAN);
-						proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_LITTLE_ENDIAN);
-						proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_LITTLE_ENDIAN);
-						proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 
 						conversation_data->server_port=pinfo->destport;
 						conversation_data->server_addr=pinfo->dst;
 
 						break;
 					case TS2T_LOGINREPLY:
-						proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_LITTLE_ENDIAN);
-						proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_server_name, tvb, 20, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
 						proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 80, 9, ENC_NA);
 						proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, ENC_LITTLE_ENDIAN);
 						proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 92, 80, ENC_NA);
 						proto_tree_add_item(ts2_tree, hf_ts2_sessionkey, tvb, 172, 4, ENC_LITTLE_ENDIAN);
 						proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, 178, 3, ENC_NA);
-						proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_LITTLE_ENDIAN);
+						proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_ASCII|ENC_LITTLE_ENDIAN);
                                                 break;
 				}
 				break;