aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ipx.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-10-18 21:00:01 +0000
committerGuy Harris <guy@alum.mit.edu>2002-10-18 21:00:01 +0000
commit27df774d0b8e57ae9ee7e5589d7e4cc9a54268e1 (patch)
tree6584b5fe66afe4a5adb5bda9211cf61ed2a3c6ce /packet-ipx.c
parent5b99f89521eb3b4a08cc274163736b667a8e76cc (diff)
downloadwireshark-27df774d0b8e57ae9ee7e5589d7e4cc9a54268e1.tar.gz
wireshark-27df774d0b8e57ae9ee7e5589d7e4cc9a54268e1.tar.bz2
wireshark-27df774d0b8e57ae9ee7e5589d7e4cc9a54268e1.zip
From Peter Fales: ARCNET support.
Sort the lists of dissectors in the DISSECTOR_SRC macros in "Makefile.am" and "Makefile.nmake". svn path=/trunk/; revision=6450
Diffstat (limited to 'packet-ipx.c')
-rw-r--r--packet-ipx.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/packet-ipx.c b/packet-ipx.c
index 142639dc33..ca01159c36 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-ipx.c,v 1.114 2002/10/15 04:30:58 guy Exp $
+ * $Id: packet-ipx.c,v 1.115 2002/10/18 20:59:57 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,6 +37,7 @@
#include "ppptypes.h"
#include "llcsaps.h"
#include "aftypes.h"
+#include "arcnet_pids.h"
/* The information in this module (IPX, SPX, NCP) comes from:
NetWare LAN Analysis, Second Edition
@@ -1078,14 +1079,20 @@ proto_reg_handoff_ipx(void)
dissector_add("llc.dsap", SAP_NETWARE, ipx_handle);
dissector_add("null.type", BSD_AF_IPX, ipx_handle);
dissector_add("gre.proto", ETHERTYPE_IPX, ipx_handle);
+ dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPX, ipx_handle);
+
spx_handle = create_dissector_handle(dissect_spx, proto_spx);
dissector_add("ipx.packet_type", IPX_PACKET_TYPE_SPX, spx_handle);
+
ipxsap_handle = find_dissector("ipxsap");
dissector_add("ipx.socket", IPX_SOCKET_SAP, ipxsap_handle);
+
ipxrip_handle = create_dissector_handle(dissect_ipxrip, proto_ipxrip);
dissector_add("ipx.socket", IPX_SOCKET_IPXRIP, ipxrip_handle);
+
ipxmsg_handle = create_dissector_handle(dissect_ipxmsg, proto_ipxmsg);
dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE, ipxmsg_handle);
dissector_add("ipx.socket", IPX_SOCKET_IPX_MESSAGE1, ipxmsg_handle);
+
data_handle = find_dissector("data");
}