diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-15 04:39:28 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-15 04:39:28 +0000 |
| commit | 903a3db8c19457feb568e7bfc0adc3daaf341323 (patch) | |
| tree | 95370201a146dce7b74662ce52f73baffa5e90a3 /packet-netbios.h | |
| parent | 254179eec8c38183c3861d30a980f1571c05345c (diff) | |
| download | wireshark-903a3db8c19457feb568e7bfc0adc3daaf341323.tar.gz | |
"get_netbios_name()" can never return a negative number as the name
type, so "netbios_add_name()" doesn't need to check for it doing so
(yes, the tvbuff stuff *does* catch "get_netbios_name()" running past
the end of the packet, and causes an exception to be thrown). Get rid
of the check, and get rid of "netbios_add_name()"s return value.
In "dissect_nbipx_dg()", always call the SMB dissector if there's data
left in the packet, regardless of whether the "tree" argument is null or
not; subdissectors should always be called, so they can build any
internal state on the first pass through the capture, and so that they
can fill in the Protocol and Info columns.
svn path=/trunk/; revision=2899
Diffstat (limited to 'packet-netbios.h')
| -rw-r--r-- | packet-netbios.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-netbios.h b/packet-netbios.h index c76b4d0c72..cfa903e0b5 100644 --- a/packet-netbios.h +++ b/packet-netbios.h @@ -5,7 +5,7 @@ * * derived from the packet-nbns.c * - * $Id: packet-netbios.h,v 1.8 2000/11/10 21:09:49 guy Exp $ + * $Id: packet-netbios.h,v 1.9 2001/01/15 04:39:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -39,7 +39,7 @@ extern int process_netbios_name(const u_char *name_ptr, char *name_ret); extern int get_netbios_name(tvbuff_t *tvb, int offset, char *name_ret); extern char *netbios_name_type_descr(int name_type); -extern gboolean netbios_add_name( char* label, tvbuff_t *tvb, int offset, +extern void netbios_add_name( char* label, tvbuff_t *tvb, int offset, proto_tree *tree); #endif |