From e5670af33daf067ea4829c2996f77d6999ec8520 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Wed, 20 Oct 1999 16:36:08 +0000 Subject: Added Nathan's patch to yahoo dissector. Fixes a field name problem, and adds one more service type. svn path=/trunk/; revision=893 --- packet-yhoo.c | 6 ++++-- packet-yhoo.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packet-yhoo.c b/packet-yhoo.c index 0f93f2d189..acc146cc6e 100644 --- a/packet-yhoo.c +++ b/packet-yhoo.c @@ -2,7 +2,7 @@ * Routines for yahoo messenger packet dissection * Copyright 1999, Nathan Neulinger * - * $Id: packet-yhoo.c,v 1.2 1999/10/14 03:12:32 guy Exp $ + * $Id: packet-yhoo.c,v 1.3 1999/10/20 16:36:07 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -82,10 +82,12 @@ static const value_string yhoo_service_vals[] = { {YAHOO_SERVICE_CONFDECLINE, "Conference Decline"}, {YAHOO_SERVICE_CONFLOGOFF, "Conference Logoff"}, {YAHOO_SERVICE_CONFMSG, "Conference Message"}, + {YAHOO_SERVICE_CONFADDINVITE, "Conference Additional Invitation"}, {YAHOO_SERVICE_CHATLOGON, "Chat Logon"}, {YAHOO_SERVICE_CHATLOGOFF, "Chat Logoff"}, {YAHOO_SERVICE_CHATMSG, "Chat Message"}, {YAHOO_SERVICE_FILETRANSFER, "File Transfer"}, + {YAHOO_SERVICE_PASSTHROUGH2, "Passthrough 2"}, {0, NULL} }; @@ -165,7 +167,7 @@ proto_register_yhoo(void) "Magic ID", "yhoo.magic_id", FT_UINT32, BASE_HEX, NULL, 0, "Magic ID" }}, { &hf_yhoo_unknown1, { - "Connection ID", "yhoo.unknown1", FT_UINT32, BASE_HEX, + "Unknown 1", "yhoo.unknown1", FT_UINT32, BASE_HEX, NULL, 0, "Unknown 1" }}, { &hf_yhoo_len, { "Packet Length", "yhoo.len", FT_UINT32, BASE_DEC, diff --git a/packet-yhoo.h b/packet-yhoo.h index d6c7222f41..c5afb262d3 100644 --- a/packet-yhoo.h +++ b/packet-yhoo.h @@ -1,7 +1,7 @@ /* packet-yhoo.h * Definitions for packet disassembly structures and routines * - * $Id: packet-yhoo.h,v 1.3 1999/10/16 21:56:53 deniel Exp $ + * $Id: packet-yhoo.h,v 1.4 1999/10/20 16:36:08 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -55,7 +55,7 @@ #define YAHOO_SERVICE_CONFLOGON 25 #define YAHOO_SERVICE_CONFDECLINE 26 #define YAHOO_SERVICE_CONFLOGOFF 27 -#define YAHOO_SERVICE_UNKN_28 28 +#define YAHOO_SERVICE_CONFADDINVITE 28 #define YAHOO_SERVICE_CONFMSG 29 #define YAHOO_SERVICE_CHATLOGON 30 #define YAHOO_SERVICE_CHATLOGOFF 31 -- cgit v1.2.3