summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-teamspeak2.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-10-10 00:39:31 +0000
committerBill Meier <wmeier@newsguy.com>2011-10-10 00:39:31 +0000
commit67ee5049d4eaba0c87fe943e5fe8b203cacd378d (patch)
tree279279f3db0b5f366362166344c1cc92c0d44b38 /epan/dissectors/packet-teamspeak2.c
parente0820c62d4a87ce424122a54e274b45bd8d64d6d (diff)
downloadwireshark-67ee5049d4eaba0c87fe943e5fe8b203cacd378d.tar.gz
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328
Diffstat (limited to 'epan/dissectors/packet-teamspeak2.c')
-rw-r--r--epan/dissectors/packet-teamspeak2.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index fe39f0f52f..12a6e597dd 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, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, 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, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, offset, 1, 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, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_channel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset+=30;
- proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_subchannel, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset+=30;
- proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_channelpassword, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset+=30;
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 4, ENC_NA);
@@ -617,11 +617,11 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree)
/* Channel flags */
item = proto_tree_add_item(ts2_tree, hf_ts2_channel_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN);
subtree = proto_item_add_subtree(item, ett_ts2_channel_flags);
- proto_tree_add_item(subtree, hf_ts2_channel_unregistered, tvb, offset, 1, FALSE);
- proto_tree_add_item(subtree, hf_ts2_channel_moderated, tvb, offset, 1, FALSE);
- proto_tree_add_item(subtree, hf_ts2_channel_password, tvb, offset, 1, FALSE);
- proto_tree_add_item(subtree, hf_ts2_channel_subchannels, tvb, offset, 1, FALSE);
- proto_tree_add_item(subtree, hf_ts2_channel_default, tvb, offset, 1, FALSE);
+ proto_tree_add_item(subtree, hf_ts2_channel_unregistered, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(subtree, hf_ts2_channel_moderated, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(subtree, hf_ts2_channel_password, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(subtree, hf_ts2_channel_subchannels, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(subtree, hf_ts2_channel_default, tvb, offset, 1, ENC_BIG_ENDIAN);
offset+=1;
proto_tree_add_item(ts2_tree, hf_ts2_unknown, tvb, offset, 1, ENC_NA);
@@ -648,11 +648,11 @@ static void ts2_parse_channellist(tvbuff_t *tvb, proto_tree *ts2_tree)
static void ts2_add_statusflags(tvbuff_t *tvb, proto_tree *ts2_tree, guint32 offset)
{
- proto_tree_add_item(ts2_tree, hf_ts2_status_channelcommander, tvb, offset, 2, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_status_blockwhispers, tvb, offset, 2, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_status_away, tvb, offset, 2, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_status_mutemicrophone, tvb, offset, 2, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_status_mute, tvb, offset, 2, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_status_channelcommander, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_status_blockwhispers, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_status_away, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_status_mutemicrophone, tvb, offset, 2, ENC_LITTLE_ENDIAN);
+ proto_tree_add_item(ts2_tree, hf_ts2_status_mute, tvb, offset, 2, ENC_LITTLE_ENDIAN);
}
@@ -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, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, offset, 1, 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, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, TRUE);
+ 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_unknown, tvb, 80, 9, ENC_NA);
- proto_tree_add_item(ts2_tree, hf_ts2_registeredlogin, tvb, 90, 1, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_name, tvb, 90, 1, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_password, tvb, 120, 1, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_nick, tvb, 150, 1, TRUE);
+ 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);
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, TRUE);
- proto_tree_add_item(ts2_tree, hf_ts2_platform_string, tvb, 50, 1, TRUE);
+ 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_unknown, tvb, 80, 9, ENC_NA);
- proto_tree_add_item(ts2_tree, hf_ts2_badlogin, tvb, 89, 3, TRUE);
+ 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, TRUE);
+ proto_tree_add_item(ts2_tree, hf_ts2_server_welcome_message, tvb, 180, 1, ENC_LITTLE_ENDIAN);
break;
}
break;