diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-27 18:58:37 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-04-27 18:58:37 +0000 |
| commit | 891c9db19b2089086c8354168d15d930f73fb1dd (patch) | |
| tree | 0684abad6a3589e63af3ad1b8732c8489e3d7f01 /epan/dissectors/packet-teamspeak2.c | |
| parent | 4d1e9933055d2c3c01ce9070f8485c6b34420756 (diff) | |
As suggested in http://www.wireshark.org/lists/wireshark-dev/201204/msg00062.html :
Don't use ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN with ENC_ASCII: ASCII has no
endianism, so ENC_NA is more appropriate.
svn path=/trunk/; revision=42297
Diffstat (limited to 'epan/dissectors/packet-teamspeak2.c')
| -rw-r--r-- | epan/dissectors/packet-teamspeak2.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index bedb57ee4d..7b9200c5db 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_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_NA); 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_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, ENC_ASCII|ENC_NA); 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_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_ASCII|ENC_NA); offset+=30; - proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_ASCII|ENC_NA); offset+=30; - proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_ASCII|ENC_NA); offset+=30; proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA); @@ -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_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, ENC_ASCII|ENC_NA); 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_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_protocol_string, tvb, 20, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_NA); 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_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); + proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, ENC_ASCII|ENC_NA); 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_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_server_name, tvb, 20, 1, ENC_ASCII|ENC_NA); + proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, ENC_ASCII|ENC_NA); 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_ASCII|ENC_LITTLE_ENDIAN); + proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_ASCII|ENC_NA); break; } break; |