/* packet-ipx.c
* Routines for NetWare's IPX
- * Gilbert Ramirez <gram@verdict.uthscsa.edu>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-ipx.c,v 1.17 1999/03/20 04:38:56 gram Exp $
+ * $Id: packet-ipx.c,v 1.108 2002/08/02 23:35:51 jmayer Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@unicom.net>
+ * 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
# include "config.h"
#endif
-#include <gtk/gtk.h>
-
#include <stdio.h>
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include "ethereal.h"
-#include "packet.h"
+#include <string.h>
+#include <glib.h>
+#include <epan/packet.h>
#include "packet-ipx.h"
-#include "packet-ncp.h"
+#include <epan/resolv.h>
+#include "etypes.h"
+#include "ppptypes.h"
+#include "llcsaps.h"
+#include "aftypes.h"
/* 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_hops = -1;
+static int hf_ipx_packet_type = -1;
+static int hf_ipx_dnet = -1;
+static int hf_ipx_dnode = -1;
+static int hf_ipx_dsocket = -1;
+static int hf_ipx_snet = -1;
+static int hf_ipx_snode = -1;
+static int hf_ipx_ssocket = -1;
+
+static gint ett_ipx = -1;
+
+static dissector_table_t ipx_type_dissector_table;
+static dissector_table_t ipx_socket_dissector_table;
+
+static int proto_spx = -1;
+static int hf_spx_connection_control = -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 gint ett_spx = -1;
+
+static int proto_ipxrip = -1;
+static int hf_ipxrip_request = -1;
+static int hf_ipxrip_response = -1;
+
+static gint ett_ipxrip = -1;
+
+static int proto_sap = -1;
+static int hf_sap_request = -1;
+static int hf_sap_response = -1;
+
+static gint ett_ipxsap = -1;
+static gint ett_ipxsap_server = -1;
+
+static gint ett_ipxmsg = -1;
+static int proto_ipxmsg = -1;
+static int hf_msg_conn = -1;
+static int hf_msg_sigchar = -1;
+
+static dissector_handle_t data_handle;
static void
-dissect_spx(const u_char *pd, int offset, frame_data *fd, GtkTree *tree);
+dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void
-dissect_ipxrip(const u_char *pd, int offset, frame_data *fd, GtkTree *tree);
+dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static void
-dissect_sap(const u_char *pd, int offset, frame_data *fd, GtkTree *tree);
+dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-struct port_info {
- guint16 port;
- void (*func) (const u_char *, int, frame_data *, GtkTree *);
- char *text;
-};
+static void
+dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-struct conn_info {
- guint8 ctrl;
- char *text;
-};
+#define UDP_PORT_IPX 213 /* RFC 1234 */
-struct server_info {
- guint16 type;
- char *text;
-};
+#define IPX_HEADER_LEN 30 /* It's *always* 30 bytes */
/* ================================================================= */
/* IPX */
/* ================================================================= */
-static struct port_info ports[] = {
- { 0x0451, dissect_ncp, "NCP" },
- { 0x0452, dissect_sap, "SAP" },
- { 0x0453, dissect_ipxrip, "RIP" },
- { 0x0455, NULL, "NetBIOS" },
- { 0x0456, NULL, "Diagnostic" },
- { 0x0457, NULL, "Serialization" },
- { 0x0551, NULL, "NWLink SMB Name Query" },
- { 0x0553, dissect_nwlink_dg,"NWLink SMB Datagram" },
- { 0x055d, NULL, "Attachmate Gateway" },
- { 0x4001, NULL, "IPX Message" },
- { 0x0000, NULL, NULL }
+static 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_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_WIDE_AREA_ROUTER, "Wide Area Router" },
+ { 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 const char*
+socket_text(guint16 socket)
+{
+ return val_to_str(socket, ipx_socket_vals, "Unknown");
}
-static void*
-port_func(guint16 port) {
- int i=0;
+static const value_string ipx_packet_type_vals[] = {
+ { IPX_PACKET_TYPE_IPX, "IPX" },
+ { IPX_PACKET_TYPE_RIP, "RIP" },
+ { IPX_PACKET_TYPE_ECHO, "Echo" },
+ { IPX_PACKET_TYPE_ERROR, "Error" },
+ { IPX_PACKET_TYPE_PEP, "PEP" }, /* Packet Exchange Packet */
+ { IPX_PACKET_TYPE_SPX, "SPX" },
+ { 16, "Experimental Protocol" },
+ { IPX_PACKET_TYPE_NCP, "NCP" },
+ { 18, "Experimental Protocol" },
+ { 19, "Experimental Protocol" },
+ { IPX_PACKET_TYPE_WANBCAST, "NetBIOS Broadcast" },
+ { 21, "Experimental Protocol" },
+ { 22, "Experimental Protocol" },
+ { 23, "Experimental Protocol" },
+ { 24, "Experimental Protocol" },
+ { 25, "Experimental Protocol" },
+ { 26, "Experimental Protocol" },
+ { 27, "Experimental Protocol" },
+ { 28, "Experimental Protocol" },
+ { 29, "Experimental Protocol" },
+ { 30, "Experimental Protocol" },
+ { 31, "Experimental Protocol" },
+ { 0, NULL }
+};
- while (ports[i].text != NULL) {
- if (ports[i].port == port) {
- return ports[i].func;
- }
- i++;
- }
- return NULL;
-}
+static const value_string ipxmsg_sigchar_vals[] = {
+ { '?', "Poll inactive station" },
+ { 'Y', "Station is still using the connection" },
+ { '!', "Broadcast message waiting" },
+ { 0, NULL }
+};
-char *
-ipx_packet_type(u_char val)
+void
+capture_ipx(packet_counts *ld)
{
- if (val == 0) {
- return "IPX";
- }
- else if (val == 5) {
- return "SPX";
- }
- else if (val == 17) {
- return "NCP";
- }
- else if (val == 20) {
- return "NetBIOS Broadcast";
- }
- else if (val >= 16 && val <= 31) {
- return "Experimental Protocol";
- }
- else {
- return "Unknown";
- }
+ ld->ipx++;
}
-gchar*
-ipxnet_to_string(const guint8 *ad)
+static void
+dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- static gchar str[3][12];
- static gchar *cur;
+ tvbuff_t *next_tvb;
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
+ proto_tree *ipx_tree;
+ proto_item *ti;
- sprintf(cur, "%02X %02X %02X %02X", ad[0], ad[1], ad[2], ad[3]);
- return cur;
-}
+ const guint8 *src_net_node, *dst_net_node;
-gchar*
-ipx_addr_to_str(guint32 net, const guint8 *ad)
-{
- static gchar str[3][22];
- static gchar *cur;
+ guint8 ipx_type, ipx_hops;
+ guint16 ipx_length;
- if (cur == &str[0][0]) {
- cur = &str[1][0];
- } else if (cur == &str[1][0]) {
- cur = &str[2][0];
- } else {
- cur = &str[0][0];
- }
+ guint16 ipx_dsocket, ipx_ssocket;
+ guint16 low_socket, high_socket;
- sprintf(cur, "%X.%02x%02x%02x%02x%02x%02x", net,
- ad[0], ad[1], ad[2], ad[3], ad[4], ad[5]);
- return cur;
-}
+ 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);
-void
-dissect_ipx(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
+ /* Calculate here for use in pinfo and in tree */
+ ipx_dsocket = tvb_get_ntohs(tvb, 16);
+ ipx_ssocket = tvb_get_ntohs(tvb, 28);
+ ipx_type = tvb_get_guint8(tvb, 5);
+ ipx_length = tvb_get_ntohs(tvb, 2);
- GtkWidget *ipx_tree, *ti;
- guint8 ipx_type, ipx_hops;
- guint16 ipx_checksum, ipx_length;
- guint8 *ipx_snode, *ipx_dnode, *ipx_snet, *ipx_dnet;
+ /* Adjust the tvbuff length to include only the IPX datagram. */
+ set_actual_length(tvb, ipx_length);
- gchar *str_dnet, *str_snet;
- guint16 ipx_dsocket, ipx_ssocket;
- void (*dissect) (const u_char *, int, frame_data *, GtkTree *);
+ src_net_node = tvb_get_ptr(tvb, 18, 10);
+ dst_net_node = tvb_get_ptr(tvb, 6, 10);
- /* Calculate here for use in pinfo and in tree */
- ipx_dnet = (guint8*)&pd[offset+6];
- ipx_snet = (guint8*)&pd[offset+18];
- str_dnet = ipxnet_to_string(ipx_dnet);
- str_snet = ipxnet_to_string(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];
-
- if (check_col(fd, COL_RES_DL_DST))
- col_add_str(fd, COL_RES_DL_DST,
- ipx_addr_to_str(pntohl(ipx_dnet), ipx_dnode));
- if (check_col(fd, COL_RES_DL_SRC))
- col_add_str(fd, COL_RES_DL_SRC,
- ipx_addr_to_str(pntohl(ipx_snet), ipx_snode));
-
- 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);
+ SET_ADDRESS(&pinfo->net_src, AT_IPX, 10, src_net_node);
+ SET_ADDRESS(&pinfo->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);
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s (0x%04x)",
+ socket_text(ipx_dsocket), ipx_dsocket);
if (tree) {
- ipx_checksum = pntohs(&pd[offset]);
- ipx_length = pntohs(&pd[offset+2]);
- ipx_hops = pd[offset+4];
-
- ti = add_item_to_tree(GTK_WIDGET(tree), offset, 30,
- "Internetwork Packet Exchange");
- ipx_tree = gtk_tree_new();
- add_subtree(ti, ipx_tree, ETT_IPX);
- add_item_to_tree(ipx_tree, offset, 2, "Checksum: 0x%04x",
- ipx_checksum);
- add_item_to_tree(ipx_tree, offset+2, 2, "Length: %d bytes",
- ipx_length);
- add_item_to_tree(ipx_tree, offset+4, 1, "Transport Control: %d hops",
- ipx_hops);
- add_item_to_tree(ipx_tree, offset+5, 1, "Packet Type: %s",
- ipx_packet_type(ipx_type));
- add_item_to_tree(ipx_tree, offset+6, 4, "Destination Network: %s",
- str_dnet);
- add_item_to_tree(ipx_tree, offset+10, 6, "Destination Node: %s",
- ether_to_str(ipx_dnode));
- add_item_to_tree(ipx_tree, offset+16, 2,
- "Destination Socket: %s (0x%04X)", port_text(ipx_dsocket),
+
+ ti = proto_tree_add_item(tree, proto_ipx, tvb, 0, IPX_HEADER_LEN, FALSE);
+ ipx_tree = proto_item_add_subtree(ti, ett_ipx);
+
+ 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, ipx_length,
+ "Length: %d bytes", 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, ipx_type);
+
+ /* Destination */
+ proto_tree_add_item(ipx_tree, hf_ipx_dnet, tvb, 6, 4, FALSE);
+ proto_tree_add_item(ipx_tree, hf_ipx_dnode, tvb, 10, 6, FALSE);
+ proto_tree_add_uint(ipx_tree, hf_ipx_dsocket, tvb, 16, 2,
ipx_dsocket);
- add_item_to_tree(ipx_tree, offset+18, 4, "Source Network: %s",
- str_snet);
- add_item_to_tree(ipx_tree, offset+22, 6, "Source Node: %s",
- ether_to_str(ipx_snode));
- add_item_to_tree(ipx_tree, offset+28, 2,
- "Source Socket: %s (0x%04X)", port_text(ipx_ssocket), ipx_ssocket);
+
+ /* Source */
+ proto_tree_add_item(ipx_tree, hf_ipx_snet, tvb, 18, 4, FALSE);
+ proto_tree_add_item(ipx_tree, hf_ipx_snode, tvb, 22, 6, FALSE);
+ proto_tree_add_uint(ipx_tree, hf_ipx_ssocket, tvb, 28, 2,
+ ipx_ssocket);
}
- offset += 30;
-
- switch (ipx_type) {
- case 5: /* SPX */
- dissect_spx(pd, offset, fd, tree);
- break;
-
- case 17: /* NCP */
- if (pntohl(ipx_dnode) == 0 && pntohs(ipx_dnode + 4) == 1)
- nw_server_address = pntohl(ipx_dnet);
- else if (pntohl(ipx_snode) == 0 && pntohs(ipx_snode + 4) == 1)
- nw_server_address = pntohl(ipx_snet);
- else
- nw_server_address = 0;
-
- dissect_ncp(pd, offset, fd, tree);
- break;
-
- case 20: /* NetBIOS */
- if (ipx_dsocket == 0x0455) {
- dissect_nbipx_ns(pd, offset, fd, tree);
- break;
- }
- /* else fall through */
- case 0: /* IPX, fall through to default */
- 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;
+ /* 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 = 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.
+ *
+ * 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 (ipx_ssocket > ipx_dsocket) {
+ low_socket = ipx_dsocket;
+ high_socket = ipx_ssocket;
+ } else {
+ low_socket = ipx_ssocket;
+ high_socket = ipx_dsocket;
}
+ if (dissector_try_port(ipx_socket_dissector_table, low_socket,
+ next_tvb, pinfo, tree))
+ return;
+ if (dissector_try_port(ipx_socket_dissector_table, high_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, ipx_type, next_tvb,
+ pinfo, tree))
+ return;
+
+ call_dissector(data_handle,next_tvb, pinfo, tree);
}
/* ================================================================= */
/* SPX */
/* ================================================================= */
-static char*
-spx_conn_ctrl(u_char ctrl)
+static const char*
+spx_conn_ctrl(guint8 ctrl)
{
- int i=0;
+ const char *p;
- static struct conn_info conns[] = {
+ static const value_string conn_vals[] = {
{ 0x10, "End-of-Message" },
{ 0x20, "Attention" },
{ 0x40, "Acknowledgment Required"},
- { 0x80, "System Packet"}
+ { 0x80, "System Packet"},
+ { 0x00, NULL }
};
- while (conns[i].text != NULL) {
- if (conns[i].ctrl == ctrl) {
- return conns[i].text;
- }
- i++;
+ p = match_strval(ctrl, 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:
}
}
+#define SPX_HEADER_LEN 12
+
static void
-dissect_spx(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
+dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ proto_tree *spx_tree;
+ proto_item *ti;
+ tvbuff_t *next_tvb;
- GtkWidget *spx_tree, *ti;
+ guint8 conn_ctrl;
+ guint8 datastream_type;
- 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");
+ 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 = add_item_to_tree(GTK_WIDGET(tree), offset, 12,
- "Sequenced Packet Exchange");
- spx_tree = gtk_tree_new();
- add_subtree(ti, spx_tree, ETT_SPX);
-
- add_item_to_tree(spx_tree, offset, 1,
- "Connection Control: %s (0x%02X)",
- spx_conn_ctrl(pd[offset]), pd[offset]);
-
- add_item_to_tree(spx_tree, offset+1, 1,
- "Datastream Type: %s (0x%02X)",
- spx_datastream(pd[offset+1]), pd[offset+1]);
-
- add_item_to_tree(spx_tree, offset+2, 2,
- "Source Connection ID: %d", pntohs( &pd[offset+2] ) );
-
- add_item_to_tree(spx_tree, offset+4, 2,
- "Destination Connection ID: %d", pntohs( &pd[offset+4] ) );
-
- add_item_to_tree(spx_tree, offset+6, 2,
- "Sequence Number: %d", pntohs( &pd[offset+6] ) );
+ 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);
+ proto_tree_add_uint_format(spx_tree, hf_spx_connection_control, tvb,
+ 0, 1, conn_ctrl,
+ "Connection Control: %s (0x%02X)",
+ spx_conn_ctrl(conn_ctrl), conn_ctrl);
+
+ datastream_type = tvb_get_guint8(tvb, 1);
+ proto_tree_add_uint_format(spx_tree, hf_spx_datastream_type, tvb,
+ 1, 1, datastream_type,
+ "Datastream Type: %s (0x%02X)",
+ spx_datastream(datastream_type), 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);
+ proto_tree_add_item(spx_tree, hf_spx_seq_nr, tvb, 6, 2, FALSE);
+ 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);
+
+ next_tvb = tvb_new_subset(tvb, SPX_HEADER_LEN, -1, -1);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
+ }
+}
- add_item_to_tree(spx_tree, offset+8, 2,
- "Acknowledgment Number: %d", pntohs( &pd[offset+8] ) );
+/* ================================================================= */
+/* IPX Message */
+/* ================================================================= */
+static void
+dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ proto_tree *msg_tree;
+ proto_item *ti;
+ guint8 conn_number, sig_char;
+
+ 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 = tvb_get_guint8(tvb, 0);
+ sig_char = tvb_get_guint8(tvb, 1);
+
+ 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);
+ }
- add_item_to_tree(spx_tree, offset+10, 2,
- "Allocation Number: %d", pntohs( &pd[offset+10] ) );
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_ipxmsg, tvb, 0, -1, FALSE);
+ msg_tree = proto_item_add_subtree(ti, ett_ipxmsg);
- offset += 12;
- dissect_data(pd, offset, fd, tree);
+ 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, GtkTree *tree) {
-
- GtkWidget *rip_tree, *ti;
+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 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 = add_item_to_tree(GTK_WIDGET(tree), offset, END_OF_FRAME,
- "IPX Routing Information Protocol");
- rip_tree = gtk_tree_new();
- add_subtree(ti, rip_tree, ETT_IPXRIP);
+ ti = proto_tree_add_item(tree, proto_ipxrip, tvb, 0, -1, FALSE);
+ rip_tree = proto_item_add_subtree(ti, ett_ipxrip);
if (operation < 2) {
- add_item_to_tree(rip_tree, offset, 2,
+ proto_tree_add_text(rip_tree, tvb, 0, 2,
"RIP packet type: %s", rip_type[operation]);
+
+ if (operation == 0) {
+ proto_tree_add_boolean_hidden(rip_tree,
+ hf_ipxrip_request,
+ tvb, 0, 2, 1);
+ } else {
+ proto_tree_add_boolean_hidden(rip_tree,
+ hf_ipxrip_response,
+ tvb, 0, 2, 1);
+ }
+
}
else {
- add_item_to_tree(rip_tree, offset, 2, "Unknown RIP packet type");
+ proto_tree_add_text(rip_tree, tvb, 0, 2, "Unknown RIP packet type");
}
- for (cursor = offset + 2; cursor < fd->cap_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) {
- add_item_to_tree(rip_tree, 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 {
- add_item_to_tree(rip_tree, 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 */
+/* SAP */
/* ================================================================= */
-static char*
+static const char*
server_type(guint16 type)
{
- int i=0;
-
- /* some of these are from ncpfs, others are from the book */
- static struct server_info servers[] = {
+ const char *p;
+
+ /*
+ * 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).
+ */
+ static const value_string server_vals[] = {
+ { 0x0000, "Unknown" },
{ 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" },
+ { 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" },
- { 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" },
- { 0x026a, "NetWare management" },
- { 0x026b, "Time synchronization" },
- { 0x0278, "NetWare Directory server" },
+ { 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 }
};
- while (servers[i].text != NULL) {
- if (servers[i].type == type) {
- return servers[i].text;
- }
- i++;
+ p = match_strval(type, server_vals);
+ if (p) {
+ return p;
+ }
+ else {
+ return "Unknown";
}
- return "Unknown";
}
static void
-dissect_sap(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) {
-
- GtkWidget *sap_tree, *s_tree, *ti;
- int cursor;
+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;
- 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);
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "SAP");
- if (check_col(fd, COL_INFO)) {
- if (query.query_type < 4) {
- col_add_str(fd, COL_INFO, sap_type[query.query_type - 1]);
+ query.query_type = tvb_get_ntohs(tvb, 0);
+ query.server_type = tvb_get_ntohs(tvb, 2);
+
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ if (query.query_type >= 1 && query.query_type <= 4) {
+ 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 = add_item_to_tree(GTK_WIDGET(tree), offset, END_OF_FRAME,
- "Service Advertising Protocol");
- sap_tree = gtk_tree_new();
- add_subtree(ti, sap_tree, ETT_IPXSAP);
-
- if (query.query_type < 4) {
- add_item_to_tree(sap_tree, offset, 2, sap_type[query.query_type - 1]);
+ 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, tvb, 0, 2, sap_type[query.query_type - 1]);
+ if ((query.query_type - 1) % 2) {
+ proto_tree_add_boolean_hidden(sap_tree,
+ hf_sap_response,
+ tvb, 0, 2, 1);
+ } else {
+ proto_tree_add_boolean_hidden(sap_tree,
+ hf_sap_request,
+ tvb, 0, 2, 1);
+ }
}
else {
- add_item_to_tree(sap_tree, 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) <= fd->cap_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]);
-
- ti = add_item_to_tree(GTK_WIDGET(sap_tree), cursor+2, 48,
+ int available_length = tvb_reported_length(tvb);
+ for (cursor = 2; (cursor + 64) <= available_length; cursor += 64) {
+ server.server_type = tvb_get_ntohs(tvb, cursor);
+ tvb_memcpy(tvb, (guint8 *)server.server_name,
+ cursor+2, 48);
+ tvb_memcpy(tvb, (guint8 *)&server.server_network,
+ cursor+50, 4);
+ tvb_memcpy(tvb, (guint8 *)&server.server_node,
+ cursor+54, 6);
+ server.server_port = tvb_get_ntohs(tvb, cursor+60);
+ server.intermediate_network = tvb_get_ntohs(tvb, cursor+62);
+
+ ti = proto_tree_add_text(sap_tree, tvb, cursor+2, 48,
"Server Name: %s", server.server_name);
- s_tree = gtk_tree_new();
- add_subtree(ti, s_tree, ETT_IPXSAP_SERVER);
+ s_tree = proto_item_add_subtree(ti, ett_ipxsap_server);
- add_item_to_tree(s_tree, cursor, 2, "Server Type: %s (0x%04X)",
+ proto_tree_add_text(s_tree, tvb, cursor, 2, "Server Type: %s (0x%04X)",
server_type(server.server_type), server.server_type);
- add_item_to_tree(s_tree, cursor+50, 4, "Network: %s",
- ipxnet_to_string((guint8*)&pd[cursor+50]));
- add_item_to_tree(s_tree, cursor+54, 6, "Node: %s",
- ether_to_str((guint8*)&pd[cursor+54]));
- add_item_to_tree(s_tree, cursor+60, 2, "Socket: %s (0x%04X)",
- port_text(server.server_port), server.server_port);
- add_item_to_tree(s_tree, cursor+62, 2,
+ proto_tree_add_text(s_tree, tvb, cursor+50, 4, "Network: %s",
+ ipxnet_to_string((guint8*)tvb_get_ptr(tvb, cursor+50, 4)));
+ proto_tree_add_text(s_tree, tvb, cursor+54, 6, "Node: %s",
+ ether_to_str((guint8*)tvb_get_ptr(tvb, cursor+54, 6)));
+ proto_tree_add_text(s_tree, tvb, cursor+60, 2, "Socket: %s (0x%04x)",
+ socket_text(server.server_port), server.server_port);
+ proto_tree_add_text(s_tree, tvb, cursor+62, 2,
"Intermediate Networks: %d",
server.intermediate_network);
}
}
else { /* queries */
- add_item_to_tree(sap_tree, offset+2, 2, "Server Type: %s (0x%04X)",
+ proto_tree_add_text(sap_tree, tvb, 2, 2, "Server Type: %s (0x%04X)",
server_type(query.server_type), query.server_type);
}
}
}
+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,
+ 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,
+ VALS(ipx_socket_vals), 0x0,
+ "", HFILL }},
+ };
+
+ static hf_register_info hf_spx[] = {
+ { &hf_spx_connection_control,
+ { "Connection Control", "spx.ctl",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_spx_datastream_type,
+ { "Datastream type", "spx.type",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_spx_src_id,
+ { "Source Connection ID", "spx.src",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_spx_dst_id,
+ { "Destination Connection ID", "spx.dst",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_spx_seq_nr,
+ { "Sequence Number", "spx.seq",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_spx_ack_nr,
+ { "Acknowledgment Number", "spx.ack",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "", HFILL }},
+
+ { &hf_spx_all_nr,
+ { "Allocation Number", "spx.alloc",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "", HFILL }}
+ };
+
+ static hf_register_info hf_ipxrip[] = {
+ { &hf_ipxrip_request,
+ { "Request", "ipxrip.request",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "TRUE if IPX RIP request", HFILL }},
+
+ { &hf_ipxrip_response,
+ { "Response", "ipxrip.response",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "TRUE if IPX RIP response", HFILL }}
+ };
+
+ static hf_register_info hf_sap[] = {
+ { &hf_sap_request,
+ { "Request", "ipxsap.request",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "TRUE if SAP request", HFILL }},
+
+ { &hf_sap_response,
+ { "Response", "ipxsap.response",
+ FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "TRUE if SAP response", HFILL }}
+ };
+
+ static hf_register_info hf_ipxmsg[] = {
+ { &hf_msg_conn,
+ { "Connection Number", "ipxmsg.conn",
+ FT_UINT8, BASE_DEC, NULL, 0x0,
+ "Connection Number", HFILL }},
+
+ { &hf_msg_sigchar,
+ { "Signature Char", "ipxmsg.sigchar",
+ FT_UINT8, BASE_DEC, VALS(ipxmsg_sigchar_vals), 0x0,
+ "Signature Char", HFILL }}
+ };
+
+ static gint *ett[] = {
+ &ett_ipx,
+ &ett_spx,
+ &ett_ipxmsg,
+ &ett_ipxrip,
+ &ett_ipxsap,
+ &ett_ipxsap_server,
+ };
+
+ proto_ipx = proto_register_protocol("Internetwork Packet eXchange",
+ "IPX", "ipx");
+ proto_register_field_array(proto_ipx, hf_ipx, array_length(hf_ipx));
+
+ 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",
+ "IPX RIP", "ipxrip");
+ proto_register_field_array(proto_ipxrip, hf_ipxrip, array_length(hf_ipxrip));
+
+ 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",
+ "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);
+}
+
+void
+proto_reg_handoff_ipx(void)
+{
+ 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_NETWARE, ipx_handle);
+ dissector_add("null.type", BSD_AF_IPX, ipx_handle);
+ dissector_add("gre.proto", ETHERTYPE_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);
+ data_handle = find_dissector("data");
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff