From ef3dfe2077c3fd49997b7d9f3c31ba9f65ff27e2 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Tue, 23 Mar 1999 03:14:46 +0000 Subject: Removed all references to gtk objects from packet*.[ch] files. They now reference the protocol tree with struct proto_tree and struct proto_item objects. That way, the packet decoding source code file can be used with non-gtk packet decoders, like a curses-based ethereal, e.g. I also re-arranged some of the information in packet.h to more appropriate places (like other packet-*.[ch] files). svn path=/trunk/; revision=223 --- packet-nbipx.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) (limited to 'packet-nbipx.c') diff --git a/packet-nbipx.c b/packet-nbipx.c index 53833b449d..63b9fb0b09 100644 --- a/packet-nbipx.c +++ b/packet-nbipx.c @@ -2,7 +2,7 @@ * Routines for NetBIOS over IPX packet disassembly * Gilbert Ramirez * - * $Id: packet-nbipx.c,v 1.5 1998/11/17 04:28:57 gerald Exp $ + * $Id: packet-nbipx.c,v 1.6 1999/03/23 03:14:40 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -28,20 +28,12 @@ # include "config.h" #endif -#include - -#include -#include - #ifdef HAVE_SYS_TYPES_H # include #endif -#ifdef HAVE_NETINET_IN_H -# include -#endif - -#include "ethereal.h" +/*#include */ +#include #include "packet.h" #include "packet-ipx.h" /* for ipxnet_to_string() */ @@ -51,7 +43,7 @@ enum nbipx_protocol { }; static void -nbipx_ns(const u_char *pd, int offset, frame_data *fd, GtkTree *tree, +nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, enum nbipx_protocol nbipx); /* There is no RFC or public specification of Netware or Microsoft @@ -81,23 +73,24 @@ struct nbipx_header { /* NetWare */ void -dissect_nbipx_ns(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) +dissect_nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { nbipx_ns(pd, offset, fd, tree, NETBIOS_NETWARE); } void -dissect_nwlink_dg(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) +dissect_nwlink_dg(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { nbipx_ns(pd, offset, fd, tree, NETBIOS_NWLINK); } static void -nbipx_ns(const u_char *pd, int offset, frame_data *fd, GtkTree *tree, +nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, enum nbipx_protocol nbipx) { - GtkWidget *nbipx_tree, *ti; + proto_tree *nbipx_tree; + proto_item *ti; struct nbipx_header header; int i, rtr_offset; int name_offset; @@ -141,18 +134,18 @@ nbipx_ns(const u_char *pd, int offset, frame_data *fd, GtkTree *tree, } if (tree) { - ti = add_item_to_tree(GTK_WIDGET(tree), offset, END_OF_FRAME, + ti = proto_tree_add_item(tree, offset, END_OF_FRAME, "NetBIOS over IPX"); - nbipx_tree = gtk_tree_new(); - add_subtree(ti, nbipx_tree, ETT_NBIPX); + nbipx_tree = proto_tree_new(); + proto_item_add_subtree(ti, nbipx_tree, ETT_NBIPX); if (header.packet_type <= 1) { - add_item_to_tree(nbipx_tree, offset+33, 1, + proto_tree_add_item(nbipx_tree, offset+33, 1, "Packet Type: %s (%02X)", packet_type[header.packet_type], header.packet_type); } else { - add_item_to_tree(nbipx_tree, offset+33, 1, + proto_tree_add_item(nbipx_tree, offset+33, 1, "Packet Type: Unknown (%02X)", header.packet_type); } @@ -161,22 +154,22 @@ nbipx_ns(const u_char *pd, int offset, frame_data *fd, GtkTree *tree, rtr_offset = offset + (i << 2); memcpy(&header.router[i], &pd[rtr_offset], 4); if (header.router[i] != 0) { - add_item_to_tree(nbipx_tree, rtr_offset, 4, "IPX Network: %s", + proto_tree_add_item(nbipx_tree, rtr_offset, 4, "IPX Network: %s", ipxnet_to_string((guint8*)&header.router[i])); } } - add_item_to_tree(nbipx_tree, offset+32, 1, "Name Type: %02X", + proto_tree_add_item(nbipx_tree, offset+32, 1, "Name Type: %02X", header.name_type); if (nbipx == NETBIOS_NETWARE) { - add_item_to_tree(nbipx_tree, offset+name_offset, 16, + proto_tree_add_item(nbipx_tree, offset+name_offset, 16, "Name String: %s", header.name); } else { - add_item_to_tree(nbipx_tree, offset+name_offset, 16, + proto_tree_add_item(nbipx_tree, offset+name_offset, 16, "Group Name String: %s", header.name); - add_item_to_tree(nbipx_tree, offset+52, 16, + proto_tree_add_item(nbipx_tree, offset+52, 16, "Node Name String: %s", header.node_name); } -- cgit v1.2.3