Commit Graph

144 Commits

Author SHA1 Message Date
Ronnie Sahlberg 53d2b88279 technically speaking rpc duplicate replies are not retransmissions
only the request is tecnically a restransmission
the reply is technically not a retransmission (since it is a new reply to the retransmitted request)

mark duplicated replies as RPC duplicate ... instead of as RPC retransmission

thanks to Cal for pointing this out.

svn path=/trunk/; revision=10725
2004-04-29 11:58:00 +00:00
Ronnie Sahlberg 561d8c9cb0 when dealing with unknown rpc programs, create a fake program/version/procedure table so that we can get service response time tables working later.
svn path=/trunk/; revision=10556
2004-04-07 03:57:34 +00:00
Ronnie Sahlberg 929c732949 Add a new preference option so that users that really really want to can
tell ethereal "I dont care if the heuristics are too weak" "I want to see the ONC-RPC layer for these weird protocols that are not known to ethereal"   "If I get a lot of false positives it is my own fault and I will not complain"

This allows ethereal to dissect the rpc layer (and do request/response matching) even for those onc-rpc protocols that ethereal doesnt know about yet.

svn path=/trunk/; revision=10547
2004-04-03 00:29:08 +00:00
Guy Harris 857318d3b7 Use "tvb_get_string()" instead of allocating a (len+1)-sized buffer,
"tvb_memcpy()"ing to it, and putting in a null terminator;
"tvb_get_string()" will check whether all bytes of the string are
present before allocating the buffer, so that you don't leak memory if
the copy throws an exception, and don't crash if the length is absurdly
large.

Use "tvb_memdup()" instead of allocating a buffer and "tvb_memcpy()"ing
to it, so that an exception is thrown before you try to allocate the
buffer (for the same reasons as listed above).

Before allocating a buffer used when processing a chunk of data from a
packet, get a pointer to the chunk with "tvb_get_ptr()", or check that
the data is all there with "tvb_ensure_bytes_exist()", so that an
exception is thrown before you try to allocate the buffer (for the same
reasons as listed above).

Fix up the lengths of the tvbuff used when dissecting ONC RPC opaque data
with a particular dissector.

svn path=/trunk/; revision=10236
2004-02-25 09:31:07 +00:00
Ulf Lamping cb2658031d removed some MSVC warnings (warning level 2)
svn path=/trunk/; revision=9459
2003-12-28 12:43:40 +00:00
Guy Harris 7bd2e232a9 Export "protocol_t" as an opaque type.
Make "proto_is_protocol_enabled()" and "proto_get_protocol_short_name()"
take a "protocol_t *" as an argument, so they don't have to look up the
"protocol_t" - this will probably speed them up considerably, and
they're called on almost every dissector handoff.

