From 0da2197ace30abd768546fd9e82f083a3cb4c5ef Mon Sep 17 00:00:00 2001 From: etxrab Date: Tue, 4 Oct 2005 05:36:31 +0000 Subject: From John Sullivan: The current ethereal eDonkey dissector fails to handle a number of valid packet types - in particular the normal server<->client communication between current eserver and eMule versions (from both sides) produces packets which ethereal incorrectly claims to be malformed. This patch fills in these holes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16107 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-edonkey.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'epan/dissectors/packet-edonkey.h') diff --git a/epan/dissectors/packet-edonkey.h b/epan/dissectors/packet-edonkey.h index 21bb2e6c60..55cc022aad 100644 --- a/epan/dissectors/packet-edonkey.h +++ b/epan/dissectors/packet-edonkey.h @@ -157,6 +157,12 @@ void proto_register_edonkey(void); #define EDONKEY_MTAG_BOOL 0x05 #define EDONKEY_MTAG_BOOL_ARRAY 0x06 #define EDONKEY_MTAG_BLOB 0x07 +#define EDONKEY_MTAG_WORD 0x08 +#define EDONKEY_MTAG_BYTE 0x09 +#define EDONKEY_MTAG_BSOB 0x0a +#define EDONKEY_MTAG_STR1 0x11 +#define EDONKEY_MTAG_STR16 0x20 +#define EDONKEY_MTAG_SHORTNAME 0x80 /* EDONKEY SPECIAL TAGS */ #define EDONKEY_STAG_UNKNOWN 0x00 @@ -183,6 +189,7 @@ void proto_register_edonkey(void); #define EDONKEY_STAG_AVAILABILITY 0x15 #define EDONKEY_STAG_QTIME 0x16 #define EDONKEY_STAG_PARTS 0x17 +#define EDONKEY_STAG_MOD_VERSION 0x55 /* EMULE SPECIAL TAGS */ #define EMULE_STAG_COMPRESSION 0x20 @@ -192,6 +199,13 @@ void proto_register_edonkey(void); #define EMULE_STAG_COMMENTS 0x24 #define EMULE_STAG_EXTENDED_REQUEST 0x25 #define EMULE_STAG_COMPATIBLE_CLIENT 0x26 +#define EMULE_STAG_COMPAT_OPTIONS1 0xef +#define EMULE_STAG_UDPPORTS 0xf9 +#define EMULE_STAG_MISCOPTIONS1 0xfa +#define EMULE_STAG_VERSION 0xfb +#define EMULE_STAG_BUDDYIP 0xfc +#define EMULE_STAG_BUDDYUDP 0xfd +#define EMULE_STAG_MISCOPTIONS2 0xfe /* EDONKEY SEARCH TYPES */ #define EDONKEY_SEARCH_BOOL 0x00 -- cgit v1.2.3