diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-04-20 04:48:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-04-20 04:48:32 +0000 |
| commit | 0cef289a3ab50dafa1f6284af0536fa2a0a7c913 (patch) | |
| tree | 7f1a689ae20bd4901af9c3f2f0885fc2966821b3 /packet-aim-icq.c | |
| parent | 28ba549d1aeaf68f790befb96c223749d252606f (diff) | |
From Jelmer Vernooij:
Add support for a couple more SNAC's.
Handle TLV's in a somewhat more extendible manner.
Fix a bug in the buddylist dissector that caused pango warnings.
svn path=/trunk/; revision=10646
Diffstat (limited to 'packet-aim-icq.c')
| -rw-r--r-- | packet-aim-icq.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/packet-aim-icq.c b/packet-aim-icq.c index 80ea42b7d6..0d4e8854f2 100644 --- a/packet-aim-icq.c +++ b/packet-aim-icq.c @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC ICQ * Copyright 2004, Jelmer Vernooij <jelmer@samba.org> * - * $Id: packet-aim-icq.c,v 1.2 2004/03/23 18:36:05 guy Exp $ + * $Id: packet-aim-icq.c,v 1.3 2004/04/20 04:48:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -57,6 +57,13 @@ static const value_string aim_fnac_family_icq[] = { { 0, NULL } }; +#define TLV_ICQ_META_DATA 0x0001 + +static const aim_tlv icq_tlv[] = { + { TLV_ICQ_META_DATA, "Encapsulated ICQ Meta Data", dissect_aim_tlv_value_bytes }, + { 0, "Unknown", NULL }, +}; + /* Initialize the protocol and registered fields */ static int proto_aim_icq = -1; @@ -72,6 +79,7 @@ static int dissect_aim_icq(tvbuff_t *tvb, packet_info *pinfo, case FAMILY_ICQ_ERROR: return dissect_aim_snac_error(tvb, pinfo, offset, tree); case FAMILY_ICQ_LOGINREQUEST: + return dissect_aim_tlv_specific(tvb, pinfo, offset, tree, icq_tlv); case FAMILY_ICQ_LOGINRESPONSE: case FAMILY_ICQ_AUTHREQUEST: case FAMILY_ICQ_AUTHRESPONSE: @@ -87,9 +95,8 @@ proto_register_aim_icq(void) { /* Setup list of header fields */ -/*FIXME static hf_register_info hf[] = { - };*/ + }; /* Setup protocol subtree array */ static gint *ett[] = { @@ -100,8 +107,7 @@ proto_register_aim_icq(void) proto_aim_icq = proto_register_protocol("AIM ICQ", "AIM ICQ", "aim_icq"); /* Required function calls to register the header fields and subtrees used */ -/*FIXME - proto_register_field_array(proto_aim_icq, hf, array_length(hf));*/ + proto_register_field_array(proto_aim_icq, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } |