osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

This small change lets me read SMBtrans packets that come over NBIPX. 

svn path=/trunk/; revision=262
This commit is contained in:
Gilbert Ramirez 1999-05-10 19:01:32 +00:00
parent ba2afbfeb8
commit 0add610ce6
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packet-ipx.c
View File

@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@verdict.uthscsa.edu>
*
* $Id: packet-ipx.c,v 1.18 1999/03/23 03:14:39 gram Exp $
* $Id: packet-ipx.c,v 1.19 1999/05/10 19:01:31 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
@ -265,7 +265,7 @@ dissect_ipx(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
case 20: /* NetBIOS */
if (ipx_dsocket == 0x0455) {
dissect_nbipx_ns(pd, offset, fd, tree);
dissect_nbipx_ns(pd, offset, fd, tree, ipx_length - 30);
break;
}
/* else fall through */

33
packet-nbipx.c
View File

@ -2,7 +2,7 @@
* Routines for NetBIOS over IPX packet disassembly
* Gilbert Ramirez <gram@verdict.uthscsa.edu>
*
* $Id: packet-nbipx.c,v 1.6 1999/03/23 03:14:40 gram Exp $
* $Id: packet-nbipx.c,v 1.7 1999/05/10 19:01:32 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -44,7 +44,7 @@ enum nbipx_protocol {
static void
nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
enum nbipx_protocol nbipx);
enum nbipx_protocol nbipx, int max_data);
/* There is no RFC or public specification of Netware or Microsoft
* NetBIOS over IPX packets. I have had to decode the protocol myself,
@ -73,21 +73,23 @@ struct nbipx_header {
/* NetWare */
void
dissect_nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
dissect_nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
int max_data)
{
nbipx_ns(pd, offset, fd, tree, NETBIOS_NETWARE);
nbipx_ns(pd, offset, fd, tree, NETBIOS_NETWARE, max_data);
}
void
dissect_nwlink_dg(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
dissect_nwlink_dg(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
int max_data)
{
nbipx_ns(pd, offset, fd, tree, NETBIOS_NWLINK);
nbipx_ns(pd, offset, fd, tree, NETBIOS_NWLINK, max_data);
}
static void
nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
enum nbipx_protocol nbipx)
enum nbipx_protocol nbipx, int max_data)
{
proto_tree *nbipx_tree;
proto_item *ti;
@ -128,13 +130,18 @@ nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
col_add_fstr(fd, COL_INFO, "Name Query for %s", header.name);
break;
case 2:
col_add_fstr(fd, COL_INFO, "SMB over NBIPX");
break;
default:
col_add_str(fd, COL_INFO, "NetBIOS over IPX");
}
}
if (tree) {
ti = proto_tree_add_item(tree, offset, END_OF_FRAME,
ti = proto_tree_add_item(tree, offset, 68,
"NetBIOS over IPX");
nbipx_tree = proto_tree_new();
proto_item_add_subtree(ti, nbipx_tree, ETT_NBIPX);
@ -176,7 +183,15 @@ nbipx_ns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
}
if (nbipx == NETBIOS_NWLINK) {
dissect_data(pd, offset + 68, fd, tree);
switch (header.packet_type) {
case 2:
dissect_smb(pd, offset + 68, fd, tree, max_data - 68);
break;
default:
dissect_data(pd, offset + 68, fd, tree);
break;
}
}
}

8
packet.h
View File

@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
* $Id: packet.h,v 1.49 1999/05/10 00:27:32 sharpe Exp $
* $Id: packet.h,v 1.50 1999/05/10 19:01:32 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -362,16 +362,16 @@ void dissect_ipx(const u_char *, int, frame_data *, proto_tree *);
void dissect_llc(const u_char *, int, frame_data *, proto_tree *);
void dissect_lpd(const u_char *, int, frame_data *, proto_tree *);
void dissect_nbdgm(const u_char *, int, frame_data *, proto_tree *);
void dissect_nbipx_ns(const u_char *, int, frame_data *, proto_tree *);
void dissect_nbipx_ns(const u_char *, int, frame_data *, proto_tree *, int);
void dissect_nbns(const u_char *, int, frame_data *, proto_tree *);
void dissect_ncp(const u_char *, int, frame_data *, proto_tree *);
void dissect_nwlink_dg(const u_char *, int, frame_data *, proto_tree *);
void dissect_nwlink_dg(const u_char *, int, frame_data *, proto_tree *, int);
void dissect_osi(const u_char *, int, frame_data *, proto_tree *);
void dissect_ospf(const u_char *, int, frame_data *, proto_tree *);
void dissect_ospf_hello(const u_char *, int, frame_data *, proto_tree *);
void dissect_rip(const u_char *, int, frame_data *, proto_tree *);
void dissect_tcp(const u_char *, int, frame_data *, proto_tree *);
void dissect_tftp(const u_char *, int, frame_data *, proto_tree *, int);
void dissect_tftp(const u_char *, int, frame_data *, proto_tree *);
void dissect_trmac(const u_char *, int, frame_data *, proto_tree *);
void dissect_udp(const u_char *, int, frame_data *, proto_tree *);
void dissect_vines(const u_char *, int, frame_data *, proto_tree *);