aboutsummaryrefslogtreecommitdiffstats
path: root/packet-yhoo.c
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-10-20 16:36:08 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-10-20 16:36:08 +0000
commite5670af33daf067ea4829c2996f77d6999ec8520 (patch)
tree17a963b84cc15de38ece181e79850352d712c76a /packet-yhoo.c
parent1b0fc805f7575a9d68be3f3a13b4716851a21ac0 (diff)
Added Nathan's patch to yahoo dissector.
Fixes a field name problem, and adds one more service type. svn path=/trunk/; revision=893
Diffstat (limited to 'packet-yhoo.c')
-rw-r--r--packet-yhoo.c6
1 files changed, 4 insertions, 2 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 <nneul@umr.edu>
*
- * $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 <gerald@unicom.net>
@@ -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,