diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-09-02 23:17:58 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-09-02 23:17:58 +0000 |
| commit | f9a1fea17cf070118b0ba4661720c4e3eea1007f (patch) | |
| tree | c380ff69fcfe7f5e7ea7c4c1276ac78e85cccd4b /packet-netbios.c | |
| parent | c135be4e5367ebb5763576900a4b08beead2fc91 (diff) | |
| download | wireshark-f9a1fea17cf070118b0ba4661720c4e3eea1007f.tar.gz wireshark-f9a1fea17cf070118b0ba4661720c4e3eea1007f.tar.bz2 wireshark-f9a1fea17cf070118b0ba4661720c4e3eea1007f.zip | |
Have the IPX code set "pi.len" and "pi.captured_len" based on the length
in the IPX header, and have the dissectors it calls use it rather than
being passed the length as an argument.
Treat both packet type 20 ("WAN Broadcast") and 4 ("IPX", although 3 is
also "IPX", according to Network Monitor) as potentially being NetBIOS
packets.
The packet types for the IPX NetBIOS socket (0x0455) and the NWLink
sockets (0x0551 and 0x0553) are different (perhaps because there's one
socket for the 0x0455 NBIPX, so you have to do name service and datagram
service and have the packet types distinguish them, but NWLink has
separate sockets for name service and datagram service).
The packet type for name service and for datagram service are at
*different locations* in the packet, which is unfortunate if you want to
use the packet type to distinguish name service and datagram service
packets. Use the packet length, for now, to distinguish them, with
socket 0x0455.
Dissect datagram packets differently from name service packets.
Export "packet-netbios.c"'s "netbios_add_name()" routine, and use it
when dissecting NBIPX packets as well.
Label NBIPX packets as "NBIPX" rather than "NetBIOS".
svn path=/trunk/; revision=627
Diffstat (limited to 'packet-netbios.c')
| -rw-r--r-- | packet-netbios.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packet-netbios.c b/packet-netbios.c index e33abe0e69..73d23040a1 100644 --- a/packet-netbios.c +++ b/packet-netbios.c @@ -5,7 +5,7 @@ * * derived from the packet-nbns.c * - * $Id: packet-netbios.c,v 1.3 1999/08/24 22:36:34 gram Exp $ + * $Id: packet-netbios.c,v 1.4 1999/09/02 23:17:56 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -40,6 +40,7 @@ #include <glib.h> #include "packet.h" #include "packet-dns.h" +#include "packet-netbios.h" #include "util.h" /* Netbios command numbers */ @@ -194,7 +195,7 @@ static guint get_netbios_name(const u_char *data_ptr, int offset, char *name_ret } -static void netbios_add_name( char* label, const u_char *pd, int offset, +void netbios_add_name( char* label, const u_char *pd, int offset, int nb_offset, proto_tree *tree) {/* add a name field display tree. Display the name and station type in sub-tree */ |