Get rid of a number of "proto_is_protocol_enabled()" calls that aren't
necessary (dissectors called through handles, including those called
through dissector tables, or called as heuristic dissectors, aren't even
called if their protocol isn't enabled).

Change some direct dissector calls to go through handles.

svn path=/trunk/; revision=8979
2003-11-16 23:17:27 +00:00
Ronnie Sahlberg 95b3b8ca6d Add a popup to the ServicveResponseTime tables where the user can select
Prepare/Match/FindFrame similar to chat the ConversationList has.

Only enabled for SMB and ONC-RPC at this point

svn path=/trunk/; revision=8391
2003-09-05 10:26:44 +00:00
Guy Harris 28c86073ec Use "rpc_item", rather than "rpc_tree", as the argument to
"proto_item_append_text()" (they have the same value, and the same
underlying type, but it's cleaner).

Even if there already is a conversation when we're dissecting a call,
make the conversation dissector for the conversation the RPC dissector -
the conversation might've been created by the TCP dissector, or by us in
order to do fragment reassembly.

svn path=/trunk/; revision=8354
2003-09-03 07:11:13 +00:00
Ronnie Sahlberg 764114e914 Due to popular demand:
The heuristic for RPC detection sometimes mistakenly decodes something as RPC when in reality it is payload.

Since the heuristics is based on the PDU suze as specified in the record marker
make this limit settable from the preferences.

Arbitrary limit of 256kb is choosen as default instead of the original limit of 2mb.
(face it, the largest common oncrpc pdus are those for nfs read/write anyway and these seldom go above 32kb.)

svn path=/trunk/; revision=8250
2003-08-25 10:17:38 +00:00
Ronnie Sahlberg f7a26c1bed Prettifying the RPC and NFS (v3) layer.
Add more text to the COL_INFO line as well as the protocol trees for NFS and RPC

svn path=/trunk/; revision=8179
2003-08-17 21:34:22 +00:00
Ronnie Sahlberg a12e8f37fb Update to RPC, prettiry the presentation of duplicates.
Only cosmetic changes, no functionality change.

svn path=/trunk/; revision=8090
2003-07-29 07:30:58 +00:00
Ronnie Sahlberg 09b4172ac4 Fix a bug in RPC where the RCP_DUP items where not always added to the tree
and were thus not always filterable.

At the same time, change the dup fields to be placed visibly in the tree and point to the original of the dup.

svn path=/trunk/; revision=8064
2003-07-22 11:51:20 +00:00
Guy Harris 5fb0511328 Put in a note about the call heuristics.
svn path=/trunk/; revision=8037
2003-07-17 23:08:52 +00:00
Richard Sharpe 8df9b98bfc First changes to properly support RFC1964 so that GSSAPI GetMIC and other
tokens can be handled.

Really, dissect-spnego-krb5 or whatever, should be renamed to something like
dissect-gssapi-tokens or dissect-gssapi-rfc1964 ...

svn path=/trunk/; revision=7724
2003-05-23 17:46:06 +00:00
Richard Sharpe a4f0cdaba4 Remove some accidentally commited debugging strings.
svn path=/trunk/; revision=7718
2003-05-22 21:39:44 +00:00
Richard Sharpe 9ebbe1fb1f A small fix to NFSv4 to properly decode the secinfo response array, the array
of secinfo flavors returned.

svn path=/trunk/; revision=7717
2003-05-22 21:37:54 +00:00
Richard Sharpe 77fe92c28d A small fix to packet-rpc.c noticed by Tony Schene.
Fixes a mistake I introduced ...

I am still seeing malformed packets on secinfo stuff, which I hope to fix
soon.

svn path=/trunk/; revision=7715
2003-05-22 17:11:18 +00:00
Richard Sharpe 413228f109 Make dissect_rpc_opaque_data available and allow it to take a dissection
routine ...

I am not happy with the signature for it as yet, though.

svn path=/trunk/; revision=7702
2003-05-21 02:48:40 +00:00
Guy Harris 552b1bbe7f Clean "dissect_rpc_opaque_data()" up a bit; for example, there's no need
to do a "proto_tree_add_string_hidden()" to add the string data to the
protocol tree, given that we explicitly add it as a non-hidden item
(regardless of whether it's string data or binary data).

svn path=/trunk/; revision=7697
2003-05-20 07:56:46 +00:00
Guy Harris e1d0bb0329 Fix even more indentation.
svn path=/trunk/; revision=7696
2003-05-20 07:38:55 +00:00
Guy Harris 5b9c797797 Fix more indentation.
svn path=/trunk/; revision=7695
2003-05-20 07:37:37 +00:00
Guy Harris 3e9ae3f138 Fix indentation.
svn path=/trunk/; revision=7694
2003-05-20 07:35:09 +00:00
Guy Harris a8f171f2ff From Tony Schene: AUTH_GSSAPI support.
Replace "proto_item_set_len()" with "proto_item_set_end()", and get rid
of the "old_offset" variables the "proto_item_set_len()" calls required.

svn path=/trunk/; revision=7634
2003-05-02 21:58:23 +00:00
Ronnie Sahlberg a6d39ab5e6 Patch missed by cvs/me due to too different trees
svn path=/trunk/; revision=7544
2003-04-23 10:31:38 +00:00
Guy Harris 5c1d9182ec Make "first_pdu" an argument rather than a global in the ONC RPC
dissector - including the ONC RPC-over-TCP record marking code, which is
also used by NDMP.

That means that the NDMP dissector can, like the ONC RPC dissector, put
into the Info column items for all the NDMP messages dissected for a
frame; make it do so.

svn path=/trunk/; revision=7516
2003-04-21 08:13:18 +00:00
Guy Harris d359286841 Add a pointer to an hf_ value for a "reassembled_in" field (which can be
null) to the "fragment_items" structure, and don't pass that value into
"process_reassembled_data()", just have it use the value in the
"fragment_items" structure passed to it.

Make "process_reassembled_data()" capable of handling reassembly done by
"fragment_add_seq_check()", and use it in the ATP and 802.11 dissectors;
give them "reassembled_in" fields.  Make "process_reassembled_data()"
handle only the case of a completed reassembly (fd_head != NULL) so that
we can use it in those dissectors without gunking the code up too much.

svn path=/trunk/; revision=7513
2003-04-20 11:36:16 +00:00
Guy Harris 8140efea8e Add a "fragment_add_multiple_ok()" routine that skips the check for a
fragment having been added already.  In protocols using the ONC
RPC-over-TCP record-marking mechanism (RPC-over-TCP and NDMP), there can
be more than one record-marking-layer fragment in a single TCP segment,
and thus can be more than one fragment in a frame being added to a given
higher-level packet.

svn path=/trunk/; revision=7508
2003-04-20 00:27:29 +00:00
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 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
Jörg Mayer 9281a04064 Pointer <--> int converions cause warnings on ia64.
Modified a patch originally contained in the SuSE distro
to do the conversions via glib macros.

svn path=/trunk/; revision=7330
2003-03-10 02:06:33 +00:00
Guy Harris d2986ef68d Make the "rpc.fragment" and "rpc.fragment.error" fields FT_FRAMENUMs, as
they're put into the tree with "proto_tree_add_uint_format()", with the
frame number as the value.

svn path=/trunk/; revision=6824
2002-12-31 07:49:14 +00:00
Guy Harris a97b83a7f4 Add a new field type FT_FRAMENUM; an FT_FRAMENUM is a 32-bit unsigned
frame number, which is always decimal.  If you select an FT_FRAMENUM
field, there are menu items that let you go to the frame whose frame
number appears in that field.

Add FT_FRAMENUM fields for the ONC RPC "matching request is in this
frame" and "matching reply is in this frame" protocol tree items.

svn path=/trunk/; revision=6802
2002-12-19 02:58:53 +00:00
Ronnie Sahlberg 73dc273c7b When we have tretransmissions of TCP for a RPC/(NFS) session we
often get TCP to collapse multiple RPC PDUs into a MSS TCP segment.

This changes the RPC dissector so that it will put one entry on COL_INFO
for each PDU in the segment, (as the SMB dissector does for multiple AndX calls in one SMB PDU)
and just one entry for the first/last RPC PDU.

svn path=/trunk/; revision=6751
2002-12-06 21:01:37 +00:00
Guy Harris 59932f2722 Don't cast away constness, and fix variable and structure member
qualifiers as necessary to ensure that we don't have to.

"strcmp()", "strcasecmp()", and "memcmp()" don't return booleans; don't
test their results as if they did.

Use "guint8", not "guchar", for a pointer to (one or more) 8-bit bytes.

Update Michael Tuexen's e-mail address.

svn path=/trunk/; revision=6726
2002-12-02 23:43:30 +00:00
Guy Harris 46255d29ea From Mike Frisch: fix the display of the nickname in an ONC RPC AUTH_DH
header.

svn path=/trunk/; revision=6667
2002-11-23 03:38:00 +00:00
Uwe Girlich c84b7e9620 Since packet-rpc.c 1.56 (ethereal 0.8.18), we store in
dissect_rpc_opaque_data() the actual bytes into the dissector data tree
(improves searching). But if we only give the string "<DATA>" to the
proto_tree_add_* functions and tell it at the same time, that we have indeed
string_length_copy bytes, this leads to problems.

Correction: give the pointer into the real data and not the pointer to the
print string to the proto_tree_add_string_format() and
proto_tree_add_bytes_format() functions.

The correction was found by Martin Regner.

svn path=/trunk/; revision=6655
2002-11-18 09:35:29 +00:00
Guy Harris 809e8cc5b5 From Brian Ginsbach: add a new "dissect_rpc_bytes()" routine to allow
fixed-length opaque data to be dissected, and add support for SGI's
variant of the ONC RPC mount protocol.

svn path=/trunk/; revision=6620
2002-11-13 21:45:59 +00:00
Guy Harris 07d0032f1c 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.

svn path=/trunk/; revision=6491
2002-10-24 06:17:36 +00:00
Guy Harris 0c0516a755 Check whether the array of procedure hf values has an element for the
given version before fetching that value.

svn path=/trunk/; revision=6490
2002-10-24 03:54:11 +00:00
Guy Harris d5f34ad8b2 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".

svn path=/trunk/; revision=6486
2002-10-23 21:17:03 +00:00
Ronnie Sahlberg 93a649db6f Tap api. tap is a simple api that can be used for arbitrary extensions.
One example extension is rpcstat.

Try -Z rpc,rtt,100003,3 as argument to tethereal when reading a capture
containing NFSv3 packets.

tap-rpcstat.[ch] is intended to demonstrate the api and can be used to
base other extensions on.

svn path=/trunk/; revision=6175
2002-09-04 09:40:29 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris 3cba66311d The "GSS Data" is not a GSS token, it's a sequence number followed by
(unencrypted) request data.

svn path=/trunk/; revision=6068
2002-08-22 20:47:10 +00:00
Guy Harris 640161291a Use the GSSAPI token dissector on what are presumed to be GSSAPI tokens.
For the "GSS Data", put the un-rounded length into the protocol tree, as
that's the value extracted from the packet.

svn path=/trunk/; revision=6067
2002-08-22 20:22:22 +00:00
Guy Harris ec975908e2 Make a common routine for dissecting GSS-API tokens, and call it for
GSS-API tokens in RPCSEC_GSS_INIT and RPCSEC_GSS_CONTINUE_INIT arguments
and results.

svn path=/trunk/; revision=6051
2002-08-21 21:10:10 +00:00
Guy Harris 5d4d48242a Note that, as we now have a GSS-API token dissector, we should perhaps
call that for GSS-API tokens in ONC RPC calls.

svn path=/trunk/; revision=6050
2002-08-21 21:05:08 +00:00
Jörg Mayer 173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Guy Harris 4f9508837a Add "show_fragment_seq_tree()", which is like "show_fragment_tree()",
but for stuff reassembled with "fragment_add_seq()" or
"fragment_add_seq_check()".

Add a "fragment tag" string to the "fragment_items", so that packets
with fragmentation errors can be properly flagged as having "Illegal
fragments" or "Illegal segments" depending on the term used with the
protocol in question.

Make all the dissectors that can use "show_fragment_tree()" or
"show_fragment_seq_tree()", and don't already use them, do so.

svn path=/trunk/; revision=5644
2002-06-07 10:11:41 +00:00
Ronnie Sahlberg 1e043ca82a Updated NDMP and ONC RPC services to use the new function to display
fregment trees.

svn path=/trunk/; revision=5627
2002-06-05 11:32:14 +00:00
Guy Harris 392a7dfc04 Get rid of the "data_src" member of the "frame_data" structure; put it
in the "packet_info" structure instead, as we don't need a pointer for
every single frame in the capture file, just for each frame for which we
currently have an open "epan_dissect_t".

svn path=/trunk/; revision=5614
2002-06-04 07:03:57 +00:00