/* packet-ipx.c
* Routines for NetWare's IPX
- * Gilbert Ramirez <gram@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
+ * NDPS support added by Greg Morris (gmorris@novell.com)
*
- * $Id: packet-ipx.c,v 1.59 2000/05/22 18:09:36 guy Exp $
+ * Portions Copyright (c) 2000-2002 by Gilbert Ramirez.
+ * Portions Copyright (c) Novell, Inc. 2002-2003
+ *
+ * $Id: packet-ipx.c,v 1.136 2003/08/24 05:37:57 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
- *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
#include <stdio.h>
+#include <string.h>
#include <glib.h>
+#include <epan/packet.h>
+#include "packet-ipx.h"
+#include <epan/resolv.h>
#include "etypes.h"
#include "ppptypes.h"
#include "llcsaps.h"
-#include "packet.h"
-#include "packet-ipx.h"
-#include "packet-nbipx.h"
-#include "packet-ncp.h"
-#include "packet-eigrp.h"
-#include "resolv.h"
+#include "aftypes.h"
+#include "arcnet_pids.h"
+#include <epan/conversation.h>
+#include "tap.h"
+
+static int ipx_tap = -1;
-#include "packet-snmp.h"
+#define SPX_PACKET_INIT_COUNT 200
/* The information in this module (IPX, SPX, NCP) comes from:
NetWare LAN Analysis, Second Edition
And from the ncpfs source code by Volker Lendecke
*/
-
+
static int proto_ipx = -1;
static int hf_ipx_checksum = -1;
static int hf_ipx_len = -1;
static int hf_ipx_snet = -1;
static int hf_ipx_snode = -1;
static int hf_ipx_ssocket = -1;
+static int hf_ipx_net = -1;
+static int hf_ipx_node = -1;
+static int hf_ipx_socket = -1;
static gint ett_ipx = -1;
+static dissector_table_t ipx_type_dissector_table;
+static dissector_table_t ipx_socket_dissector_table;
+static dissector_table_t spx_socket_dissector_table;
+
static int proto_spx = -1;
static int hf_spx_connection_control = -1;
+static int hf_spx_connection_control_sys = -1;
+static int hf_spx_connection_control_send_ack = -1;
+static int hf_spx_connection_control_attn = -1;
+static int hf_spx_connection_control_eom = -1;
static int hf_spx_datastream_type = -1;
static int hf_spx_src_id = -1;
static int hf_spx_dst_id = -1;
static int hf_spx_seq_nr = -1;
static int hf_spx_ack_nr = -1;
static int hf_spx_all_nr = -1;
+static int hf_spx_rexmt_frame = -1;
static gint ett_spx = -1;
+static gint ett_spx_connctrl = -1;
static int proto_ipxrip = -1;
static int hf_ipxrip_request = -1;
static int hf_msg_conn = -1;
static int hf_msg_sigchar = -1;
-static void
-dissect_spx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
+static dissector_handle_t data_handle;
static void
-dissect_ipxrip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
+dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void
-dissect_ipxsap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
+dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void
-dissect_ipxmsg(const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
+dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void
-dissect_eigrp_ipx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree);
-
-typedef void (dissect_func_t)(const u_char *, int, frame_data *, proto_tree *);
+dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
#define UDP_PORT_IPX 213 /* RFC 1234 */
-struct port_info {
- guint16 port;
- dissect_func_t *func;
- char *text;
-};
-
-struct conn_info {
- guint8 ctrl;
- char *text;
-};
-
-struct server_info {
- guint16 type;
- char *text;
-};
+#define IPX_HEADER_LEN 30 /* It's *always* 30 bytes */
/* ================================================================= */
/* IPX */
/* ================================================================= */
-
-/* info on these sockets can be found in this listing from Novell:
-
- http://developer.novell.com/engsup/sample/tids/dsoc1b/dsoc1b.htm
-*/
-
-#define IPX_SOCKET_PING_CISCO 0x0002 /* In cisco this is set with: ipx ping-default cisco */
-#define IPX_SOCKET_NCP 0x0451
-#define IPX_SOCKET_SAP 0x0452
-#define IPX_SOCKET_IPXRIP 0x0453
-#define IPX_SOCKET_NETBIOS 0x0455
-#define IPX_SOCKET_DIAGNOSTIC 0x0456
-#define IPX_SOCKET_SERIALIZATION 0x0457
-#define IPX_SOCKET_NWLINK_SMB_NAMEQUERY 0x0551
-#define IPX_SOCKET_NWLINK_SMB_DGRAM 0x0553
-#define IPX_SOCKET_NWLINK_SMB_BROWSE 0x0555 /* ? not sure on this
- but I guessed based on the content of the packet I saw */
-#define IPX_SOCKET_ATTACHMATE_GW 0x055d
-#define IPX_SOCKET_IPX_MESSAGE 0x4001
-#define IPX_SOCKET_ADSM 0x8522 /* www.tivoli.com */
-#define IPX_SOCKET_EIGRP 0x85be /* cisco ipx eigrp */
-#define IPX_SOCKET_WIDE_AREA_ROUTER 0x9001
-#define IPX_SOCKET_SNMP_AGENT 0x900F /* RFC 1906 */
-#define IPX_SOCKET_SNMP_SINK 0x9010 /* RFC 1906 */
-#define IPX_SOCKET_PING_NOVELL 0x9086 /* In cisco this is set with: ipx ping-default novell */
-#define IPX_SOCKET_TCP_TUNNEL 0x9091 /* RFC 1791 */
-#define IPX_SOCKET_UDP_TUNNEL 0x9092 /* RFC 1791 */
-
-static struct port_info ports[] = {
-
- { IPX_SOCKET_PING_CISCO, NULL, "CISCO PING" },
- { IPX_SOCKET_NCP, dissect_ncp,
- "NCP" },
- { IPX_SOCKET_SAP, dissect_ipxsap,
- "SAP" },
- { IPX_SOCKET_IPXRIP, dissect_ipxrip,
- "RIP" },
- { IPX_SOCKET_NETBIOS, NULL,
- "NetBIOS" },
- { IPX_SOCKET_DIAGNOSTIC, NULL,
- "Diagnostic" },
- { IPX_SOCKET_SERIALIZATION, NULL,
- "Serialization" },
- { IPX_SOCKET_NWLINK_SMB_NAMEQUERY, NULL,
- "NWLink SMB Name Query" },
- { IPX_SOCKET_NWLINK_SMB_DGRAM, dissect_nwlink_dg,
- "NWLink SMB Datagram" },
- { IPX_SOCKET_NWLINK_SMB_BROWSE, NULL, "NWLink SMB Browse" },
- { IPX_SOCKET_ATTACHMATE_GW, NULL, "Attachmate Gateway" },
- { IPX_SOCKET_IPX_MESSAGE, dissect_ipxmsg, "IPX Message" },
- { IPX_SOCKET_SNMP_AGENT, dissect_snmp, "SNMP Agent" },
- { IPX_SOCKET_SNMP_SINK, dissect_snmp, "SNMP Sink" },
- { IPX_SOCKET_PING_NOVELL, NULL, "NOVELL PING" },
- { IPX_SOCKET_UDP_TUNNEL, NULL, "UDP Tunnel" },
- { IPX_SOCKET_TCP_TUNNEL, NULL, "TCP Tunnel" },
- { IPX_SOCKET_TCP_TUNNEL, NULL, "TCP Tunnel" },
- { IPX_SOCKET_ADSM, NULL, "ADSM" },
- { IPX_SOCKET_EIGRP, dissect_eigrp_ipx, "Cisco EIGRP for IPX" },
- { IPX_SOCKET_WIDE_AREA_ROUTER, NULL, "Wide Area Router" },
- { 0x0000, NULL,
- NULL }
+const value_string ipx_socket_vals[] = {
+ { IPX_SOCKET_PING_CISCO, "CISCO PING" },
+ { IPX_SOCKET_NCP, "NCP" },
+ { IPX_SOCKET_SAP, "SAP" },
+ { IPX_SOCKET_IPXRIP, "RIP" },
+ { IPX_SOCKET_NETBIOS, "NetBIOS" },
+ { IPX_SOCKET_DIAGNOSTIC, "Diagnostic" },
+ { IPX_SOCKET_SERIALIZATION, "Serialization" },
+ { IPX_SOCKET_NWLINK_SMB_SERVER, "NWLink SMB Server" },
+ { IPX_SOCKET_NWLINK_SMB_NAMEQUERY, "NWLink SMB Name Query" },
+ { IPX_SOCKET_NWLINK_SMB_REDIR, "NWLink SMB Redirector" },
+ { IPX_SOCKET_NWLINK_SMB_MAILSLOT, "NWLink SMB Mailslot Datagram" },
+ { IPX_SOCKET_NWLINK_SMB_MESSENGER, "NWLink SMB Messenger" },
+ { IPX_SOCKET_NWLINK_SMB_BROWSE, "NWLink SMB Browse" },
+ { IPX_SOCKET_ATTACHMATE_GW, "Attachmate Gateway" },
+ { IPX_SOCKET_IPX_MESSAGE, "IPX Message" },
+ { IPX_SOCKET_IPX_MESSAGE1, "IPX Message" },
+ { IPX_SOCKET_SNMP_AGENT, "SNMP Agent" },
+ { IPX_SOCKET_SNMP_SINK, "SNMP Sink" },
+ { IPX_SOCKET_PING_NOVELL, "Novell PING" },
+ { IPX_SOCKET_UDP_TUNNEL, "UDP Tunnel" },
+ { IPX_SOCKET_TCP_TUNNEL, "TCP Tunnel" },
+ { IPX_SOCKET_TCP_TUNNEL, "TCP Tunnel" },
+ { IPX_SOCKET_ADSM, "ADSM" },
+ { IPX_SOCKET_EIGRP, "Cisco EIGRP for IPX" },
+ { IPX_SOCKET_NLSP, "NetWare Link Services Protocol" },
+ { IPX_SOCKET_IPXWAN, "IPX WAN" },
+ { SPX_SOCKET_PA, "NDPS Printer Agent/PSM" },
+ { SPX_SOCKET_BROKER, "NDPS Broker" },
+ { SPX_SOCKET_SRS, "NDPS Service Registry Service" },
+ { SPX_SOCKET_ENS, "NDPS Event Notification Service" },
+ { SPX_SOCKET_RMS, "NDPS Remote Management Service" },
+ { SPX_SOCKET_NOTIFY_LISTENER, "NDPS Notify Listener" },
+ { 0xE885, "NT Server-RPC/GW" },
+ { 0x400C, "HP LaserJet/QuickSilver" },
+ { 0x907B, "SMS Testing and Development" },
+ { 0x8F83, "Powerchute UPS Monitoring" },
+ { 0x4006, "NetWare Directory Server" },
+ { 0x8104, "NetWare 386" },
+ { 0x0000, NULL }
};
-static char*
-port_text(guint16 port) {
- int i=0;
-
- while (ports[i].text != NULL) {
- if (ports[i].port == port) {
- return ports[i].text;
- }
- i++;
- }
- return "Unknown";
-}
-
-static dissect_func_t*
-port_func(guint16 port) {
- int i=0;
-
- while (ports[i].text != NULL) {
- if (ports[i].port == port) {
- return ports[i].func;
- }
- i++;
- }
- return NULL;
+static const char*
+socket_text(guint16 socket)
+{
+ return val_to_str(socket, ipx_socket_vals, "Unknown");
}
-/*
- * From:
- *
- * http://alr.base2co.com:457/netguide/dipxD.ipx_packet_struct.html
- *
- * which is part of SCO's "Network Programmer's Guide and Reference".
- *
- * It calls type 20 "NetBIOS name packet". Microsoft Network Monitor
- * calls it "WAN Broadcast"; it's also used for SMB browser announcements,
- * i.e. NetBIOS (broadcast) datagrams.
- */
-#define IPX_PACKET_TYPE_IPX 0
-#define IPX_PACKET_TYPE_RIP 1
-#define IPX_PACKET_TYPE_ECHO 2
-#define IPX_PACKET_TYPE_ERROR 3
-#define IPX_PACKET_TYPE_PEP 4
-#define IPX_PACKET_TYPE_SPX 5
-#define IPX_PACKET_TYPE_NCP 17
-#define IPX_PACKET_TYPE_WANBCAST 20 /* propagated NetBIOS packet? */
-
static const value_string ipx_packet_type_vals[] = {
{ IPX_PACKET_TYPE_IPX, "IPX" },
{ IPX_PACKET_TYPE_RIP, "RIP" },
static const value_string ipxmsg_sigchar_vals[] = {
{ '?', "Poll inactive station" },
+ { 'Y', "Station is still using the connection" },
+ { '!', "Broadcast message waiting" },
{ 0, NULL }
};
-gchar*
-ipxnet_to_string(const guint8 *ad)
+void
+capture_ipx(packet_counts *ld)
{
- guint32 addr = pntohl(ad);
- return ipxnet_to_str_punct(addr, ' ');
+ ld->ipx++;
}
-/* We use a different representation of hardware addresses
- * than ether_to_str(); we don't put punctuation between the hex
- * digits.
- */
-
-gchar*
-ipx_addr_to_str(guint32 net, const guint8 *ad)
+static void
+dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- static gchar str[3][8+1+MAXNAMELEN+1]; /* 8 digits, 1 period, NAME, 1 null */
- static gchar *cur;
- char *name;
-
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
+ tvbuff_t *next_tvb;
+
+ proto_tree *ipx_tree = NULL;
+ proto_item *ti = NULL;
+
+ const guint8 *src_net_node, *dst_net_node;
+
+ guint8 ipx_hops;
+
+ guint16 first_socket, second_socket;
+ guint32 ipx_snet, ipx_dnet;
+ const guint8 *ipx_snode, *ipx_dnode;
+ static ipxhdr_t ipxh_arr[4];
+ static int ipx_current=0;
+ ipxhdr_t *ipxh;
+
+ ipx_current++;
+ if(ipx_current==4){
+ ipx_current=0;
}
+ ipxh=&ipxh_arr[ipx_current];
+
+
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ /* Calculate here for use in pinfo and in tree */
+ ipxh->ipx_dsocket = tvb_get_ntohs(tvb, 16);
+ ipxh->ipx_ssocket = tvb_get_ntohs(tvb, 28);
+ ipxh->ipx_type = tvb_get_guint8(tvb, 5);
+ ipxh->ipx_length = tvb_get_ntohs(tvb, 2);
- name = get_ether_name_if_known(ad);
+ pinfo->ptype = PT_IPX;
+ pinfo->srcport = ipxh->ipx_ssocket;
+ pinfo->destport = ipxh->ipx_dsocket;
+
+ /* Adjust the tvbuff length to include only the IPX datagram. */
+ set_actual_length(tvb, ipxh->ipx_length);
+
+ src_net_node = tvb_get_ptr(tvb, 18, 10);
+ dst_net_node = tvb_get_ptr(tvb, 6, 10);
+
+ SET_ADDRESS(&pinfo->net_src, AT_IPX, 10, src_net_node);
+ SET_ADDRESS(&pinfo->src, AT_IPX, 10, src_net_node);
+ SET_ADDRESS(&ipxh->ipx_src, AT_IPX, 10, src_net_node);
+ SET_ADDRESS(&pinfo->net_dst, AT_IPX, 10, dst_net_node);
+ SET_ADDRESS(&pinfo->dst, AT_IPX, 10, dst_net_node);
+ SET_ADDRESS(&ipxh->ipx_dst, AT_IPX, 10, dst_net_node);
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s (0x%04x)",
+ socket_text(ipxh->ipx_dsocket), ipxh->ipx_dsocket);
+
+ if (tree) {
- if (name) {
- sprintf(cur, "%s.%s", get_ipxnet_name(net), name);
+ ti = proto_tree_add_item(tree, proto_ipx, tvb, 0, IPX_HEADER_LEN, FALSE);
+ ipx_tree = proto_item_add_subtree(ti, ett_ipx);
}
- else {
- sprintf(cur, "%s.%s", get_ipxnet_name(net), ether_to_str_punct(ad, '\0'));
+
+ proto_tree_add_item(ipx_tree, hf_ipx_checksum, tvb, 0, 2, FALSE);
+ proto_tree_add_uint_format(ipx_tree, hf_ipx_len, tvb, 2, 2, ipxh->ipx_length,
+ "Length: %d bytes", ipxh->ipx_length);
+ ipx_hops = tvb_get_guint8(tvb, 4);
+ proto_tree_add_uint_format(ipx_tree, hf_ipx_hops, tvb, 4, 1, ipx_hops,
+ "Transport Control: %d hops", ipx_hops);
+ proto_tree_add_uint(ipx_tree, hf_ipx_packet_type, tvb, 5, 1, ipxh->ipx_type);
+
+ /* Destination */
+ ipx_dnet = tvb_get_ntohl(tvb, 6);
+ proto_tree_add_ipxnet(ipx_tree, hf_ipx_dnet, tvb, 6, 4,
+ ipx_dnet);
+ proto_tree_add_ipxnet_hidden(ipx_tree, hf_ipx_net, tvb, 6, 4,
+ ipx_dnet);
+ ipx_dnode = tvb_get_ptr(tvb, 10, 6);
+ proto_tree_add_ether(ipx_tree, hf_ipx_dnode, tvb, 10, 6,
+ ipx_dnode);
+ proto_tree_add_ether_hidden(ipx_tree, hf_ipx_node, tvb, 10, 6,
+ ipx_dnode);
+ proto_tree_add_uint(ipx_tree, hf_ipx_dsocket, tvb, 16, 2,
+ ipxh->ipx_dsocket);
+ proto_tree_add_uint_hidden(ipx_tree, hf_ipx_socket, tvb, 16, 2,
+ ipxh->ipx_dsocket);
+
+ /* Source */
+ ipx_snet = tvb_get_ntohl(tvb, 18);
+ proto_tree_add_ipxnet(ipx_tree, hf_ipx_snet, tvb, 18, 4,
+ ipx_snet);
+ proto_tree_add_ipxnet_hidden(ipx_tree, hf_ipx_net, tvb, 18, 4,
+ ipx_snet);
+ ipx_snode = tvb_get_ptr(tvb, 22, 6);
+ proto_tree_add_ether(ipx_tree, hf_ipx_snode, tvb, 22, 6,
+ ipx_snode);
+ proto_tree_add_ether_hidden(ipx_tree, hf_ipx_node, tvb, 22, 6,
+ ipx_snode);
+ proto_tree_add_uint(ipx_tree, hf_ipx_ssocket, tvb, 28, 2,
+ ipxh->ipx_ssocket);
+ proto_tree_add_uint_hidden(ipx_tree, hf_ipx_socket, tvb, 28, 2,
+ ipxh->ipx_ssocket);
+
+ /* Make the next tvbuff */
+ next_tvb = tvb_new_subset(tvb, IPX_HEADER_LEN, -1, -1);
+
+ /*
+ * Let the subdissector know what type of IPX packet this is.
+ */
+ pinfo->ipxptype = ipxh->ipx_type;
+
+ /*
+ * Check the socket numbers before we check the packet type;
+ * we've seen non-NCP packets with a type of NCP and a
+ * destination socket of IPX_SOCKET_IPX_MESSAGE, and SAP
+ * packets with a type of NCP and a destination socket of
+ * IPX_SOCKET_SAP.
+ *
+ * We've seen NCP packets with a type of NCP, a source socket of
+ * IPX_SOCKET_NCP, and a destination socket of IPX_SOCKET_IPX_MESSAGE,
+ * and we've seen NCP packets with a type of NCP, a source socket of
+ * IPX_SOCKET_IPX_MESSAGE, and a destination socket of
+ * IPX_SOCKET_NCP, so testing the destination socket first doesn't
+ * always give the right answer. We've also seen SAP packets with
+ * a source socket of IPX_SOCKET_SAP and a destination socket of
+ * IPX_SOCKET_IPX_MESSAGE.
+ *
+ * Unfortunately, we've also seen packets with a source socket
+ * of IPX_SOCKET_NWLINK_SMB_SERVER and a destination socket
+ * of IPX_SOCKET_NWLINK_SMB_NAMEQUERY that were NMPI packets,
+ * not SMB packets, so testing the lower-valued socket first
+ * also doesn't always give the right answer.
+ *
+ * So we start out assuming we should test the lower-numbered
+ * socket number first, but, if the higher-numbered socket is
+ * IPX_SOCKET_NWLINK_SMB_NAMEQUERY, we assume that it's a
+ * NMPI query, and test only that socket.
+ */
+ if (ipxh->ipx_ssocket > ipxh->ipx_dsocket) {
+ first_socket = ipxh->ipx_dsocket;
+ second_socket = ipxh->ipx_ssocket;
+ } else {
+ first_socket = ipxh->ipx_ssocket;
+ second_socket = ipxh->ipx_dsocket;
}
- return cur;
+
+ tap_queue_packet(ipx_tap, pinfo, ipxh);
+
+ if (second_socket != IPX_SOCKET_NWLINK_SMB_NAMEQUERY) {
+ if (dissector_try_port(ipx_socket_dissector_table, first_socket,
+ next_tvb, pinfo, tree))
+ return;
+ }
+ if (dissector_try_port(ipx_socket_dissector_table, second_socket,
+ next_tvb, pinfo, tree))
+ return;
+
+ /*
+ * Neither of them are known; try the packet type, which will
+ * at least let us, for example, dissect SPX packets as SPX.
+ */
+ if (dissector_try_port(ipx_type_dissector_table, ipxh->ipx_type, next_tvb,
+ pinfo, tree))
+ return;
+
+ call_dissector(data_handle,next_tvb, pinfo, tree);
}
+/* ================================================================= */
+/* SPX Hash Functions */
+/* ================================================================= */
+
+typedef struct {
+ conversation_t *conversation;
+ guint32 spx_src;
+ guint16 spx_seq;
+} spx_hash_key;
-gchar *
-ipxnet_to_str_punct(const guint32 ad, char punct) {
- static gchar str[3][12];
- static gchar *cur;
- gchar *p;
- int i;
- guint32 octet;
- static const gchar hex_digits[16] = "0123456789ABCDEF";
- static const guint32 octet_mask[4] =
- { 0xff000000 , 0x00ff0000, 0x0000ff00, 0x000000ff };
-
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
- p = &cur[12];
- *--p = '\0';
- i = 3;
- for (;;) {
- octet = (ad & octet_mask[i]) >> ((3 - i) * 8);
- *--p = hex_digits[octet&0xF];
- octet >>= 4;
- *--p = hex_digits[octet&0xF];
- if (i == 0)
- break;
- if (punct)
- *--p = punct;
- i--;
- }
- return p;
+typedef struct {
+ guint16 spx_ack;
+ guint16 spx_all;
+ guint32 num;
+} spx_hash_value;
+
+/*
+ * Structure attached to retransmitted SPX frames; it contains the
+ * frame number of the original transmission.
+ */
+typedef struct {
+ guint32 num;
+} spx_rexmit_info;
+
+static GHashTable *spx_hash = NULL;
+static GMemChunk *spx_hash_keys = NULL;
+static GMemChunk *spx_hash_values = NULL;
+static GMemChunk *spx_rexmit_infos = NULL;
+
+/* Hash Functions */
+gint
+spx_equal(gconstpointer v, gconstpointer v2)
+{
+ const spx_hash_key *val1 = (const spx_hash_key*)v;
+ const spx_hash_key *val2 = (const spx_hash_key*)v2;
+
+ if (val1->conversation == val2->conversation &&
+ val1->spx_src == val2->spx_src &&
+ val1->spx_seq == val2->spx_seq) {
+ return 1;
+ }
+ return 0;
}
-void
-capture_ipx(const u_char *pd, int offset, packet_counts *ld)
+guint
+spx_hash_func(gconstpointer v)
{
- ld->ipx++;
+ const spx_hash_key *spx_key = (const spx_hash_key*)v;
+ return GPOINTER_TO_UINT(spx_key->conversation) + spx_key->spx_src;
}
-void
-dissect_ipx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+/* Initializes the hash table and the mem_chunk area each time a new
+ * file is loaded or re-loaded in ethereal */
+static void
+spx_init_protocol(void)
+{
- proto_tree *ipx_tree;
- proto_item *ti;
- guint8 ipx_type, ipx_hops;
- guint16 ipx_checksum, ipx_length;
- int len;
- guint8 *ipx_snode, *ipx_dnode, *ipx_snet, *ipx_dnet;
+ if (spx_hash)
+ g_hash_table_destroy(spx_hash);
+ if (spx_hash_keys)
+ g_mem_chunk_destroy(spx_hash_keys);
+ if (spx_hash_values)
+ g_mem_chunk_destroy(spx_hash_values);
+ if (spx_rexmit_infos)
+ g_mem_chunk_destroy(spx_rexmit_infos);
+
+ spx_hash = g_hash_table_new(spx_hash_func, spx_equal);
+ spx_hash_keys = g_mem_chunk_new("spx_hash_keys",
+ sizeof(spx_hash_key),
+ SPX_PACKET_INIT_COUNT * sizeof(spx_hash_key),
+ G_ALLOC_ONLY);
+ spx_hash_values = g_mem_chunk_new("spx_hash_values",
+ sizeof(spx_hash_value),
+ SPX_PACKET_INIT_COUNT * sizeof(spx_hash_value),
+ G_ALLOC_ONLY);
+ spx_rexmit_infos = g_mem_chunk_new("spx_rexmit_infos",
+ sizeof(spx_rexmit_infos),
+ SPX_PACKET_INIT_COUNT * sizeof(spx_rexmit_infos),
+ G_ALLOC_ONLY);
+}
- guint16 ipx_dsocket, ipx_ssocket;
- dissect_func_t *dissect;
- guint32 ipx_dnet_val, ipx_snet_val;
+/* After the sequential run, we don't need the spx hash table, or
+ * the keys and values, anymore; the lookups have already been done
+ * and the relevant info saved as SPX private data with the frame
+ * if the frame was a retransmission. */
+static void
+spx_postseq_cleanup(void)
+{
+ if (spx_hash) {
+ /* Destroy the hash, but don't clean up request_condition data. */
+ g_hash_table_destroy(spx_hash);
+ spx_hash = NULL;
+ }
+ if (spx_hash_keys) {
+ g_mem_chunk_destroy(spx_hash_keys);
+ spx_hash_keys = NULL;
+ }
+ if (spx_hash_values) {
+ g_mem_chunk_destroy(spx_hash_values);
+ spx_hash_values = NULL;
+ }
+ /* Don't free the spx_rexmit_infos, as they're
+ * needed during random-access processing of the proto_tree.*/
+}
- /* Calculate here for use in pinfo and in tree */
- ipx_dnet = (guint8*)&pd[offset+6];
- ipx_snet = (guint8*)&pd[offset+18];
- ipx_dnet_val = pntohl(ipx_dnet);
- ipx_snet_val = pntohl(ipx_snet);
- ipx_dsocket = pntohs(&pd[offset+16]);
- ipx_ssocket = pntohs(&pd[offset+28]);
- ipx_dnode = (guint8*)&pd[offset+10];
- ipx_snode = (guint8*)&pd[offset+22];
- ipx_type = pd[offset+5];
- ipx_length = pntohs(&pd[offset+2]);
-
- /* Length of IPX datagram plus headers above it. */
- len = ipx_length + offset;
-
- /* Set the payload and captured-payload lengths to the minima of
- (the IPX length plus the length of the headers above it) and
- the frame lengths. */
- if (pi.len > len)
- pi.len = len;
- if (pi.captured_len > len)
- pi.captured_len = len;
-
- SET_ADDRESS(&pi.net_src, AT_IPX, 10, &pd[offset+18]);
- SET_ADDRESS(&pi.src, AT_IPX, 10, &pd[offset+18]);
- SET_ADDRESS(&pi.net_dst, AT_IPX, 10, &pd[offset+6]);
- SET_ADDRESS(&pi.dst, AT_IPX, 10, &pd[offset+6]);
-
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "IPX");
- if (check_col(fd, COL_INFO))
- col_add_fstr(fd, COL_INFO, "%s (0x%04X)", port_text(ipx_dsocket),
- ipx_dsocket);
+spx_hash_value*
+spx_hash_insert(conversation_t *conversation, guint32 spx_src, guint16 spx_seq)
+{
+ spx_hash_key *key;
+ spx_hash_value *value;
- if (tree) {
- ipx_checksum = pntohs(&pd[offset]);
- ipx_hops = pd[offset+4];
+ /* Now remember the packet, so we can find it if we later. */
+ key = g_mem_chunk_alloc(spx_hash_keys);
+ key->conversation = conversation;
+ key->spx_src = spx_src;
+ key->spx_seq = spx_seq;
- ti = proto_tree_add_item(tree, proto_ipx, NullTVB, offset, 30, NULL);
- ipx_tree = proto_item_add_subtree(ti, ett_ipx);
- proto_tree_add_item(ipx_tree, hf_ipx_checksum, NullTVB, offset, 2, ipx_checksum);
- proto_tree_add_uint_format(ipx_tree, hf_ipx_len, NullTVB, offset+2, 2, ipx_length,
- "Length: %d bytes", ipx_length);
- proto_tree_add_uint_format(ipx_tree, hf_ipx_hops, NullTVB, offset+4, 1, ipx_hops,
- "Transport Control: %d hops", ipx_hops);
- proto_tree_add_item(ipx_tree, hf_ipx_packet_type, NullTVB, offset+5, 1, ipx_type);
- proto_tree_add_item(ipx_tree, hf_ipx_dnet, NullTVB, offset+6, 4, ipx_dnet_val);
- proto_tree_add_item(ipx_tree, hf_ipx_dnode, NullTVB, offset+10, 6, ipx_dnode);
- proto_tree_add_uint_format(ipx_tree, hf_ipx_dsocket, NullTVB, offset+16, 2,
- ipx_dsocket, "Destination Socket: %s (0x%04X)",
- port_text(ipx_dsocket), ipx_dsocket);
- proto_tree_add_item(ipx_tree, hf_ipx_snet, NullTVB, offset+18, 4, ipx_snet_val);
- proto_tree_add_item(ipx_tree, hf_ipx_snode, NullTVB, offset+22, 6, ipx_snode);
- proto_tree_add_uint_format(ipx_tree, hf_ipx_ssocket, NullTVB, offset+28, 2,
- ipx_ssocket, "Source Socket: %s (0x%04X)", port_text(ipx_ssocket),
- ipx_ssocket);
- }
- offset += 30;
-
- switch (ipx_type) {
- case IPX_PACKET_TYPE_SPX:
- dissect_spx(pd, offset, fd, tree);
- break;
-
- case IPX_PACKET_TYPE_NCP:
- dissect_ncp(pd, offset, fd, tree);
- break;
-
- case IPX_PACKET_TYPE_WANBCAST:
- case IPX_PACKET_TYPE_PEP:
- if (ipx_dsocket == IPX_SOCKET_NETBIOS) {
- dissect_nbipx(pd, offset, fd, tree);
- break;
- }
- /* else fall through */
+ value = g_mem_chunk_alloc(spx_hash_values);
+ value->spx_ack = 0;
+ value->spx_all = 0;
+ value->num = 0;
- case 0: /* IPX, fall through to default */
- /* XXX - should type 0's be dissected as NBIPX
- if they're aimed at the NetBIOS socket? */
- default:
- dissect = port_func(ipx_dsocket);
- if (dissect) {
- dissect(pd, offset, fd, tree);
- }
- else {
- dissect = port_func(ipx_ssocket);
- if (dissect) {
- dissect(pd, offset, fd, tree);
- }
- else {
- dissect_data(pd, offset, fd, tree);
- }
- }
- break;
- }
+ g_hash_table_insert(spx_hash, key, value);
+
+ return value;
}
+/* Returns the spx_hash_value*, or NULL if not found. */
+spx_hash_value*
+spx_hash_lookup(conversation_t *conversation, guint32 spx_src, guint32 spx_seq)
+{
+ spx_hash_key key;
+
+ key.conversation = conversation;
+ key.spx_src = spx_src;
+ key.spx_seq = spx_seq;
+
+ return g_hash_table_lookup(spx_hash, &key);
+}
/* ================================================================= */
/* SPX */
/* ================================================================= */
-static char*
-spx_conn_ctrl(u_char ctrl)
+
+#define SPX_SYS_PACKET 0x80
+#define SPX_SEND_ACK 0x40
+#define SPX_ATTN 0x20
+#define SPX_EOM 0x10
+
+static const char*
+spx_conn_ctrl(guint8 ctrl)
{
- int i=0;
-
- static struct conn_info conns[] = {
- { 0x10, "End-of-Message" },
- { 0x20, "Attention" },
- { 0x40, "Acknowledgment Required"},
- { 0x80, "System Packet"},
- { 0x00, NULL }
+ const char *p;
+
+ static const value_string conn_vals[] = {
+ { 0x00, "Data, No Ack Required" },
+ { SPX_EOM, "End-of-Message" },
+ { SPX_ATTN, "Attention" },
+ { SPX_SEND_ACK, "Acknowledgment Required"},
+ { SPX_SEND_ACK|SPX_EOM, "Send Ack: End Message"},
+ { SPX_SYS_PACKET, "System Packet"},
+ { SPX_SYS_PACKET|SPX_SEND_ACK, "System Packet: Send Ack"},
+ { 0x00, NULL }
};
- while (conns[i].text != NULL) {
- if (conns[i].ctrl == ctrl) {
- return conns[i].text;
- }
- i++;
+ p = match_strval((ctrl & 0xf0), conn_vals );
+
+ if (p) {
+ return p;
+ }
+ else {
+ return "Unknown";
}
- return "Unknown";
}
-static char*
-spx_datastream(u_char type)
+static const char*
+spx_datastream(guint8 type)
{
switch (type) {
case 0xfe:
case 0xff:
return "End-of-Connection Acknowledgment";
default:
- return "Client-Defined";
+ return NULL;
}
}
+#define SPX_HEADER_LEN 12
+
static void
-dissect_spx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
- proto_tree *spx_tree;
+dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ proto_tree *spx_tree = NULL;
proto_item *ti;
-
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "SPX");
- if (check_col(fd, COL_INFO))
- col_add_str(fd, COL_INFO, "SPX");
+ tvbuff_t *next_tvb;
+ guint8 conn_ctrl;
+ proto_tree *cc_tree;
+ guint8 datastream_type;
+ const char *datastream_type_string;
+ guint16 spx_seq;
+ const char *spx_msg_string;
+ guint16 low_socket, high_socket;
+ guint32 src;
+ conversation_t *conversation;
+ spx_hash_value *pkt_value;
+ spx_rexmit_info *spx_rexmit_info;
+ spx_info spx_info;
+
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPX");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "SPX");
if (tree) {
- ti = proto_tree_add_item(tree, proto_spx, NullTVB, offset, 12, NULL);
+ ti = proto_tree_add_item(tree, proto_spx, tvb, 0, SPX_HEADER_LEN, FALSE);
spx_tree = proto_item_add_subtree(ti, ett_spx);
+ }
+
+ conn_ctrl = tvb_get_guint8(tvb, 0);
+ spx_msg_string = spx_conn_ctrl(conn_ctrl);
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", spx_msg_string);
+ if (tree) {
+ ti = proto_tree_add_uint_format(spx_tree, hf_spx_connection_control, tvb,
+ 0, 1, conn_ctrl,
+ "Connection Control: %s (0x%02X)",
+ spx_msg_string, conn_ctrl);
+ cc_tree = proto_item_add_subtree(ti, ett_spx_connctrl);
+ proto_tree_add_boolean(cc_tree, hf_spx_connection_control_sys, tvb,
+ 0, 1, conn_ctrl);
+ proto_tree_add_boolean(cc_tree, hf_spx_connection_control_send_ack, tvb,
+ 0, 1, conn_ctrl);
+ proto_tree_add_boolean(cc_tree, hf_spx_connection_control_attn, tvb,
+ 0, 1, conn_ctrl);
+ proto_tree_add_boolean(cc_tree, hf_spx_connection_control_eom, tvb,
+ 0, 1, conn_ctrl);
+ }
+
+ datastream_type = tvb_get_guint8(tvb, 1);
+ datastream_type_string = spx_datastream(datastream_type);
+ if (datastream_type_string != NULL) {
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)",
+ datastream_type_string);
+ }
+ if (tree) {
+ if (datastream_type_string != NULL) {
+ proto_tree_add_uint_format(spx_tree, hf_spx_datastream_type, tvb,
+ 1, 1, datastream_type,
+ "Datastream Type: %s (0x%02X)",
+ datastream_type_string,
+ datastream_type);
+ } else {
+ proto_tree_add_uint_format(spx_tree, hf_spx_datastream_type, tvb,
+ 1, 1, datastream_type,
+ "Datastream Type: 0x%02X",
+ datastream_type);
+ }
+ proto_tree_add_item(spx_tree, hf_spx_src_id, tvb, 2, 2, FALSE);
+ proto_tree_add_item(spx_tree, hf_spx_dst_id, tvb, 4, 2, FALSE);
+ }
+ spx_seq = tvb_get_ntohs(tvb, 6);
+ if (tree) {
+ proto_tree_add_uint(spx_tree, hf_spx_seq_nr, tvb, 6, 2, spx_seq);
+ proto_tree_add_item(spx_tree, hf_spx_ack_nr, tvb, 8, 2, FALSE);
+ proto_tree_add_item(spx_tree, hf_spx_all_nr, tvb, 10, 2, FALSE);
+ }
+
+ /*
+ * SPX is Connection Oriented and Delivery Guaranteed.
+ * On the first pass, we need to flag retransmissions by the SPX
+ * protocol, so that subdissectors know whether a packet was
+ * retransmitted.
+ *
+ * We start out by creating a conversation for this direction of the
+ * IPX session; we use "pinfo->srcport" twice, so that we have
+ * separate conversations for the two directions.
+ *
+ * XXX - that might not work correctly if there's more than one
+ * SPX session using that source port; can that happen? If so,
+ * we should probably use the direction, as well as the conversation,
+ * as part of the hash key; if we do that, we can probably just
+ * use PT_IPX as the port type, and possibly get rid of PT_NCP.
+ *
+ * According to
+ *
+ * http://developer.novell.com/research/appnotes/1995/december/03/apv.htm
+ *
+ * the sequence number is not incremented for system packets, so
+ * presumably that means there is no notion of a system packet
+ * being retransmitted; that document also says that system
+ * packets are used as "I'm still here" keepalives and as
+ * acknowledgements (presumably meaning ACK-only packets), which
+ * suggests that they might not be ACKed and thus might not
+ * be retransmitted.
+ */
+ if (conn_ctrl & SPX_SYS_PACKET) {
+ /*
+ * It's a system packet, so it isn't a retransmission.
+ */
+ spx_rexmit_info = NULL;
+ } else {
+ /*
+ * Not a system packet - check for retransmissions.
+ */
+ if (!pinfo->fd->flags.visited) {
+ conversation = find_conversation(&pinfo->src,
+ &pinfo->dst, PT_NCP, pinfo->srcport,
+ pinfo->srcport, 0);
+ if (conversation == NULL) {
+ /*
+ * It's not part of any conversation - create
+ * a new one.
+ */
+ conversation = conversation_new(&pinfo->src,
+ &pinfo->dst, PT_NCP, pinfo->srcport,
+ pinfo->srcport, 0);
+ }
+
+ /*
+ * Now we'll hash the SPX header and use the result
+ * of that, plus the conversation, as a hash key to
+ * identify this packet.
+ *
+ * If we don't find it in the hash table, it's not a
+ * retransmission, otherwise it is. If we don't find
+ * it, we enter it into the hash table, with the
+ * frame number.
+ * If we do, we attach to this frame a structure giving
+ * the frame number of the original transmission, so
+ * that we, and subdissectors, know it's a
+ * retransmission.
+ */
+ src = tvb_get_ntohs(tvb, 0)+tvb_get_ntohs(tvb, 2)+tvb_get_ntohs(tvb, 4)+tvb_get_ntohs(tvb, 6)+tvb_get_ntohs(tvb, 8);
+ pkt_value = spx_hash_lookup(conversation, src, spx_seq);
+ if (pkt_value == NULL) {
+ /*
+ * Not found in the hash table.
+ * Enter it into the hash table.
+ */
+ pkt_value = spx_hash_insert(conversation, src,
+ spx_seq);
+ pkt_value->spx_ack = tvb_get_ntohs(tvb, 8);
+ pkt_value->spx_all = tvb_get_ntohs(tvb, 10);
+ pkt_value->num = pinfo->fd->num;
+
+ /*
+ * This is not a retransmission, so we shouldn't
+ * have any retransmission indicator.
+ */
+ spx_rexmit_info = NULL;
+ } else {
+ /*
+ * Found in the hash table. Mark this frame as
+ * a retransmission.
+ */
+ spx_rexmit_info = g_mem_chunk_alloc(spx_rexmit_infos);
+ spx_rexmit_info->num = pkt_value->num;
+ p_add_proto_data(pinfo->fd, proto_spx,
+ spx_rexmit_info);
+ }
+ } else {
+ /*
+ * Do we have per-packet SPX data for this frame?
+ * If so, it's a retransmission, and the per-packet
+ * data indicates which frame had the original
+ * transmission.
+ */
+ spx_rexmit_info = p_get_proto_data(pinfo->fd,
+ proto_spx);
+ }
+ }
+
+ /*
+ * It's a retransmission if we have a retransmission indicator.
+ * Flag this as a retransmission, but don't pass it to the
+ * subdissector.
+ */
+ if (spx_rexmit_info != NULL) {
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "[Retransmission] Original Packet %u",
+ spx_rexmit_info->num);
+ }
+ if (tree) {
+ proto_tree_add_uint_format(spx_tree, hf_spx_rexmt_frame,
+ tvb, 0, 0, spx_rexmit_info->num,
+ "This is a retransmission of frame %u",
+ spx_rexmit_info->num);
+ if (tvb_length_remaining(tvb, SPX_HEADER_LEN) > 0) {
+ proto_tree_add_text(spx_tree, tvb,
+ SPX_HEADER_LEN, -1,
+ "Retransmitted data");
+ }
+ }
+ return;
+ }
+
+ if (tvb_reported_length_remaining(tvb, SPX_HEADER_LEN) > 0) {
+ /*
+ * Call subdissectors based on the IPX socket numbers; a
+ * subdissector might have registered with our IPX socket
+ * dissector table rather than the IPX dissector's socket
+ * dissector table.
+ *
+ * Assume the lower-numbered socket number is more likely
+ * to be the right one, along the lines of what we do for
+ * TCP and UDP. We've seen NCP packets with a type of NCP,
+ * a source socket of IPX_SOCKET_NCP, and a destination
+ * socket of IPX_SOCKET_IPX_MESSAGE, and we've seen NCP
+ * packets with a type of NCP, a source socket of
+ * IPX_SOCKET_IPX_MESSAGE, and a destination socket of
+ * IPX_SOCKET_NCP.
+ */
+ if (pinfo->srcport > pinfo->destport) {
+ low_socket = pinfo->destport;
+ high_socket = pinfo->srcport;
+ } else {
+ low_socket = pinfo->srcport;
+ high_socket = pinfo->destport;
+ }
- proto_tree_add_uint_format(spx_tree, hf_spx_connection_control, NullTVB,
- offset, 1,
- pd[offset],
- "Connection Control: %s (0x%02X)",
- spx_conn_ctrl(pd[offset]),
- pd[offset]);
-
- proto_tree_add_uint_format(spx_tree, hf_spx_datastream_type, NullTVB,
- offset+1, 1,
- pd[offset+1],
- "Datastream Type: %s (0x%02X)",
- spx_datastream(pd[offset+1]),
- pd[offset+1]);
-
- proto_tree_add_item(spx_tree, hf_spx_src_id, NullTVB,
- offset+2, 2,
- pntohs( &pd[offset+2] ));
-
- proto_tree_add_item(spx_tree, hf_spx_dst_id, NullTVB,
- offset+4, 2,
- pntohs( &pd[offset+4] ));
-
- proto_tree_add_item(spx_tree, hf_spx_seq_nr, NullTVB,
- offset+6, 2,
- pntohs( &pd[offset+6] ) );
-
- proto_tree_add_item(spx_tree, hf_spx_ack_nr, NullTVB,
- offset+8, 2,
- pntohs( &pd[offset+8] ) );
-
- proto_tree_add_item(spx_tree, hf_spx_all_nr, NullTVB,
- offset+10, 2,
- pntohs( &pd[offset+10] ) );
-
- offset += 12;
- dissect_data(pd, offset, fd, tree);
+ /*
+ * Pass information to subdissectors.
+ */
+ spx_info.eom = conn_ctrl & SPX_EOM;
+ spx_info.datastream_type = datastream_type;
+ pinfo->private_data = &spx_info;
+
+ next_tvb = tvb_new_subset(tvb, SPX_HEADER_LEN, -1, -1);
+ if (dissector_try_port(spx_socket_dissector_table, low_socket,
+ next_tvb, pinfo, tree))
+ return;
+ if (dissector_try_port(spx_socket_dissector_table, high_socket,
+ next_tvb, pinfo, tree))
+ return;
+ call_dissector(data_handle, next_tvb, pinfo, tree);
}
}
/* IPX Message */
/* ================================================================= */
static void
-dissect_ipxmsg(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
proto_tree *msg_tree;
proto_item *ti;
- u_char conn_number, sig_char;
+ guint8 conn_number, sig_char;
- if ( ! BYTES_ARE_IN_FRAME(offset,2) )
- {
- return;
- }
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
- conn_number = pd[offset];
- sig_char = pd[offset+1];
+ conn_number = tvb_get_guint8(tvb, 0);
+ sig_char = tvb_get_guint8(tvb, 1);
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "IPX MSG");
- if (check_col(fd, COL_PROTOCOL)) {
- col_add_fstr(fd, COL_INFO,
- "%s, Connection %d",
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "%s, Connection %d",
val_to_str(sig_char, ipxmsg_sigchar_vals, "Unknown Signature Char"), conn_number);
}
if (tree) {
- ti = proto_tree_add_item(tree, proto_ipxmsg, NullTVB, offset, END_OF_FRAME, NULL);
+ ti = proto_tree_add_item(tree, proto_ipxmsg, tvb, 0, -1, FALSE);
msg_tree = proto_item_add_subtree(ti, ett_ipxmsg);
- proto_tree_add_item(msg_tree, hf_msg_conn, NullTVB, offset, 1, conn_number);
- proto_tree_add_item(msg_tree, hf_msg_sigchar, NullTVB, offset+1, 1, sig_char);
+ proto_tree_add_uint(msg_tree, hf_msg_conn, tvb, 0, 1, conn_number);
+ proto_tree_add_uint(msg_tree, hf_msg_sigchar, tvb, 1, 1, sig_char);
}
}
/* IPX RIP */
/* ================================================================= */
static void
-dissect_ipxrip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
proto_tree *rip_tree;
proto_item *ti;
guint16 operation;
struct ipx_rt_def route;
int cursor;
+ int available_length;
+
+ static char *rip_type[3] = { "Request", "Response", "Unknown" };
- char *rip_type[2] = { "Request", "Response" };
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
- operation = pntohs(&pd[offset]) - 1;
+ operation = tvb_get_ntohs(tvb, 0) - 1;
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "IPX RIP");
- if (check_col(fd, COL_PROTOCOL)) {
- if (operation < 2) {
- col_add_str(fd, COL_INFO, rip_type[operation]);
- }
- else {
- col_add_str(fd, COL_INFO, "Unknown Packet Type");
- }
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ /* rip_types 0 and 1 are valid, anything else becomes 2 or "Unknown" */
+ col_set_str(pinfo->cinfo, COL_INFO, rip_type[MIN(operation, 2)]);
}
if (tree) {
- ti = proto_tree_add_item(tree, proto_ipxrip, NullTVB, offset, END_OF_FRAME, NULL);
+ ti = proto_tree_add_item(tree, proto_ipxrip, tvb, 0, -1, FALSE);
rip_tree = proto_item_add_subtree(ti, ett_ipxrip);
if (operation < 2) {
- proto_tree_add_text(rip_tree, NullTVB, offset, 2,
+ proto_tree_add_text(rip_tree, tvb, 0, 2,
"RIP packet type: %s", rip_type[operation]);
if (operation == 0) {
- proto_tree_add_item_hidden(rip_tree,
- hf_ipxrip_request,
- NullTVB, offset, 2, 1);
+ proto_tree_add_boolean_hidden(rip_tree,
+ hf_ipxrip_request,
+ tvb, 0, 2, 1);
} else {
- proto_tree_add_item_hidden(rip_tree,
- hf_ipxrip_response,
- NullTVB, offset, 2, 1);
+ proto_tree_add_boolean_hidden(rip_tree,
+ hf_ipxrip_response,
+ tvb, 0, 2, 1);
}
}
else {
- proto_tree_add_text(rip_tree, NullTVB, offset, 2, "Unknown RIP packet type");
+ proto_tree_add_text(rip_tree, tvb, 0, 2, "Unknown RIP packet type");
}
- for (cursor = offset + 2; cursor < pi.captured_len; cursor += 8) {
- memcpy(&route.network, &pd[cursor], 4);
- route.hops = pntohs(&pd[cursor+4]);
- route.ticks = pntohs(&pd[cursor+6]);
+ available_length = tvb_reported_length(tvb);
+ for (cursor = 2; cursor < available_length; cursor += 8) {
+ tvb_memcpy(tvb, (guint8 *)&route.network, cursor, 4);
+ route.hops = tvb_get_ntohs(tvb, cursor+4);
+ route.ticks = tvb_get_ntohs(tvb, cursor+6);
if (operation == IPX_RIP_REQUEST - 1) {
- proto_tree_add_text(rip_tree, NullTVB, cursor, 8,
+ proto_tree_add_text(rip_tree, tvb, cursor, 8,
"Route Vector: %s, %d hop%s, %d tick%s",
ipxnet_to_string((guint8*)&route.network),
route.hops, route.hops == 1 ? "" : "s",
route.ticks, route.ticks == 1 ? "" : "s");
}
else {
- proto_tree_add_text(rip_tree, NullTVB, cursor, 8,
+ proto_tree_add_text(rip_tree, tvb, cursor, 8,
"Route Vector: %s, %d hop%s, %d tick%s (%d ms)",
ipxnet_to_string((guint8*)&route.network),
route.hops, route.hops == 1 ? "" : "s",
}
}
-
-
-/* ================================================================= */
-/* SAP */
-/* ================================================================= */
-static char*
-server_type(guint16 type)
-{
- int i=0;
-
- /* some of these are from ncpfs, others are from the book */
- static struct server_info servers[] = {
- { 0x0001, "User" },
- { 0x0002, "User Group" },
- { 0x0003, "Print Queue" },
- { 0x0004, "File server" },
- { 0x0005, "Job server" },
- { 0x0007, "Print server" },
- { 0x0008, "Archive server" },
- { 0x0009, "Archive server" },
- { 0x000a, "Job queue" },
- { 0x000b, "Administration" },
- { 0x0021, "NAS SNA gateway" },
- { 0x0024, "Remote bridge" },
- { 0x0026, "Bridge server" },
- { 0x0027, "TCP/IP gateway" },
- { 0x002d, "Time Synchronization VAP" },
- { 0x002e, "Archive Server Dynamic SAP" },
- { 0x0047, "Advertising print server" },
- { 0x004b, "Btrieve VAP 5.0" },
- { 0x004c, "SQL VAP" },
- { 0x0050, "Btrieve VAP" },
- { 0x0053, "Print Queue VAP" },
- { 0x007a, "TES NetWare for VMS" },
- { 0x0098, "NetWare access server" },
- { 0x009a, "Named Pipes server" },
- { 0x009e, "Portable NetWare Unix" },
- { 0x0107, "NetWare 386" },
- { 0x0111, "Test server" },
- { 0x0133, "NetWare Name Service" },
- { 0x0166, "NetWare management" },
- { 0x023f, "SMS Testing and Development" },
- { 0x026a, "NetWare management" },
- { 0x026b, "Time synchronization" },
- { 0x027b, "NetWare Management Agent" },
- { 0x0278, "NetWare Directory server" },
- { 0x030c, "HP LaserJet / Quick Silver" },
- { 0x0355, "Arcada Software" },
- { 0x0361, "NETINELO" },
- { 0x037e, "Powerchute UPS Monitoring" },
- { 0x03e1, "UnixWare Application Server" },
- { 0x044c, "Archive" },
- { 0x055d, "Attachmate SNA gateway" },
- { 0x0610, "Adaptec SCSI Management" },
- { 0x0640, "NT Server-RPC/GW for NW/Win95 User Level Sec" },
- { 0x064e, "NT Server-IIS" },
- { 0x0810, "ELAN License Server Demo" },
- { 0x8002, "Intel NetPort Print Server" },
-
-/* For any unidentified ones, I found a really big list of them at: */
-/* http://www.inpnet.org/cnpweb/saplist.txt */
-/* http://www.isi.edu/in-notes/iana/assignments/novell-sap-numbers */
-
- { 0x0000, NULL }
- };
-
- while (servers[i].text != NULL) {
- if (servers[i].type == type) {
- return servers[i].text;
- }
- i++;
- }
- return "Unknown";
-}
+/*
+ * Some of these are from ncpfs, others are from the book,
+ * others are from the page at
+ *
+ * http://www.iana.org/assignments/novell-sap-numbers
+ *
+ * and some from the page at
+ *
+ * http://www.rware.demon.co.uk/ipxsap.htm
+ *
+ * (see also the page at
+ *
+ * http://developer.novell.com/research/appnotes/1998/february/03/06.htm
+ *
+ * which has a huge list - but many of the entries list only the
+ * organization owning the SAP type, not what the type is for).
+ */
+const value_string server_vals[] = {
+ { 0x0000, "Unknown" },
+ { 0x0001, "User" },
+ { 0x0002, "User Group" },
+ { 0x0003, "Print Queue or Print Group" },
+ { 0x0004, "File Server (SLIST source)" },
+ { 0x0005, "Job Server" },
+ { 0x0006, "Gateway" },
+ { 0x0007, "Print Server or Silent Print Server" },
+ { 0x0008, "Archive Queue" },
+ { 0x0009, "Archive Server" },
+ { 0x000a, "Job Queue" },
+ { 0x000b, "Administration" },
+ { 0x000F, "Novell TI-RPC" },
+ { 0x0017, "Diagnostics" },
+ { 0x0020, "NetBIOS" },
+ { 0x0021, "NAS SNA Gateway" },
+ { 0x0023, "NACS Async Gateway or Asynchronous Gateway" },
+ { 0x0024, "Remote Bridge or Routing Service" },
+ { 0x0026, "Bridge Server or Asynchronous Bridge Server" },
+ { 0x0027, "TCP/IP Gateway Server" },
+ { 0x0028, "Point to Point (Eicon) X.25 Bridge Server" },
+ { 0x0029, "Eicon 3270 Gateway" },
+ { 0x002a, "CHI Corp" },
+ { 0x002c, "PC Chalkboard" },
+ { 0x002d, "Time Synchronization Server or Asynchronous Timer" },
+ { 0x002e, "ARCserve 5.0 / Palindrome Backup Director 4.x (PDB4)" },
+ { 0x0045, "DI3270 Gateway" },
+ { 0x0047, "Advertising Print Server" },
+ { 0x004a, "NetBlazer Modems" },
+ { 0x004b, "Btrieve VAP/NLM 5.0" },
+ { 0x004c, "NetWare SQL VAP/NLM Server" },
+ { 0x004d, "Xtree Network Version/NetWare XTree" },
+ { 0x0050, "Btrieve VAP 4.11" },
+ { 0x0052, "QuickLink (Cubix)" },
+ { 0x0053, "Print Queue User" },
+ { 0x0058, "Multipoint X.25 Eicon Router" },
+ { 0x0060, "STLB/NLM" },
+ { 0x0064, "ARCserve" },
+ { 0x0066, "ARCserve 3.0" },
+ { 0x0072, "WAN Copy Utility" },
+ { 0x007a, "TES-NetWare for VMS" },
+ { 0x0092, "WATCOM Debugger or Emerald Tape Backup Server" },
+ { 0x0095, "DDA OBGYN" },
+ { 0x0098, "NetWare Access Server (Asynchronous gateway)" },
+ { 0x009a, "NetWare for VMS II or Named Pipe Server" },
+ { 0x009b, "NetWare Access Server" },
+ { 0x009e, "Portable NetWare Server or SunLink NVT" },
+ { 0x00a1, "Powerchute APC UPS NLM" },
+ { 0x00aa, "LAWserve" },
+ { 0x00ac, "Compaq IDA Status Monitor" },
+ { 0x0100, "PIPE STAIL" },
+ { 0x0102, "LAN Protect Bindery" },
+ { 0x0103, "Oracle DataBase Server" },
+ { 0x0107, "NetWare 386 or RSPX Remote Console" },
+ { 0x010f, "Novell SNA Gateway" },
+ { 0x0111, "Test Server" },
+ { 0x0112, "Print Server (HP)" },
+ { 0x0114, "CSA MUX (f/Communications Executive)" },
+ { 0x0115, "CSA LCA (f/Communications Executive)" },
+ { 0x0116, "CSA CM (f/Communications Executive)" },
+ { 0x0117, "CSA SMA (f/Communications Executive)" },
+ { 0x0118, "CSA DBA (f/Communications Executive)" },
+ { 0x0119, "CSA NMA (f/Communications Executive)" },
+ { 0x011a, "CSA SSA (f/Communications Executive)" },
+ { 0x011b, "CSA STATUS (f/Communications Executive)" },
+ { 0x011e, "CSA APPC (f/Communications Executive)" },
+ { 0x0126, "SNA TEST SSA Profile" },
+ { 0x012a, "CSA TRACE (f/Communications Executive)" },
+ { 0x012b, "NetWare for SAA" },
+ { 0x012e, "IKARUS virus scan utility" },
+ { 0x0130, "Communications Executive" },
+ { 0x0133, "NNS Domain Server or NetWare Naming Services Domain" },
+ { 0x0135, "NetWare Naming Services Profile" },
+ { 0x0137, "NetWare 386 Print Queue or NNS Print Queue" },
+ { 0x0141, "LAN Spool Server (Vap, Intel)" },
+ { 0x0152, "IRMALAN Gateway" },
+ { 0x0154, "Named Pipe Server" },
+ { 0x0166, "NetWare Management" },
+ { 0x0168, "Intel PICKIT Comm Server or Intel CAS Talk Server" },
+ { 0x0173, "Compaq" },
+ { 0x0174, "Compaq SNMP Agent" },
+ { 0x0175, "Compaq" },
+ { 0x0180, "XTree Server or XTree Tools" },
+ { 0x018A, "NASI services broadcast server (Novell)" },
+ { 0x01b0, "GARP Gateway (net research)" },
+ { 0x01b1, "Binfview (Lan Support Group)" },
+ { 0x01bf, "Intel LanDesk Manager" },
+ { 0x01ca, "AXTEC" },
+ { 0x01cb, "Shiva NetModem/E" },
+ { 0x01cc, "Shiva LanRover/E" },
+ { 0x01cd, "Shiva LanRover/T" },
+ { 0x01ce, "Shiva Universal" },
+ { 0x01d8, "Castelle FAXPress Server" },
+ { 0x01da, "Castelle LANPress Print Server" },
+ { 0x01dc, "Castelle FAX/Xerox 7033 Fax Server/Excel Lan Fax" },
+ { 0x01f0, "LEGATO" },
+ { 0x01f5, "LEGATO" },
+ { 0x0233, "NMS Agent or NetWare Management Agent" },
+ { 0x0237, "NMS IPX Discovery or LANtern Read/Write Channel" },
+ { 0x0238, "NMS IP Discovery or LANtern Trap/Alarm Channel" },
+ { 0x023a, "LANtern" },
+ { 0x023c, "MAVERICK" },
+ { 0x023f, "SMS Testing and Development" },
+ { 0x024e, "NetWare Connect" },
+ { 0x024f, "NASI server broadcast (Cisco)" },
+ { 0x026a, "Network Management (NMS) Service Console" },
+ { 0x026b, "Time Synchronization Server (NetWare 4.x)" },
+ { 0x0278, "Directory Server (NetWare 4.x)" },
+ { 0x027b, "NetWare Management Agent" },
+ { 0x0280, "Novell File and Printer Sharing Service for PC" },
+ { 0x0304, "Novell SAA Gateway" },
+ { 0x0308, "COM or VERMED 1" },
+ { 0x030a, "Galacticomm's Worldgroup Server" },
+ { 0x030c, "Intel Netport 2 or HP JetDirect or HP Quicksilver" },
+ { 0x0320, "Attachmate Gateway" },
+ { 0x0327, "Microsoft Diagnostics" },
+ { 0x0328, "WATCOM SQL server" },
+ { 0x0335, "MultiTech Systems Multisynch Comm Server" },
+ { 0x0343, "Xylogics Remote Access Server or LAN Modem" },
+ { 0x0355, "Arcada Backup Exec" },
+ { 0x0358, "MSLCD1" },
+ { 0x0361, "NETINELO" },
+ { 0x037e, "Powerchute UPS Monitoring" },
+ { 0x037f, "ViruSafe Notify" },
+ { 0x0386, "HP Bridge" },
+ { 0x0387, "HP Hub" },
+ { 0x0394, "NetWare SAA Gateway" },
+ { 0x039b, "Lotus Notes" },
+ { 0x03b7, "Certus Anti Virus NLM" },
+ { 0x03c4, "ARCserve 4.0 (Cheyenne)" },
+ { 0x03c7, "LANspool 3.5 (Intel)" },
+ { 0x03d7, "Lexmark printer server (type 4033-011)" },
+ { 0x03d8, "Lexmark XLE printer server (type 4033-301)" },
+ { 0x03dd, "Banyan ENS for NetWare Client NLM" },
+ { 0x03de, "Gupta Sequel Base Server or NetWare SQL" },
+ { 0x03e1, "Univel Unixware" },
+ { 0x03e4, "Univel Unixware" },
+ { 0x03fc, "Intel Netport" },
+ { 0x03fd, "Intel Print Server Queue" },
+ { 0x040A, "ipnServer" },
+ { 0x040D, "LVERRMAN" },
+ { 0x040E, "LVLIC" },
+ { 0x0414, "NET Silicon (DPI)/Kyocera" },
+ { 0x0429, "Site Lock Virus (Brightworks)" },
+ { 0x0432, "UFHELP R" },
+ { 0x0433, "Synoptics 281x Advanced SNMP Agent" },
+ { 0x0444, "Microsoft NT SNA Server" },
+ { 0x0448, "Oracle" },
+ { 0x044c, "ARCserve 5.01" },
+ { 0x0457, "Canon GP55 Running on a Canon GP55 network printer" },
+ { 0x045a, "QMS Printers" },
+ { 0x045b, "Dell SCSI Array (DSA) Monitor" },
+ { 0x0491, "NetBlazer Modems" },
+ { 0x04ac, "On-Time Scheduler NLM" },
+ { 0x04b0, "CD-Net (Meridian)" },
+ { 0x0513, "Emulex NQA" },
+ { 0x0520, "Site Lock Checks" },
+ { 0x0529, "Site Lock Checks (Brightworks)" },
+ { 0x052d, "Citrix OS/2 App Server" },
+ { 0x0535, "Tektronix" },
+ { 0x0536, "Milan" },
+ { 0x055d, "Attachmate SNA gateway" },
+ { 0x056b, "IBM 8235 modem server" },
+ { 0x056c, "Shiva LanRover/E PLUS" },
+ { 0x056d, "Shiva LanRover/T PLUS" },
+ { 0x0580, "McAfee's NetShield anti-virus" },
+ { 0x05B8, "NLM to workstation communication (Revelation Software)" },
+ { 0x05BA, "Compatible Systems Routers" },
+ { 0x05BE, "Cheyenne Hierarchical Storage Manager" },
+ { 0x0606, "JCWatermark Imaging" },
+ { 0x060c, "AXIS Network Printer" },
+ { 0x0610, "Adaptec SCSI Management" },
+ { 0x0621, "IBM AntiVirus NLM" },
+ { 0x0640, "Microsoft Gateway Services for NetWare" },
+/* { 0x0640, "NT Server-RPC/GW for NW/Win95 User Level Sec" }, */
+ { 0x064e, "Microsoft Internet Information Server" },
+ { 0x067b, "Microsoft Win95/98 File and Print Sharing for NetWare" },
+ { 0x067c, "Microsoft Win95/98 File and Print Sharing for NetWare" },
+ { 0x076C, "Xerox" },
+ { 0x079b, "Shiva LanRover/E 115" },
+ { 0x079c, "Shiva LanRover/T 115" },
+ { 0x07B4, "Cubix WorldDesk" },
+ { 0x07c2, "Quarterdeck IWare Connect V2.x NLM" },
+ { 0x07c1, "Quarterdeck IWare Connect V3.x NLM" },
+ { 0x0810, "ELAN License Server Demo" },
+ { 0x0824, "Shiva LanRover Access Switch/E" },
+ { 0x086a, "ISSC collector NLMs" },
+ { 0x087f, "ISSC DAS agent for AIX" },
+ { 0x0880, "Intel Netport PRO" },
+ { 0x0881, "Intel Netport PRO" },
+ { 0x0b29, "Site Lock" },
+ { 0x0c29, "Site Lock Applications" },
+ { 0x0c2c, "Licensing Server" },
+ { 0x2101, "Performance Technology Instant Internet" },
+ { 0x2380, "LAI Site Lock" },
+ { 0x238c, "Meeting Maker" },
+ { 0x4808, "Site Lock Server or Site Lock Metering VAP/NLM" },
+ { 0x5555, "Site Lock User" },
+ { 0x6312, "Tapeware" },
+ { 0x6f00, "Rabbit Gateway (3270)" },
+ { 0x7703, "MODEM" },
+ { 0x8002, "NetPort Printers (Intel) or LANport" },
+ { 0x8003, "SEH InterCon Printserver" },
+ { 0x8008, "WordPerfect Network Version" },
+ { 0x85BE, "Cisco Enhanced Interior Routing Protocol (EIGRP)" },
+ { 0x8888, "WordPerfect Network Version or Quick Network Management" },
+ { 0x9000, "McAfee's NetShield anti-virus" },
+ { 0x9604, "CSA-NT_MON" },
+ { 0xb6a8, "Ocean Isle Reachout Remote Control" },
+ { 0xf11f, "Site Lock Metering VAP/NLM" },
+ { 0xf1ff, "Site Lock" },
+ { 0xf503, "Microsoft SQL Server" },
+ { 0xf905, "IBM Time and Place/2 application" },
+ { 0xfbfb, "TopCall III fax server" },
+ { 0xffff, "Any Service or Wildcard" },
+ { 0x0000, NULL }
+};
static void
-dissect_ipxsap(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
-
+dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
proto_tree *sap_tree, *s_tree;
proto_item *ti;
int cursor;
struct sap_query query;
- struct sap_server_ident server;
+ guint16 server_type;
+ char server_name[48];
+ guint16 server_port;
+ guint16 intermediate_network;
- char *sap_type[4] = { "General Query", "General Response",
+ static char *sap_type[4] = { "General Query", "General Response",
"Nearest Query", "Nearest Response" };
- query.query_type = pntohs(&pd[offset]);
- query.server_type = pntohs(&pd[offset+2]);
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ query.query_type = tvb_get_ntohs(tvb, 0);
+ query.server_type = tvb_get_ntohs(tvb, 2);
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "SAP");
- if (check_col(fd, COL_INFO)) {
+ if (check_col(pinfo->cinfo, COL_INFO)) {
if (query.query_type >= 1 && query.query_type <= 4) {
- col_add_str(fd, COL_INFO, sap_type[query.query_type - 1]);
+ col_set_str(pinfo->cinfo, COL_INFO, sap_type[query.query_type - 1]);
}
else {
- col_add_str(fd, COL_INFO, "Unknown Packet Type");
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown Packet Type");
}
}
if (tree) {
- ti = proto_tree_add_item(tree, proto_sap, NullTVB, offset, END_OF_FRAME, NULL);
+ ti = proto_tree_add_item(tree, proto_sap, tvb, 0, -1, FALSE);
sap_tree = proto_item_add_subtree(ti, ett_ipxsap);
if (query.query_type >= 1 && query.query_type <= 4) {
- proto_tree_add_text(sap_tree, NullTVB, offset, 2, sap_type[query.query_type - 1]);
+ proto_tree_add_text(sap_tree, tvb, 0, 2, sap_type[query.query_type - 1]);
if ((query.query_type - 1) % 2) {
- proto_tree_add_item_hidden(sap_tree,
- hf_sap_response,
- NullTVB, offset, 2, 1);
+ proto_tree_add_boolean_hidden(sap_tree,
+ hf_sap_response,
+ tvb, 0, 2, 1);
} else {
- proto_tree_add_item_hidden(sap_tree,
- hf_sap_request,
- NullTVB, offset, 2, 1);
+ proto_tree_add_boolean_hidden(sap_tree,
+ hf_sap_request,
+ tvb, 0, 2, 1);
}
}
else {
- proto_tree_add_text(sap_tree, NullTVB, offset, 2,
+ proto_tree_add_text(sap_tree, tvb, 0, 2,
"Unknown SAP Packet Type %d", query.query_type);
}
if (query.query_type == IPX_SAP_GENERAL_RESPONSE ||
query.query_type == IPX_SAP_NEAREST_RESPONSE) { /* responses */
- for (cursor = offset + 2; (cursor + 64) <= pi.captured_len; cursor += 64) {
- server.server_type = pntohs(&pd[cursor]);
- memcpy(server.server_name, &pd[cursor+2], 48);
- memcpy(&server.server_network, &pd[cursor+50], 4);
- memcpy(&server.server_node, &pd[cursor+54], 6);
- server.server_port = pntohs(&pd[cursor+60]);
- server.intermediate_network = pntohs(&pd[cursor+62]);
+ int available_length = tvb_reported_length(tvb);
+ for (cursor = 2; (cursor + 64) <= available_length; cursor += 64) {
+ server_type = tvb_get_ntohs(tvb, cursor);
+ tvb_memcpy(tvb, (guint8 *)server_name,
+ cursor+2, 48);
- ti = proto_tree_add_text(sap_tree, NullTVB, cursor+2, 48,
- "Server Name: %s", server.server_name);
+ ti = proto_tree_add_text(sap_tree, tvb, cursor+2, 48,
+ "Server Name: %.48s", server_name);
s_tree = proto_item_add_subtree(ti, ett_ipxsap_server);
- proto_tree_add_text(s_tree, NullTVB, cursor, 2, "Server Type: %s (0x%04X)",
- server_type(server.server_type), server.server_type);
- proto_tree_add_text(s_tree, NullTVB, cursor+50, 4, "Network: %s",
- ipxnet_to_string((guint8*)&pd[cursor+50]));
- proto_tree_add_text(s_tree, NullTVB, cursor+54, 6, "Node: %s",
- ether_to_str((guint8*)&pd[cursor+54]));
- proto_tree_add_text(s_tree, NullTVB, cursor+60, 2, "Socket: %s (0x%04X)",
- port_text(server.server_port), server.server_port);
- proto_tree_add_text(s_tree, NullTVB, cursor+62, 2,
+ proto_tree_add_text(s_tree, tvb, cursor, 2, "Server Type: %s (0x%04X)",
+ val_to_str(server_type, server_vals, "Unknown"),
+ server_type);
+ proto_tree_add_text(s_tree, tvb, cursor+50, 4, "Network: %s",
+ ipxnet_to_string(tvb_get_ptr(tvb, cursor+50, 4)));
+ proto_tree_add_text(s_tree, tvb, cursor+54, 6, "Node: %s",
+ ether_to_str(tvb_get_ptr(tvb, cursor+54, 6)));
+ server_port = tvb_get_ntohs(tvb, cursor+60);
+ proto_tree_add_text(s_tree, tvb, cursor+60, 2, "Socket: %s (0x%04x)",
+ socket_text(server_port),
+ server_port);
+ intermediate_network = tvb_get_ntohs(tvb, cursor+62);
+ proto_tree_add_text(s_tree, tvb, cursor+62, 2,
"Intermediate Networks: %d",
- server.intermediate_network);
+ intermediate_network);
}
}
else { /* queries */
- proto_tree_add_text(sap_tree, NullTVB, offset+2, 2, "Server Type: %s (0x%04X)",
- server_type(query.server_type), query.server_type);
+ proto_tree_add_text(sap_tree, tvb, 2, 2, "Server Type: %s (0x%04X)",
+ val_to_str(query.server_type, server_vals, "Unknown"),
+ query.server_type);
}
}
}
-static void
-dissect_eigrp_ipx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
-{
- dissect_eigrp(pd,offset,fd,tree);
-}
-
void
proto_register_ipx(void)
{
static hf_register_info hf_ipx[] = {
{ &hf_ipx_checksum,
{ "Checksum", "ipx.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_len,
{ "Length", "ipx.len", FT_UINT16, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_hops,
{ "Transport Control (Hops)", "ipx.hops", FT_UINT8, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_packet_type,
{ "Packet Type", "ipx.packet_type", FT_UINT8, BASE_HEX, VALS(ipx_packet_type_vals),
0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_dnet,
{ "Destination Network","ipx.dst.net", FT_IPXNET, BASE_NONE, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_dnode,
{ "Destination Node", "ipx.dst.node", FT_ETHER, BASE_NONE, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_dsocket,
- { "Destination Socket", "ipx.dst.socket", FT_UINT16, BASE_HEX, NULL, 0x0,
- "" }},
+ { "Destination Socket", "ipx.dst.socket", FT_UINT16, BASE_HEX,
+ VALS(ipx_socket_vals), 0x0,
+ "", HFILL }},
{ &hf_ipx_snet,
{ "Source Network","ipx.src.net", FT_IPXNET, BASE_NONE, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_snode,
{ "Source Node", "ipx.src.node", FT_ETHER, BASE_NONE, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_ipx_ssocket,
- { "Source Socket", "ipx.src.socket", FT_UINT16, BASE_HEX, NULL, 0x0,
- "" }},
+ { "Source Socket", "ipx.src.socket", FT_UINT16, BASE_HEX,
+ VALS(ipx_socket_vals), 0x0,
+ "", HFILL }},
+
+ { &hf_ipx_net,
+ { "Source or Destination Network","ipx.net", FT_IPXNET, BASE_NONE, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_ipx_node,
+ { "Source or Destination Node", "ipx.node", FT_ETHER, BASE_NONE, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_ipx_socket,
+ { "Source or Destination Socket", "ipx.socket", FT_UINT16, BASE_HEX,
+ VALS(ipx_socket_vals), 0x0,
+ "", HFILL }},
};
static hf_register_info hf_spx[] = {
{ &hf_spx_connection_control,
- { "Connection Control", "spx.ctl",
+ { "Connection Control", "spx.ctl",
FT_UINT8, BASE_HEX, NULL, 0x0,
- "" }},
+ "", HFILL }},
+
+ { &hf_spx_connection_control_sys,
+ { "System Packet", "spx.ctl.sys",
+ FT_BOOLEAN, 8, NULL, SPX_SYS_PACKET,
+ "", HFILL }},
+
+ { &hf_spx_connection_control_send_ack,
+ { "Send Ack", "spx.ctl.send_ack",
+ FT_BOOLEAN, 8, NULL, SPX_SEND_ACK,
+ "", HFILL }},
+
+ { &hf_spx_connection_control_attn,
+ { "Attention", "spx.ctl.attn",
+ FT_BOOLEAN, 8, NULL, SPX_ATTN,
+ "", HFILL }},
+
+ { &hf_spx_connection_control_eom,
+ { "End of Message", "spx.ctl.eom",
+ FT_BOOLEAN, 8, NULL, SPX_EOM,
+ "", HFILL }},
{ &hf_spx_datastream_type,
- { "Datastream type", "spx.type",
+ { "Datastream type", "spx.type",
FT_UINT8, BASE_HEX, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_spx_src_id,
- { "Source Connection ID", "spx.src",
+ { "Source Connection ID", "spx.src",
FT_UINT16, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_spx_dst_id,
- { "Destination Connection ID", "spx.dst",
+ { "Destination Connection ID", "spx.dst",
FT_UINT16, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_spx_seq_nr,
- { "Sequence Number", "spx.seq",
+ { "Sequence Number", "spx.seq",
FT_UINT16, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_spx_ack_nr,
- { "Acknowledgment Number", "spx.ack",
+ { "Acknowledgment Number", "spx.ack",
FT_UINT16, BASE_DEC, NULL, 0x0,
- "" }},
+ "", HFILL }},
{ &hf_spx_all_nr,
- { "Allocation Number", "spx.alloc",
+ { "Allocation Number", "spx.alloc",
FT_UINT16, BASE_DEC, NULL, 0x0,
- "" }}
+ "", HFILL }},
+
+ { &hf_spx_rexmt_frame,
+ { "Retransmitted Frame Number", "spx.rexmt_frame",
+ FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+ "", HFILL }},
};
static hf_register_info hf_ipxrip[] = {
{ &hf_ipxrip_request,
- { "Request", "ipxrip.request",
+ { "Request", "ipxrip.request",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "TRUE if IPX RIP request" }},
+ "TRUE if IPX RIP request", HFILL }},
{ &hf_ipxrip_response,
- { "Response", "ipxrip.response",
+ { "Response", "ipxrip.response",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "TRUE if IPX RIP response" }}
+ "TRUE if IPX RIP response", HFILL }}
};
static hf_register_info hf_sap[] = {
{ &hf_sap_request,
- { "Request", "ipxsap.request",
+ { "Request", "ipxsap.request",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "TRUE if SAP request" }},
+ "TRUE if SAP request", HFILL }},
{ &hf_sap_response,
- { "Response", "ipxsap.response",
+ { "Response", "ipxsap.response",
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "TRUE if SAP response" }}
+ "TRUE if SAP response", HFILL }}
};
static hf_register_info hf_ipxmsg[] = {
{ &hf_msg_conn,
- { "Connection Number", "ipxmsg.conn",
- FT_UINT8, BASE_NONE, NULL, 0x0,
- "Connection Number" }},
+ { "Connection Number", "ipxmsg.conn",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Connection Number", HFILL }},
{ &hf_msg_sigchar,
- { "Signature Char", "ipxmsg.sigchar",
- FT_UINT8, BASE_NONE, VALS(ipxmsg_sigchar_vals), 0x0,
- "Signature Char" }}
+ { "Signature Char", "ipxmsg.sigchar",
+ FT_UINT8, BASE_DEC, VALS(ipxmsg_sigchar_vals), 0x0,
+ "Signature Char", HFILL }}
};
static gint *ett[] = {
&ett_ipx,
&ett_spx,
+ &ett_spx_connctrl,
&ett_ipxmsg,
&ett_ipxrip,
&ett_ipxsap,
&ett_ipxsap_server,
};
- proto_ipx = proto_register_protocol ("Internetwork Packet eXchange", "ipx");
+ proto_ipx = proto_register_protocol("Internetwork Packet eXchange",
+ "IPX", "ipx");
proto_register_field_array(proto_ipx, hf_ipx, array_length(hf_ipx));
- proto_spx = proto_register_protocol ("Sequenced Packet eXchange", "spx");
+ register_dissector("ipx", dissect_ipx, proto_ipx);
+
+ proto_spx = proto_register_protocol("Sequenced Packet eXchange",
+ "SPX", "spx");
proto_register_field_array(proto_spx, hf_spx, array_length(hf_spx));
- proto_ipxrip = proto_register_protocol ("IPX Routing Information Protocol", "ipxrip");
+ proto_ipxrip = proto_register_protocol("IPX Routing Information Protocol",
+ "IPX RIP", "ipxrip");
proto_register_field_array(proto_ipxrip, hf_ipxrip, array_length(hf_ipxrip));
- proto_ipxmsg = proto_register_protocol ("IPX Message", "ipxmsg");
+ proto_ipxmsg = proto_register_protocol("IPX Message", "IPX MSG",
+ "ipxmsg");
proto_register_field_array(proto_ipxmsg, hf_ipxmsg, array_length(hf_ipxmsg));
- proto_sap = proto_register_protocol ("Service Advertisement Protocol", "ipxsap");
+ proto_sap = proto_register_protocol("Service Advertisement Protocol",
+ "IPX SAP", "ipxsap");
+ register_dissector("ipxsap", dissect_ipxsap, proto_sap);
+
proto_register_field_array(proto_sap, hf_sap, array_length(hf_sap));
proto_register_subtree_array(ett, array_length(ett));
+
+ ipx_type_dissector_table = register_dissector_table("ipx.packet_type",
+ "IPX packet type", FT_UINT8, BASE_HEX);
+ ipx_socket_dissector_table = register_dissector_table("ipx.socket",
+ "IPX socket", FT_UINT16, BASE_HEX);
+ spx_socket_dissector_table = register_dissector_table("spx.socket",
+ "SPX socket", FT_UINT16, BASE_HEX);
+
+ register_init_routine(&spx_init_protocol);
+ register_postseq_cleanup_routine(&spx_postseq_cleanup);
+ ipx_tap=register_tap("ipx");
}
void
proto_reg_handoff_ipx(void)
{
- dissector_add("udp.port", UDP_PORT_IPX, dissect_ipx);
- dissector_add("ethertype", ETHERTYPE_IPX, dissect_ipx);
- dissector_add("ppp.protocol", PPP_IPX, dissect_ipx);
- dissector_add("llc.dsap", SAP_NETWARE, dissect_ipx);
+ dissector_handle_t ipx_handle, spx_handle;
+ dissector_handle_t ipxsap_handle, ipxrip_handle;
+ dissector_handle_t ipxmsg_handle;
+
+ ipx_handle = find_dissector("ipx");
+ dissector_add("udp.port", UDP_PORT_IPX, ipx_handle);
+ dissector_add("ethertype", ETHERTYPE_IPX, ipx_handle);
+ dissector_add("chdlctype", ETHERTYPE_IPX, ipx_handle);
+ dissector_add("ppp.protocol", PPP_IPX, ipx_handle);
+ dissector_add("llc.dsap", SAP_NETWARE1, ipx_handle);
+ dissector_add("llc.dsap", SAP_NETWARE2, 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);
+ dissector_add("arcnet.protocol_id", ARCNET_PROTO_NOVELL_EC, 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");
}
git.samba.org / obnox / wireshark / wip.git / blobdiff