Commit graph

7501 commits

Author SHA1 Message Date
Ronnie Sahlberg
4014f31bb7 Fix a problem where the RPC tap would not be called
if the PDU was short.

This was most noticeable in NFS Read Replies not generating tap events and
thus NFS RTT statistics did not count the Read procedure.

svn path=/trunk/; revision=7490
2003-04-18 06:34:42 +00:00
Ronnie Sahlberg
37e401385c Update the ip fragment reassembly so that the subdissector is only
called from the frame where the ip packet was reassembled instead of from each fragment.

For fragments, put [Reassembled in #xx] in the summary pane so it is easy
to see which fragments are successfully reassembled and which are not.

For fragments, add a "This fragment is reassembled in:xx" to the tree
pane so and make it FT_FRAMENUM so it is easy to jump top the reassembled ip packet.

svn path=/trunk/; revision=7489
2003-04-18 05:11:44 +00:00
Guy Harris
28af7d2f8f From Stephen Shelley: in the NSIS installer build, use the NET_SNMP_DIR
definition in config.nmake, rather than force the builder to update the
NSIS config file by hand.

svn path=/trunk/; revision=7488
2003-04-18 04:46:38 +00:00
Guy Harris
a5e8c99294 From Stephen Shelley: remove a TODO comment that describes stuff that's
been done.

svn path=/trunk/; revision=7487
2003-04-18 04:45:00 +00:00
Guy Harris
9274527286 In Vines ARP Assignment Response packets, put the address being assigned
in the Info column.

svn path=/trunk/; revision=7486
2003-04-18 04:28:07 +00:00
Guy Harris
31db598238 Handle non-SNAP LLC Vines packets as such when capturing.
svn path=/trunk/; revision=7485
2003-04-18 03:41:39 +00:00
Guy Harris
d717e90748 Add support for Vines ICP.
svn path=/trunk/; revision=7484
2003-04-18 03:40:49 +00:00
Guy Harris
6c5f3ed9c2 Add support for VINES SRTP (and a stub dissector for RTP).
svn path=/trunk/; revision=7483
2003-04-18 03:00:28 +00:00
Guy Harris
a52b79ca98 Add VINES ARP support.
Shuffle the routines for subprotocols of VINES ARP into numerical order
by protocol number.

The 32-bit net/16-bit subnet fields in the VINES IP header structure
doesn't work, as the net has to be aligned on a 32-bit boundary; replace
it with a 6-byte address field.

svn path=/trunk/; revision=7482
2003-04-18 01:47:52 +00:00
Guy Harris
2020b91759 Add support for Vines IPC.
Dissect the transport control field differently for broadcast packets.

svn path=/trunk/; revision=7481
2003-04-18 00:32:47 +00:00
Guy Harris
197b9b228b Add a heuristic dissector table to Vines SPP, use it for dissecting SPP
data packets, and register the SMB dissector with it.

Dissect the Control field of SPP packets.

svn path=/trunk/; revision=7480
2003-04-17 20:30:43 +00:00
Guy Harris
044d4ae7e0 Add support for VINES-over-802.2 LLC.
Show the meaning of most of the bits in the transport control field.

Show lengths, windows, sequence numbers, and the like in decimal (that's
how Sniffer Pro shows them).

svn path=/trunk/; revision=7479
2003-04-17 19:10:17 +00:00
Ronnie Sahlberg
379298f77f Add a small extra check in fragment_add() to make it idempotent.
This solves a problem introduced by the recent rewrite of dcerpc-over-smb
reassembly which caused the last fragment for each dcerpc pdu to be duplicated and flagged as overlapping fragment.

This

svn path=/trunk/; revision=7478
2003-04-17 10:31:35 +00:00
Guy Harris
4eae58408c Regularize the Protocol column setting and protocol names, and put the
SPP packet type in the Info column rather than the Protocol column.

Give the Vines protocol number field a value_string table.

Nobody asks for the Vines IP dissector by name, so it doesn't have to be
registered by name.

svn path=/trunk/; revision=7477
2003-04-17 08:25:11 +00:00
Guy Harris
8c06187052 Update a URL, and note that the Open Group publications are now
available for free download.

svn path=/trunk/; revision=7476
2003-04-17 07:55:42 +00:00
Guy Harris
911f43b874 Use "tvb_ensure_length_remaining()" when checking how much data there is
in the packet when doing reassembly checks, as is done in other places
where we do TCP segment reassembly.

The return value of "tvb_reported_length_remaining()" can be negative -
it's a "gint"; assign it to a "gint", so that if we go past the end of
the packet in the main loop, we break out of that loop (and do so
elsewhere, just for cleanliness' sake).

Get rid the check in the loop to make sure we make no more than 20
iterations - all the routines that parse packets should either advance
the offset by at least one byte or return a "desegmentation required"
indication; the former means we make progress and eventually exit the
loop, the latter means we immediately exit the loop.

Use "int" variables, not "guint" variables, for packet offsets.

svn path=/trunk/; revision=7475
2003-04-17 07:39:18 +00:00
Guy Harris
9dcf00fe5c Support SMB as one of the protocols that can run over OSI COTP.
svn path=/trunk/; revision=7474
2003-04-17 00:13:26 +00:00
Guy Harris
f57545cca6 When processing the device identification page of vital product data,
check, for each item, when it's past the end of the page before putting
it into the protocol tree, and advance the offset through the page as we
do so.

If the identifier codeset is ASCII, display the item as text rather than
as binary data.

svn path=/trunk/; revision=7473
2003-04-16 19:43:11 +00:00
Guy Harris
9137608763 From Olivier Biot: add more (WB)XML DTDs from WINA.
svn path=/trunk/; revision=7472
2003-04-16 18:29:38 +00:00
Ronnie Sahlberg
18594809fe Update packet-ip.c to print the identification number in decimal as well as hexadecimal to make it easier to crossreference packets between output from other sniffers that display it in DEC instead of HEX.
Since this value has no human readable meaning it should be displayed in HEX only but make ethereal also display the "wrong" base to enhance human compatibility.

svn path=/trunk/; revision=7471
2003-04-16 12:17:55 +00:00
Ronnie Sahlberg
b7931e40fd Register RPC as dissector for both TCP and UDP port 111 which is used by ONC-RPC/PORTMAPPER
The reason for doing this is to allow a user to pick RPC as a protocol offered
by DecodeAs...

Why:
If ethereal has tcp-reseembly enabled, the heuristic dissector for rpc will not even attempt to find RPC packets.
If no PORTMAPPER/GETPORT are available either in the capture there is
currently no way for ethereal to know/learn that the conversation is ONC-RPC.
This at least will allow users to manually tell ethereal that such a conversation is ONC-RPC.

svn path=/trunk/; revision=7470
2003-04-16 12:15:06 +00:00
Guy Harris
7ddca7ecaf From Lars Roland:
Add Response-Time statistics for each known mgcp message-type.

	Fix a few bugs and remove trailing whitespace.

	Use "gdouble" for printing time-values and calculating the
	average.  It is easier to use and shouldn't overflow on big
	trace files like "guint32".

	Move some functions for time statistics into the new file
	timestats.c in the main directory.  This code may be useful in
	the rpc and smb rtt-taps as well.

svn path=/trunk/; revision=7469
2003-04-16 07:25:12 +00:00
Guy Harris
f17519118c From Stephen Shelley: full payload dissection of compliance levels 0, 1
and 2 function codes for Modbus/TCP, plus some bug fixes.

Use value_string tables to map function codes and exception codes to
strings.

svn path=/trunk/; revision=7468
2003-04-16 06:57:38 +00:00
Guy Harris
2678786425 Pull the stuff done in "dissect_packet()" to initialize a column_info
structure into its own routine; rename "col_init()" to "col_setup()",
and call the new routine "col_init()".

svn path=/trunk/; revision=7467
2003-04-16 05:55:41 +00:00
Guy Harris
24ec2110d1 Add the notion of a "fence" to columns. A dissector can set the fence
to "protect" what's currently in the column, so that attempts to clear
the column will only clear stuff after the fence and attempts to
overwrite the column will append stuff after the fence.  This, for
example, allows a dissector to arrange that the Info column contain
information for its protocol and for protocols running atop it.

svn path=/trunk/; revision=7466
2003-04-16 04:52:55 +00:00
Guy Harris
77923868c9 Don't format a string into a buffer with "snprintf()" and then use
"col_add_str()" to put it in the Info column, do the formatting with
"col_add_fstr()".

svn path=/trunk/; revision=7465
2003-04-15 22:07:21 +00:00
Guy Harris
e884881f24 Have separate fields for the COTP and CLTP PDU types.
Don't use "proto_tree_add_uint_format()" for the source and destination
reference fields, use "proto_tree_add_uint()".  Rename the field to make
that work.

Shuffle some stuff around to clean it up.

svn path=/trunk/; revision=7464
2003-04-15 21:33:26 +00:00
Guy Harris
8b1339c7fc From Laurent Meyer: add filterable fields to COTP.
svn path=/trunk/; revision=7463
2003-04-15 10:25:55 +00:00
Guy Harris
e04f6f760a Put in a comment noting that the reassembly code assumes subdissectors
are idempotent, which isn't necessarily the case.

svn path=/trunk/; revision=7462
2003-04-15 09:23:42 +00:00
Guy Harris
79ac2b53bd When dissecting a SYSTEM_TIME, include the milliseconds in the top-level
summary item.

svn path=/trunk/; revision=7461
2003-04-15 08:11:33 +00:00
Guy Harris
90a5d166ff Don't put "[DCE/RPC fragment]" into the Info column if the packet isn't
fragmented.

"PFC_NOT_FRAGMENTED()" is checked early in "dissect_dcerpc_cn_stub()";
there's no need to check it again in either of the code paths after
that, as we know it's true in the first code path and false in the second.

svn path=/trunk/; revision=7460
2003-04-15 08:04:54 +00:00
Guy Harris
ff8f930fe3 From Didier Gautheron: more getserverinfo decoding.
svn path=/trunk/; revision=7459
2003-04-15 05:45:02 +00:00
Guy Harris
e3645e4bd2 From Devin Heitmueller: dissect the "List" subtype in the Server Stored
List (SSI) family.

svn path=/trunk/; revision=7458
2003-04-15 04:45:57 +00:00
Guy Harris
c5f2165c36 Keep the two sides of a pipe separate when doing DCERPC-over-a-pipe
reassembly.  (Perhaps we *shouldn't* see reassembly in progress in both
directions, if the protocol is purely request/response, but that doesn't
mean you won't see it in a capture, due to bugs or dropped packets
or....)

svn path=/trunk/; revision=7457
2003-04-14 20:48:31 +00:00
Guy Harris
a551f4a0ab From Anders Broman: dissect user-to-user IEs in ISUP messages as Q.931
UU IE's.

svn path=/trunk/; revision=7456
2003-04-14 18:04:13 +00:00
Guy Harris
579ab38577 Add a new routine "dissect_file_data_maybe_dcerpc()" to handle file
read/write data that might, or might not, be DCE RPC information on a
pipe, and use that routine rather than duplicating similar code in
multiple places.

svn path=/trunk/; revision=7455
2003-04-14 17:38:49 +00:00
Guy Harris
82ff4f49a5 Fix up some comments.
svn path=/trunk/; revision=7454
2003-04-14 17:31:42 +00:00
Ronnie Sahlberg
ef8d406bd4 Reassembly of DCE/RPC fragments for Request packets was slightly broken.
Fixed this and rewrote the fragment reassembly routine to make it
cleaner and hopefully easier to read.

svn path=/trunk/; revision=7453
2003-04-14 13:22:13 +00:00
Ronnie Sahlberg
176c885a3d The two extra bytes in the write_andx request is only present if both
the MEssageStart and the Raw bits are set.

svn path=/trunk/; revision=7452
2003-04-14 10:58:21 +00:00
Guy Harris
d8fd06424e Don't show a string for datastream types other than the ones known to
SPX.

For the datastream types known to SPX, display it in the Info column.

svn path=/trunk/; revision=7451
2003-04-14 01:26:57 +00:00
Guy Harris
46416f7b7e Use symbolic names for the various write mode bits.
To test whether a single bit is set, just do "if (mode&bit)", not
"if ((mode&bit)==bit)".

In the places where read and write data is processed, have both a
comment indicating that it's file data and that you can transport DCERPC
over SMB just with reads and writes, to indicate why we may call the
DCERPC-over-a-pipe dissector.

svn path=/trunk/; revision=7450
2003-04-14 00:27:00 +00:00
Guy Harris
f2b07ad411 "dcerpc_fragment_table" is used only in packet-smb-pipe.c, except for
the call to initialize it; move the call to initialize it to the
registration routine for the dissector that uses it, move the definition
of ""dcerpc_fragment_table" to packet-smb-pipe.c, make it static, and
remove the declaration of it from smb.h.

Add some casts to squelch compiler complaints.

svn path=/trunk/; revision=7449
2003-04-13 23:58:37 +00:00
Jörg Mayer
106df618b5 Update FAQ to April 10th
svn path=/trunk/; revision=7448
2003-04-13 13:54:26 +00:00
Jörg Mayer
b0fc3cb0eb make-manuf:
Don't print Cavebear skipped - it makes the output unusable.
manuf.tmpl:
	Remove entries that overwrite identical or similar results from IEEE
manuf:
	Rebuild to reflect the changes in manuf.tmpl and add some new IEEE
	entries.

svn path=/trunk/; revision=7447
2003-04-13 13:51:32 +00:00
Ronnie Sahlberg
7bcd465705 Missing file from previous commit
svn path=/trunk/; revision=7446
2003-04-12 08:14:48 +00:00
Ronnie Sahlberg
f469559385 Rewrite the DCERPC over SMB reassembly completely.
Move the actual reassembly to packet-smb-pipe.c instead of having it inside
the packet-smb.b/Write_andX and ReadAndX dissectors.

Change the dissector to only call dcerpc dissector from the packet where
reassembly was completed instead of always from the first fragment.
Add display fiulter field for the other fragments that display which frame the dcerpc pdu was reassembled in.

This is needed in order to be able to reassemble the type of dcerpc fragments
that are sent between nt4 dc's.
The DCERPC fragment reassembly in the dcerpc layer is still broken though, and
i think it has been broken for quite some time.   That will be addressed shortly.

svn path=/trunk/; revision=7445
2003-04-12 08:14:02 +00:00
Guy Harris
151bd457db From Jeff Morriss: don't put stuff in the Info column if a subdissector
is called, so that we don't get a mix of M3UA and subdissector stuff.

svn path=/trunk/; revision=7444
2003-04-12 07:54:29 +00:00
Guy Harris
e1e43d42dc Some packets (the ones I've seen have a datastream type of
"End-of-Connection Acknolwedgment") have none of the connection control
bits set; describe them as "Data, No Ack Required" rather than
"Unknown".

svn path=/trunk/; revision=7443
2003-04-12 07:48:36 +00:00
Guy Harris
4f697a69f3 An SPX packet is not a retransmission of an earlier packet unless the
two packets have the same sequence number; use the sequence number in
the hash key.

The sequence number is not incremented for system packets, and system
packets probably don't get ACKed and thus presumably don't get
retransmitted, so don't do retransmission checks for system packets.

svn path=/trunk/; revision=7442
2003-04-12 07:35:52 +00:00
Guy Harris
e0d9bb60a2 Fix a typo.
svn path=/trunk/; revision=7441
2003-04-12 05:48:26 +00:00