diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-04-20 04:48:32 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-04-20 04:48:32 +0000 |
| commit | f1e0d0f2ba034f510ac18f8774febaff3cb5fd10 (patch) | |
| tree | 7f1a689ae20bd4901af9c3f2f0885fc2966821b3 /packet-aim-directory.c | |
| parent | c201f90fea7df8af7dc4186f4b788e79e61c479f (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10646 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-aim-directory.c')
| -rw-r--r-- | packet-aim-directory.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/packet-aim-directory.c b/packet-aim-directory.c index 7e15c98674..f040c4d6b1 100644 --- a/packet-aim-directory.c +++ b/packet-aim-directory.c @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection, SNAC Directory * Copyright 2004, Jelmer Vernooij <jelmer@samba.org> * - * $Id: packet-aim-directory.c,v 1.2 2004/03/23 18:36:05 guy Exp $ + * $Id: packet-aim-directory.c,v 1.3 2004/04/20 04:48:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -57,6 +57,32 @@ static const value_string aim_fnac_family_directory[] = { }; static int proto_aim_directory = -1; +static int ett_aim_directory = -1; + +static int dissect_aim_directory(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + struct aiminfo *aiminfo = pinfo->private_data; + proto_item *ti; + proto_tree *directory_tree = NULL; + + if(tree) { + ti = proto_tree_add_text(tree, tvb, 0, -1, "Directory Service"); + directory_tree = proto_item_add_subtree(ti, ett_aim_directory); + } + + switch(aiminfo->subtype) { + case FAMILY_DIRECTORY_ERROR: + return dissect_aim_snac_error(tvb, pinfo, 0, directory_tree); + case FAMILY_DIRECTORY_INTERESTS_LIST_REQ: + return 0; + case FAMILY_DIRECTORY_SEARCH_USER_REQ: + case FAMILY_DIRECTORY_SEARCH_USER_REPL: + case FAMILY_DIRECTORY_INTERESTS_LIST_REP: + /* FIXME */ + return 0; + } + return 0; +} /* Register the protocol with Ethereal */ void @@ -69,24 +95,23 @@ proto_register_aim_directory(void) };*/ /* Setup protocol subtree array */ -/*FIXME static gint *ett[] = { - };*/ + &ett_aim_directory + }; /* Register the protocol name and description */ proto_aim_directory = proto_register_protocol("AIM Directory Search", "AIM Directory", "aim_dir"); /* Required function calls to register the header fields and subtrees used */ /*FIXME proto_register_field_array(proto_aim_directory, hf, array_length(hf));*/ -/*FIXME - proto_register_subtree_array(ett, array_length(ett));*/ + proto_register_subtree_array(ett, array_length(ett)); } void proto_reg_handoff_aim_directory(void) { -/*FIXME: dissector_handle_t aim_handle; + dissector_handle_t aim_handle; aim_handle = new_create_dissector_handle(dissect_aim_directory, proto_aim_directory); - dissector_add("aim.family", FAMILY_DIRECTORY, aim_handle); */ + dissector_add("aim.family", FAMILY_DIRECTORY, aim_handle); aim_init_family(FAMILY_DIRECTORY, "Directory", aim_fnac_family_directory); } |