Added Nathan's patch to yahoo dissector.

Fixes a field name problem, and adds one more service type.

svn path=/trunk/; revision=893
This commit is contained in:
Gilbert Ramirez 1999-10-20 16:36:08 +00:00
parent 1b0fc805f7
commit e5670af33d
2 changed files with 6 additions and 4 deletions

View File

@ -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,

View File

@ -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 <gerald@zing.org>
@ -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