aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aim-location.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-09-18 06:42:16 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-09-18 06:42:16 +0000
commita6f538d77aeff9ff573349eef5ec6d19d25bbc41 (patch)
treeb42c003d9dea691020425921785bb89c28848360 /epan/dissectors/packet-aim-location.c
parent36a371469db2bf0e816268205b405bd43fd50527 (diff)
From Jelmer Vernooij:
- Support client capabilities list - Fix incorrect TLV usage git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12040 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-aim-location.c')
-rw-r--r--epan/dissectors/packet-aim-location.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index 7bfdd0e8b1..217f8b3e1a 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -86,15 +86,23 @@ static const aim_tlv msg_tlv[] = {
#define AIM_LOCATION_RIGHTS_TLV_MAX_PROFILE_LENGTH 0x0001
#define AIM_LOCATION_RIGHTS_TLV_MAX_CAPABILITIES 0x0002
-#define AIM_LOCATION_RIGHTS_TLV_CLIENT_CAPABILITIES 0x0005
static const aim_tlv location_rights_tlvs[] = {
{ AIM_LOCATION_RIGHTS_TLV_MAX_PROFILE_LENGTH, "Max Profile Length", dissect_aim_tlv_value_uint16 },
{ AIM_LOCATION_RIGHTS_TLV_MAX_CAPABILITIES, "Max capabilities", dissect_aim_tlv_value_uint16 },
- { AIM_LOCATION_RIGHTS_TLV_CLIENT_CAPABILITIES, "Client capabilities", dissect_aim_tlv_value_client_capabilities },
{ 0, "Unknown", NULL }
};
+
+#define AIM_LOCATION_USERINFO_TLV_MIME_TYPE 0x0001
+#define AIM_LOCATION_USERINFO_TLV_CLIENT_CAPABILITIES 0x0005
+
+static const aim_tlv location_userinfo_tlvs[] = {
+ { AIM_LOCATION_USERINFO_TLV_MIME_TYPE, "Mime Type", dissect_aim_tlv_value_string },
+ { AIM_LOCATION_USERINFO_TLV_CLIENT_CAPABILITIES, "Client capabilities", dissect_aim_tlv_value_client_capabilities },
+ { 0, "Unknown", NULL }
+};
+
#define FAMILY_LOCATION_USERINFO_INFOTYPE_GENERALINFO 0x0001
#define FAMILY_LOCATION_USERINFO_INFOTYPE_AWAYMSG 0x0003
#define FAMILY_LOCATION_USERINFO_INFOTYPE_CAPS 0x0005
@@ -150,7 +158,7 @@ static int dissect_aim_location(tvbuff_t *tvb, packet_info *pinfo,
return 0;
case FAMILY_LOCATION_SETUSERINFO:
while(tvb_length_remaining(tvb, offset) > 0) {
- offset = dissect_aim_tlv(tvb, pinfo, offset, loc_tree, location_rights_tlvs);
+ offset = dissect_aim_tlv(tvb, pinfo, offset, loc_tree, location_userinfo_tlvs);
}
return 0;
case FAMILY_LOCATION_WATCHERSUBREQ: