guy [Thu, 24 Oct 2002 07:08:26 +0000 (07:08 +0000)]
Don't include the header file to get the SNMP version unless we're
building with an SNMP library.
If we have Net-SNMP, include <net-snmp/version.h>, not
<ucd-snmp/version.h>.
Don't include any of the SNMP headers unless HAVE_SOME_SNMP is defined.
Include <net-snmp/config_api.h> if we have Net-SNMP, to declare
"read_premib_configs()" and "read_configs()".
Supply the include directories for Net-SNMP in the Makefile.nmake for
GTK 1.2 and GTK 2.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6493
f5534014-38df-0310-8fa8-
9805f1628bb7
tpot [Thu, 24 Oct 2002 06:39:09 +0000 (06:39 +0000)]
This helps packet-snmp.c compile if you don't HAVE_NET_SNMP or HAVE_UCD_SNMP.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6492
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 24 Oct 2002 06:17:36 +0000 (06:17 +0000)]
Add a "fragment_add_seq_next()" to reassemble fragments that don't have
sequence numbers or offsets and are thus assumed to be received in order
with no duplicates or dropped fragments (e.g., for NetBIOS Frame, where
802.2 LLC guarantees in-order delivery to NetBIOS with no duplicates or
dropped fragments).
"show_fragment_tree()' and "show_fragment_seq_tree()" don't modify the
"fragment_items" to which the "fit" argument points, so make that
argument a "const fragment_items *".
Make all the "fragment_items" tables "static" (as they're not used
outside the modules defining them) and "const" (as they're not
modified).
Add support for reassembly of NetBIOS fragmented requests and responses.
Get rid of an unnecessary include of "packet-tr.c" in the NetBIOS
dissector, and make its table of dissection function pointers static.
Fix some typos in the AppleTalk and NetBIOS dissectors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6491
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 24 Oct 2002 03:54:11 +0000 (03:54 +0000)]
Check whether the array of procedure hf values has an element for the
given version before fetching that value.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6490
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 24 Oct 2002 03:04:51 +0000 (03:04 +0000)]
Don't use "unsigned long" to mean "32-bit unsigned integer", as it's not
32 bits on all platforms - it's 64 bits on some platforms. Use
"guint32" instead. The same applies for "unsigned short" and "guint16".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6489
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 23:17:26 +0000 (23:17 +0000)]
From Ronnie Sahlberg: make the tap listeners for gtk and gtk2 redissect
the packet list immediately when the tap is started.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6488
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 23:12:38 +0000 (23:12 +0000)]
From Ronnie Sahlberg: pass a pointer to the epan_dissect_t for a packet
to taps.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6487
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 21:17:03 +0000 (21:17 +0000)]
Add an extra argument to "rpc_init_proc_table()" that can specify an hf_
value for a field to be used for the procedure number for that version
of the protocol; use that field, if specified, instead of just putting
in a generic "rpc.procedure" field.
Have the ypserv dissector register those fields and supply them to
"rpc_init_proc_table()". Supply -1 for other RPC programs (for now),
meaning "no such field exists".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6486
f5534014-38df-0310-8fa8-
9805f1628bb7
ashokn [Wed, 23 Oct 2002 20:50:22 +0000 (20:50 +0000)]
Added support for Label Request Type 2 (ATM Label Range) and
Type 3 (Frame Label Range)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6485
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 18:27:33 +0000 (18:27 +0000)]
Define HAVE_NET_SNMP, as Ethereal is set up to be built with Net-SNMP
rather than UCD SNMP on Windows, and define HAVE_SOME_SNMP as per Wes
Hardaker's changes to handle both Net-SNMP and UCD SNMP.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6484
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 18:24:09 +0000 (18:24 +0000)]
From Wes Hardaker:
Define HAVE_SOME_SNMP if either HAVE_UCD_SNMP or HAVE_NET_SNMP
is defined, and use HAVE_SOME_SNMP, rather than HAVE_UCD_SNMP,
in most places when testing whether we have an SNMP library or
not.
Be more selective when including Net-SNMP header files.
Fix up {gtk,gtk2}/main.c to do the same SNMP stuff that tethereal.c
does - including the MIB stuff that gtk/main.c was doing but gtk2/main.c
wasn't doing.
Fix the copyright date in gtk/main.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6483
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 04:35:52 +0000 (04:35 +0000)]
From Jamie Fournier: change to version 4, and fix to match the current
style of other DCERPC files (i.e., provide a filterable field for the
opcode).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6482
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 04:23:03 +0000 (04:23 +0000)]
Put a leading "0x" in front of the hex value for ARCNET addresses when
generating a filter expression to match the address, so it's parsed
correctly (as a hex number rather than a string) if there are
non-decimal digits (A through F).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6481
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 03:54:04 +0000 (03:54 +0000)]
In the message indicating how Ethereal was configured, say "Use UCD
SNMP/NET-SNMP" rather than just "Use UCD SNMP", now that we support
both.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6480
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 03:49:13 +0000 (03:49 +0000)]
From Ronnie Sahlberg: add a tap for statistics for DCERPC interfaces.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6479
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 23 Oct 2002 00:48:33 +0000 (00:48 +0000)]
Don't assume that we're building a protocol tree; dereference tree
pointers only if we are.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6478
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Wed, 23 Oct 2002 00:11:08 +0000 (00:11 +0000)]
Update manuf
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6477
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Tue, 22 Oct 2002 22:04:23 +0000 (22:04 +0000)]
Minimalistic support for counting IPv6 packets during capture
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6476
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Tue, 22 Oct 2002 20:06:15 +0000 (20:06 +0000)]
Wes Hardaker: Support NET-SNMP in addition to UCD-SNMP
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6475
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 18:48:15 +0000 (18:48 +0000)]
Put in a comment noting that not *all* captures with a network type of 3
look like Ethernet captures.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6474
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 09:11:13 +0000 (09:11 +0000)]
Add a Wiretap encapsulation type for RFC 2625 IP-over-Fibre Channel, and
map libpcap's DLT_IP_OVER_FC to it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6473
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 08:47:46 +0000 (08:47 +0000)]
From Jamie Fournier: AFS 4 UPDATE server support.
Merge two CREDITS entries for Jamie.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6472
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 08:44:33 +0000 (08:44 +0000)]
Add in a notion of "circuits", which are for virtual circuit-oriented
protocols (where there's a virtual circuit ID of some sort in packets)
what conversations are for protocols ultimately running atop
connectionless network layers. Have circuit type and ID values in the
"packet_info" structure.
Have the Frame Relay dissector set the circuit type and ID values, and
have the Wellfleet compression protocol set up circuit information and
store compression information with the circuit.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6471
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 08:24:39 +0000 (08:24 +0000)]
Put in a note about the completion code not appearing to be present in
replies to continuation messages (or, at least, not present in the
obvious place).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6470
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 08:22:07 +0000 (08:22 +0000)]
Add in a notion of "circuits", which are for virtual circuit-oriented
protocols (where there's a virtual circuit ID of some sort in packets)
what conversations are for protocols ultimately running atop
connectionless network layers. Have circuit type and ID values in the
"packet_info" structure.
Have the Frame Relay dissector set the circuit type and ID values, and
have the Wellfleet compression protocol set up circuit information and
store compression information with the circuit.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6469
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 08:09:57 +0000 (08:09 +0000)]
Add support for desegmentation of NDPS-over-TCP.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6468
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 07:50:07 +0000 (07:50 +0000)]
Get rid of extra blanks at ends of program names (they're not needed; in
fact, they cause an extra blank to appear).
Turn "get_string()" into a routine that fetches the length of a string,
fetches the string, puts the string into the tree with the offset of the
length as the starting offset, and returns the new offset.
Make routines that return offsets return an "int", as packet offset
variables are "int"s.
Fix up a bunch of "proto_tree_add_uint()" calls, including presumably
properly updating the offset after the call.
Clean up the handling of qualified names, integer-or-OID types, and even
objects a bit.
Put octet strings into the protocol tree with the offset of the length
as the starting offset.
Fix up the record length variable to be decimal, and just use
"proto_tree_add_uint()" to put it into the tree.
In at least one capture I've seen, there are only two bytes after the
NDPS tree field in a Bind PA request, not 4, even if the NDPS tree name
isn't an empty string.
FT_BYTES and FT_BOOLEAN don't have a base for display, so use BASE_NONE.
Fix the field for address bytes to have the right name (it's not just
the length, it's the length *and* the bytes).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6467
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 06:09:06 +0000 (06:09 +0000)]
Do a full dissection of NDPS packets regardless of whether we're
building a protocol tree or not - we need to do that in order to set
various state variables and to set the columns.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6466
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 22 Oct 2002 00:59:25 +0000 (00:59 +0000)]
From Ronnie Sahlberg: track and display the time between requests and
replies for DCERPC similar to what is already done for ONC-RPC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6465
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 21 Oct 2002 19:05:21 +0000 (19:05 +0000)]
From Solomon Peachy: display "(correct)" or "(not verified)" for the WEP
ICV, depending on whether it was successfully verified or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6464
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 21 Oct 2002 18:56:52 +0000 (18:56 +0000)]
From Greg Morris:
Various NDS dissector enhancements including NDS verb 0x07, and
proper ping flags for NDS ping version 10 request.
Updated error codes for several NCP reply packets.
NDPS enhancements.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6463
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 21 Oct 2002 18:17:41 +0000 (18:17 +0000)]
From Ronnie Sahlberg:
A small cosmetic change to make it highlight the proper bytes in
the hex pane.
From Ronnie and me:
use the length from the PPPoE header to set the length of the
tvbuff we hand to the PPP dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6462
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 21 Oct 2002 18:07:20 +0000 (18:07 +0000)]
From Ronnie Sahlberg:
Addition of Lookup, Insert and Delete calls.
Changes to make presentation of tower floors nicer.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6461
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 20:28:54 +0000 (20:28 +0000)]
Get rid of all places where "vstring" is set to point to a null string
constant, as that won't work with "get_string()" (it'll try to overwrite
the constant, and either crash, trash memory, or both).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6460
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 07:52:12 +0000 (07:52 +0000)]
Suppress compiler warnings on platforms where "time_t" is a "long",
without introducing warnings where it's an "int".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6459
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 03:03:42 +0000 (03:03 +0000)]
Label UUID's with the name of the field.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6458
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 01:17:13 +0000 (01:17 +0000)]
Only hand off the SPX payload to a subdissector if there's payload to
hand off.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6457
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 01:05:44 +0000 (01:05 +0000)]
From Greg Morris: put a buffer into "nw_uni_t", and make "get_string()"
fill that in.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6456
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 00:40:05 +0000 (00:40 +0000)]
The Frame Relay DLCI is a virtual circuit identifer, not a source or
destination address, so yank out the AT_DLCI stuff.
Clean up indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6455
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sat, 19 Oct 2002 00:10:50 +0000 (00:10 +0000)]
"addr->data", not "addr", points to the DLCI.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6454
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 18 Oct 2002 22:10:53 +0000 (22:10 +0000)]
Put in code to handle AT_DLCI.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6453
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 18 Oct 2002 21:40:13 +0000 (21:40 +0000)]
Add an AT_ARCNET address type for ARCNET addresses, and have the ARCNET
dissector set the source and destination link-layer addresses.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6452
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 18 Oct 2002 21:10:38 +0000 (21:10 +0000)]
Get rid of (probably-)unnecessary #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6451
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 18 Oct 2002 21:00:01 +0000 (21:00 +0000)]
From Peter Fales: ARCNET support.
Sort the lists of dissectors in the DISSECTOR_SRC macros in
"Makefile.am" and "Makefile.nmake".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6450
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 22:38:19 +0000 (22:38 +0000)]
From Didier Gautheron: better AFP 3.x dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6449
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 21:14:17 +0000 (21:14 +0000)]
Flag fragment overlaps when reassembling based on sequence number, and,
when displaying the fragment tree for reassembly based on sequence
number, show the correct offset.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6448
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 20:51:35 +0000 (20:51 +0000)]
Put in a missing check for fragment overlaps, and add an assertion to
check for bogus dfpos values before using the value.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6447
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 20:05:04 +0000 (20:05 +0000)]
Put in a note telling people not to use "long" for 32-bit quantities.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6446
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 20:02:00 +0000 (20:02 +0000)]
Don't use "unsigned long" when you mean "unsigned 32-bit integer", as
"unsigned long" is an unsigned *64-bit* integer on many platforms.
While we're at it, use "guint8" rather than "unsigned char" for
"unsigned 8-bit integer", and use "guint16" rather than "unsigned short"
for "unsigned 16-bit integer".
Make the seconds field of a libpcap time stamp signed, as it's supposed
to be.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6445
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Thu, 17 Oct 2002 18:44:10 +0000 (18:44 +0000)]
Fixed a bug on 64 bit machines in the CRC32C algorithm. Thanks to
Jerome Forissier.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6444
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 02:19:29 +0000 (02:19 +0000)]
From Ronnie Sahlberg: use the frame number of a TCP segment, rather than
its starting sequence number, as the "fragment ID" when reassembling,
and include the source and destination port numbers in a
"tcp_segment_key" structure and use that as part of the key in the hash
table for segments, so that we don't get spoofed by segments in two
directions in the same conversation, or by segments in two separate
conversations between the same hosts, having the same starting sequence
number (which is not unlikely to happen if relative sequence numbers are
being used).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6443
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 02:11:20 +0000 (02:11 +0000)]
From Ronnie Sahlberg: don't have the tap code do a dissection, leave
that up to its callers, so only one dissection need be done when reading
a capture file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6442
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 17 Oct 2002 01:29:30 +0000 (01:29 +0000)]
The Boolean field for EndVerifyAck messages was missing, causing a crash
if such a message (or something that happened to look enough like such a
message) was ever seen.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6441
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Oct 2002 23:34:52 +0000 (23:34 +0000)]
From Ulf Lamping: show total running time of capture in capture progress
dialog box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6440
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Oct 2002 23:24:21 +0000 (23:24 +0000)]
Clean up white space.
Clean up the stuff to handle MVTYPE_PROC_ENTRY_SPECIFIERS a bit, and put
in comments explaining what's going on for that and MVTYPE_ATTR_REQUEST.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6439
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Oct 2002 23:04:53 +0000 (23:04 +0000)]
Use #defines for multivalue types.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6438
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Oct 2002 22:44:58 +0000 (22:44 +0000)]
Make some counters 32-bit, as the upper limit on the loop in which
they're used is 32-bit.
Use "%u" rather than "%d" to print unsigned values.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6437
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Oct 2002 22:20:30 +0000 (22:20 +0000)]
Use #defines for vtype values, rather than numbers.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6436
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Wed, 16 Oct 2002 21:57:24 +0000 (21:57 +0000)]
Make arrays of "nds_val" structures rather than declaring a bunch of
individual structures, and initialize them, and put them into
the protocol tree, in a loop.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6435
f5534014-38df-0310-8fa8-
9805f1628bb7
gram [Wed, 16 Oct 2002 16:32:59 +0000 (16:32 +0000)]
Make the dfilter code support multiple header_field_info's with
the same name (abbreviation). Thus, if multiple protocols or fields
are registered with the same name, you can still filter on the name
and have the filtering work as expected.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6434
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Wed, 16 Oct 2002 14:45:27 +0000 (14:45 +0000)]
Add support for building randpkt under Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6433
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 22:28:35 +0000 (22:28 +0000)]
Make a routine to check for NTLMSSP authentication and to do the NTLMSSP
dissection if found, with a table of headers that indicate NTLMSSP
authentication.
Add some more headers to that table.
Constify the code a bit.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6432
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 17:31:20 +0000 (17:31 +0000)]
Fully initialize an ncp_req_hash_value after allocating it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6431
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 17:19:06 +0000 (17:19 +0000)]
From Hannes Gredler: dissect the graceful restart capability in BGP OPEN
messages.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6430
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 07:47:57 +0000 (07:47 +0000)]
We'll be building a protocol tree for all NDS Ping packets, so we can
just wrap the entire dissection in an "if", as was done before.
(Actually, we can just skip the "if" entirely, I guess....)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6429
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 07:36:16 +0000 (07:36 +0000)]
Set the "req_nds_flags" field for an NDS Ping request regardless of
whether we're building a protocol tree or not.
Set the separator if we put "Revision" into the summary.
Check for a remaining length >= 8, not > 8, to check for an NDS version
10 or later ping, and check the reported length, not the captued length.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6428
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 05:38:01 +0000 (05:38 +0000)]
From Jason House: include <winsock2.h> early in "wtap-int.h" on Win32
builds with zlib - "zlib.h", alas, includes <winsock.h>, and you can't
include <winsock.h> before including <winsock2.h> (at least you can
include <winsock2.h> before including <winsock.h>; thank heaven for
small favors).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6427
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 05:29:48 +0000 (05:29 +0000)]
Squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6426
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 05:21:07 +0000 (05:21 +0000)]
When registering a protocol, make sure there are no other protocols with
the same long name, short name, or filter name, and abort if there are.
Fix the duplicate names that found (and another name error found while
fixing one of those errors).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6425
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 04:31:00 +0000 (04:31 +0000)]
Add a new port type, PT_IPX, for IPX socket numbers; set "pinfo->ptype",
"pinfo->srcport", and "pinfo->destport" appropriately in the IPX
dissector. Add support for PT_IPX port types in display columns.
Have an "spx.socket" dissector table, similar to the "ipx.socket"
dissector table, and have the SPX dissector use that, with the IPX
socket numbers from "pinfo->srcport" and "pinfo->destport", so that
dissectors for protocols that run atop SPX can register with particular
socket numbers. (Think of it as similar to what would have been the
case had the IP header had 16-bit source and destination port numbers,
and had TCP and UDP used those port numbers rather than having port
numbers in their headers.) Also, have the SPX dissector dissect
subprotocols regardless of whether we're building a protocol tree or not.
Use the dissector handle for the IPX message dissector for both IPX
socket numbers; there's no need to create separate handles for both
registrations.
Have NDPS register as a subdissector of the SPX dissector, using
"spx.socket", and get rid of the duplicate SPX dissection in the NDPS
dissector.
Make the NDPS dissector set the columns regardless of whether a protocol
tree is being built, and clean up the dissector (fixing some bugs).
Get rid of unneeded includes in "packet-ndps.c".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6424
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 04:26:24 +0000 (04:26 +0000)]
Fix the file name in the initial comment.
Fix a typo in Gerald's e-mail address.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6423
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 15 Oct 2002 04:25:42 +0000 (04:25 +0000)]
Fix a typo in Gerald's e-mail address.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6422
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 15 Oct 2002 03:47:47 +0000 (03:47 +0000)]
Fix more typing issues. Pull the marker, length, and type individually
instead of copying them into a struct. Remove the "bgp" struct, as it is
no longer used. Gracefuly (more than before, at least) handle a zero
packet length.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6421
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 15 Oct 2002 02:29:54 +0000 (02:29 +0000)]
Fix signed/unsigned type mismatches, as pointed out by Silvio.
Add BGP output to randpkt.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6420
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Oct 2002 23:23:20 +0000 (23:23 +0000)]
From Thierry Pelle: IPv6CP support.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6419
f5534014-38df-0310-8fa8-
9805f1628bb7
oabad [Mon, 14 Oct 2002 19:59:51 +0000 (19:59 +0000)]
Another problem found by valgrind :
in continue_tail_cap_file, the following test :
else if (*err != 0)
sometimes reads uninitialized memory (so the test might be incorrect).
We now set *err to 0 at the beginning of the function.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6418
f5534014-38df-0310-8fa8-
9805f1628bb7
oabad [Mon, 14 Oct 2002 19:45:08 +0000 (19:45 +0000)]
1- We were writing 1 byte past the end of the buffer in register_tap
(bug found with valgrind) :
td->name = malloc(strlen(name));
strcpy(td->name, name);
Replaced with :
td->name = g_strdup(name);
2 - Use g_malloc instead of malloc (both were used).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6417
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Oct 2002 17:33:50 +0000 (17:33 +0000)]
From Ulf Lamping: count ARP packets in capture progress dialog box.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6416
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Oct 2002 17:08:53 +0000 (17:08 +0000)]
From Mike Frisch: fix problems with SETCLIENTID and SETCLIENTID_REPLY
decoding.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6415
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 14 Oct 2002 16:47:56 +0000 (16:47 +0000)]
Create the temporary tree if we're *not* building a protocol tree
already, not if we *are*.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6414
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 11 Oct 2002 21:58:25 +0000 (21:58 +0000)]
Fetch the pointer to a string before allocating memory for the string,
so that if the string length is bogus and large, we'll throw an
exception in "tvb_get_ptr()" rather than crashing when we fail to
allocate the memory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6413
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 11 Oct 2002 21:52:11 +0000 (21:52 +0000)]
Make the flag buffer in "dissect_ping_req()" large enough to hold the
longest possible flag string.
Don't create a temporary protocol tree unless we're not filling in a
protocol tree.
The NDS version isn't present in NDS pings prior to version 10; dissect
it only if it's present.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6412
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 11 Oct 2002 19:36:13 +0000 (19:36 +0000)]
Note that "dissect_ping_req()" duplicates a bunch of stuff in
"dissect_ncp_request()".
Fix "dissect_ping_req()" to properly put the NDS version in a ping
request into the tree (although that field isn't present in the ping
requests I've seen, so perhaps it's only in NDS version 10 and later),
as big-endian (change FALSE to TRUE if it's little-endian).
Get rid of the unused "ncp_nds_verb" variable (set, but not used) in
"dissect_ncp_common()".
Call "dissect_ping_req()" from "dissect_ncp_common()" again.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6411
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 23:52:51 +0000 (23:52 +0000)]
Fix some spelling errors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6410
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 23:41:27 +0000 (23:41 +0000)]
Mark some fields as NDS fields.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6409
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 23:32:01 +0000 (23:32 +0000)]
Rename "ncp.nds_string" to "ncp.nds_tree_name", as it's not a generic
string, it's a tree name (as the field's display name suggests).
Get rid of the unused "ncp.nds_string_value" field.
Fix up the names of some fields, and use "proto_tree_add_uint()" rather
than "proto_tree_add_uint_format()" to add them to the protocol tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6408
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 23:06:00 +0000 (23:06 +0000)]
Fix up the handling of bitfields in NDS messages - get rid of extra
blanks, and don't put the list of flag values in if no bits are set.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6407
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 21:47:12 +0000 (21:47 +0000)]
"tm_isdst" must be set to -1 before "mktime()" is called, so that
"mktime()" bases the DST-vs-non-DST decision on the date/time and on the
current time zone.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6406
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 21:24:59 +0000 (21:24 +0000)]
"proto_tree_add_string_format()" requires that the string value be
passed as an argument before the format string; fix some calls to do so.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6405
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 21:08:45 +0000 (21:08 +0000)]
When deciding whether to put "NDS" into the protocol field in the packet
list, check whether the protocol field is enabled, not whether the info
field is enabled. Update the protocol field before trying to look at
the packet, so it gets updated even for short packets.
Only parse service reply packets as NDS packets; don't parse positive
ack packets that way.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6404
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 21:05:05 +0000 (21:05 +0000)]
Remove an extra blank in the Connection Control field display.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6403
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 20:36:37 +0000 (20:36 +0000)]
As we are (correctly) calling the IP dissector regardless of whether a
protocol tree is being built or not, we must also construct a tvbuff to
hand to that dissector regardless of whether a protocol tree is being
built or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6402
f5534014-38df-0310-8fa8-
9805f1628bb7
hagbard [Thu, 10 Oct 2002 19:06:04 +0000 (19:06 +0000)]
Fixed minor error in call ordering.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6401
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 03:58:47 +0000 (03:58 +0000)]
Don't attach the string for an NDS error to the completion code - attach
the string for the completion code. Do put the string for the NDS error
into the summary line, however.
Don't clear the NDS error code if we can't translate it to a string.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6400
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 03:25:47 +0000 (03:25 +0000)]
"#if 0" out the code in "get_string()", as it will probably cause
crashes on many platforms, and other random behavior on others.
Don't create a temporary tree with an NCP tree underneath it if we
already have an NCP tree; we don't want the results of a dissection to
be stuck in an invisible temporary tree if we're supposed to be
generating a protocol tree.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6399
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Thu, 10 Oct 2002 03:03:30 +0000 (03:03 +0000)]
Clean up white space.
Redo the stuff to check for various NDS requests to use a switch
statement, and #if 0-out the code to handle NDS Pings specially, as the
Novell documentation on their Web site and at least one capture I've
seen suggest that there's nothing but a function and subfunction code in
the ping request.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6398
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 10 Oct 2002 02:57:13 +0000 (02:57 +0000)]
Add (back) some #include <string.h>
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6397
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 10 Oct 2002 02:18:41 +0000 (02:18 +0000)]
Backout previous patch - the warning was left intentionally
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6396
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 10 Oct 2002 01:53:34 +0000 (01:53 +0000)]
Silence an unjustified warning
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6395
f5534014-38df-0310-8fa8-
9805f1628bb7
jmayer [Thu, 10 Oct 2002 01:49:21 +0000 (01:49 +0000)]
Add (back) some #include <string.h>
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6394
f5534014-38df-0310-8fa8-
9805f1628bb7