Commit Graph

4706 Commits

Author SHA1 Message Date
Ashok Narayanan cd44c487d4 Fixed small bug in translation of IXCD in OSPF GMPLS LSA.
svn path=/trunk/; revision=4759
2002-02-19 21:56:56 +00:00
Guy Harris ddf6a753f0 From Andrew Hood: translate enterprise OIDs in SNMP traps to strings if
possible.

svn path=/trunk/; revision=4758
2002-02-19 09:35:45 +00:00
Guy Harris 642d7239dc Update a comment.
svn path=/trunk/; revision=4757
2002-02-19 03:43:43 +00:00
Guy Harris 51f8197b51 Fix the declaration of "rec_dissector_t" to include a return value type.
svn path=/trunk/; revision=4756
2002-02-19 03:43:08 +00:00
Guy Harris bcaa0c5c58 Fix up the declaration of "addr_tvb_new_real_data" to match
"tvb_new_real_data()".

svn path=/trunk/; revision=4755
2002-02-19 01:28:43 +00:00
Guy Harris d1afae8393 For TCP segments that are reassembled into larger packets, show the data
as raw TCP segment data under the TCP protocol tree item, rather than as
a top-level data item - and do so even for the last of the segments
reassembled into that packet.

svn path=/trunk/; revision=4754
2002-02-19 00:14:21 +00:00
Guy Harris b505843920 Add support for reassembling RPC-over-TCP fragments, and do that in both
RPC and NDMP.

Show the RPC-over-TCP fragment header as a tree with bitfields below it.

Add a routine to show a reported bounds error as an "Unreassembled
Packet" or a "Malformed Packet" depending on whether "pinfo->fragmented"
is set, and have NBNS and RPC use that.

Add "ett_ndmp_file_stats" to the list of ett_ values to be initialized
(it wasn't in that list, and wasn't getting initialized).

When freeing up various hash tables and memory chunks in the RPC
dissector, zero out the pointers to them, just to make sure we don't try
to free them again.

Always destroy the TCP segment key and address memory chunks in
"tcp_desegment_init()", regardless of whether TCP desegmentation is
enabled - we don't *allocate* them if TCP desegmentation isn't enabled,
but we should free them even if it's not enabled.  Also, when we free
them, set the pointers to them to null, so we don't double-free them.

Supply to subdissectors called from the TCP dissector the sequence
number of the first byte handed to the sub dissector.

svn path=/trunk/; revision=4753
2002-02-18 23:51:55 +00:00
Guy Harris 8166da40d5 Have "alloc_field_info()" take a pointer to the field length as an
argument, so if the length was supplied as -1, it can set it to the
length of data remaining in the tvbuff, so that its callers can use that
length when getting the value for the field, rather than leaving the
length in the "field_info" structure as -1.

svn path=/trunk/; revision=4752
2002-02-18 22:26:29 +00:00
Guy Harris 6a21dc7e44 Don't give tvbuffs names; instead, give data sources names, where a
"data source" has a name and a top-level tvbuff, and frames can have a
list of data sources associated with them.

Use the tvbuff pointer to determine which data source is the data source
for a given field; this means we don't have to worry about multiple data
sources with the same name - the only thing the name does is label the
notebook tab for the display of the data source, and label the hex dump
of the data source in print/Tethereal output.

Clean up a bunch of things discovered in the process of doing the above.

svn path=/trunk/; revision=4749
2002-02-18 01:08:44 +00:00
Guy Harris d92a1cd8e1 With the tvbuffication of all dissectors, the "packet_info" structure no
longer contains length fields, so there's no need to pass a "packet_info
*" argument to "set_actual_length()".

svn path=/trunk/; revision=4748
2002-02-17 00:51:21 +00:00
Guy Harris ac5a603cb7 Add support for SNA-over-Ethernet (Ethernet type 80d5).
svn path=/trunk/; revision=4747
2002-02-17 00:16:19 +00:00
Guy Harris 31fc804847 From Joerg Mayer: remove trailing blanks from hex dump in
print/Tethereal.

svn path=/trunk/; revision=4742
2002-02-15 11:56:10 +00:00
Guy Harris d49247e450 AiroPeek puts variable-length, not padded fixed-length, 802.11 headers
into captures.

The data rate header is in .5 megabyte/second units, not .5
kilobyte/second units.

svn path=/trunk/; revision=4741
2002-02-15 11:37:56 +00:00
Guy Harris 3e39a2b0f2 Put in a missing "break;" statement. (Testing the untested AiroPeek
support revealed that I'd left it out; putting it back made it work.)

svn path=/trunk/; revision=4740
2002-02-15 11:35:13 +00:00
Guy Harris 44ba4504b4 Undo the change of "UcpHandleByte(hf_ucp_parm_NT);" to
"UcpHandleString(hf_ucp_parm_NT);" - the field really is one character
long, as per the (correct) change from FT_STRING to FT_UINT8.

svn path=/trunk/; revision=4739
2002-02-15 11:24:45 +00:00
Gilbert Ramirez e36aa9657d Comment-out FT_UCS2_LE, and remove the already commented-out FT_TEXT_ONLY.
svn path=/trunk/; revision=4738
2002-02-15 09:01:21 +00:00
Gilbert Ramirez 558d570073 Add ncp2222 as a type of packet than randpkt can produce.
If type passed in with -t option is unknown, die instead of using
Ethernet as a default.

svn path=/trunk/; revision=4737
2002-02-14 17:45:07 +00:00
Gilbert Ramirez c902d9899b Register hf_ucp_parm_NT as an FT_UINT8 instead of FT_STRING,
and use the vals_parm_NT value string in that registration.
Thanks to Marcin Gryszkalis <mgryszkalis@cerint.pl> for the bug report.

svn path=/trunk/; revision=4736
2002-02-14 16:48:08 +00:00
Gilbert Ramirez 756707ac0d FIRST_PROTO_PREFS_PAGE needs to be incremented by 2 in order for
the "Protocol Preferences" pop-up menu option to work properly.

svn path=/trunk/; revision=4735
2002-02-14 10:58:49 +00:00
Guy Harris 0d297e590e From Ronnie Sahlberg: add decoding of the (known) individual bits of
the Account-Control bits.

svn path=/trunk/; revision=4734
2002-02-14 05:56:48 +00:00
Guy Harris 879e1160e4 From Tim Potter:
- For selected read and write SMBs, display the byte count and offset
    in the info column.  This makes browsing file read/writes easier to
    understand.

  - In dissect_nt_sids() sometimes the version number is 3 but the rest
    of the sid format remains the same.  This is purely by observation -
    I have no documentation to confirm this.

  - Use a GString instead of a fixed buffer in dissect_nt_sids().

svn path=/trunk/; revision=4733
2002-02-14 05:53:59 +00:00
Guy Harris 8ea7c346b8 From Laurent Rabret: print the correct length in the Extended
Communities attribute in a BGP Update message.

Also, get rid of an extra space before a colon in the display for that
attribute, which isn't in other attributes.

svn path=/trunk/; revision=4732
2002-02-14 05:28:44 +00:00
Guy Harris 055f13d2d1 "tvb_ieee_to_long()" returns a "long", not a "long long", so you can't
print it with "%lld".

In any case, not all platforms on which Ethereal can be built support
64-bit integral data types, and, even on those that do, not all of them
support "%ll[doux]" as the format for printing those types, so do the
arithmetic in floating point by multiplying the bytes/s values by 8.0,
and print with "%.0f" instead.

svn path=/trunk/; revision=4731
2002-02-14 05:23:32 +00:00
Ashok Narayanan 00d1c463ee GMPLS extensions for OSPF Opaque LSAs
svn path=/trunk/; revision=4730
2002-02-14 02:32:14 +00:00
Guy Harris ff9f006274 From Ronnie Sahlberg:
fix various alignment problems;

	change/prettify a few of the structures;

	other updates.

svn path=/trunk/; revision=4729
2002-02-13 04:14:13 +00:00
Guy Harris e594878f52 From Ronnie Sahlberg: display the opnum also for reply packets.
svn path=/trunk/; revision=4728
2002-02-13 04:12:42 +00:00
Guy Harris e7737953d0 From Ronnie Sahlberg: display FILETIME values of 0x8000000000000000 as
"Infinity (absolute time)", and values of 0x7fffffffffffffff as
"Infinity (relative time)".

svn path=/trunk/; revision=4727
2002-02-13 04:11:37 +00:00
Guy Harris a006c4fcca Have the private data for the SCSI dissection routines be a pointer to a
structure containing a 32-bit conversation ID (which uniquely identifies
conversations between a SCSI initiator and target) and a 32-bit task ID
(which uniquely identifies a task within that conversation).

Have the NDMP dissector create conversations when it sees an "execute
CDB" request, and use the conversation index as the conversation ID and
the sequence number for requests and reply sequence for replies as the
task ID.

Have it use "dissect_scsi_payload()" to dissect the payload of "execute
CDB" requests and replies.

svn path=/trunk/; revision=4726
2002-02-13 01:17:58 +00:00
Guy Harris 2c62907ff6 Dissect "execute CDB" requests and replies.
Get rid of extra trailing white space in some protocol tree items.

svn path=/trunk/; revision=4725
2002-02-12 23:56:37 +00:00
Guy Harris 869e4d94f6 Move all the stuff in "packet-scsi.h" that's solely for the use of
"packet-scsi.c" into "packet-scsi.c"; the iSCSI dissector doesn't need
its own versions of a pile of static data structures used only by
"packet-scsi.c", nor does it need a pile of typedefs and #defines used
only by "packet-scsi.c".

The iSCSI dissector *does* use "scsi_status_val", so make that
non-static, and export it from "packet-scsi.h".

svn path=/trunk/; revision=4724
2002-02-12 23:52:34 +00:00
Guy Harris 8bf31f9c18 Have a Q.931-over-TPKT TCP heuristic dissector.
Have the Q.931 PDU dissector, if it's Q.931-over-TPKT, check for
user-user IEs with a protocol discriminator of "X.208 and X.209 coded
user information" and, if it sees one, call an H.225.0 Call Setup
dissector if it could find the handle for it.

svn path=/trunk/; revision=4723
2002-02-12 10:21:05 +00:00
Guy Harris 3b47ff0df8 Display the fragment length, and fragment ordinal number, in decimal.
svn path=/trunk/; revision=4722
2002-02-12 07:55:23 +00:00
Guy Harris a8fc99ae5a From Ronnie Sahlberg:
SAMR updates;

	a bugfix in dissect_ndr_pointer() (should not check referent id
	for aliases for unique pointers);

	enhancement to dissect_ndr_pointer() to make it possible to
	hand a generic int value to the dissector for the pointer object
	in a similar way as hf_index values are passed through the
	pointer layer.

svn path=/trunk/; revision=4721
2002-02-12 07:35:21 +00:00
Gilbert Ramirez 9249d8094f dissect_frame() can throw a ReportedBoundsError; catch it in
dissect_packet().

svn path=/trunk/; revision=4720
2002-02-11 19:02:56 +00:00
Guy Harris 04228a94a3 From Ronnie Sahlberg:
fix to LookupRids to match what the IDL file says;

	fix to "dissect_ndr_uint64()" to specify the right length to
	"proto_tree_add_item()";

	give the protocol tree items for array header counts and offsets
	the correct offsets in the packet.

svn path=/trunk/; revision=4719
2002-02-11 08:19:09 +00:00
Guy Harris 1726d487a5 From Todd Sabin:
dissect dcerpc UDP replies correctly - use the opnum from the
	request, ont the reply (the opnum from the request is frequently
	wrong in Microsoft's DCE RPC implementation);

	don't crash if the packet isn't found in the hash tables;

	dissect SamrLookupDomain requests properly.

svn path=/trunk/; revision=4718
2002-02-10 23:51:44 +00:00
Guy Harris 02492be162 Put ARP hardware addresses that are MAC addresses into the protocol tree
as FT_ETHER fields, not FT_BYTES fields.

Only label Appletalk protocol addresses as "{Source,Target} ID"; label
the others as "{Source,Target} protocol address", and have different
fields for Appletalk and other protocol addresses.

Don't put addresses into the protocol tree if they're zero-length.

svn path=/trunk/; revision=4717
2002-02-10 23:48:14 +00:00
Guy Harris 2d7cb879d0 Put ARP hardware addresses that are MAC addresses into the protocol tree
as FT_ETHER fields, not FT_BYTES fields.

Don't treat Experimental Ethernet addresses as being Ethernet addresses
(they were 8 bytes long, not 48 bytes long).

Put ARP protocol addresses that are IPv4 addresses into the protocol
tree as FT_IPv4 fields, not FT_BYTES fields.

Fix the checks for MAC hardware addresses and IPv4 protocol addresses,
done to see if we should say a given Ethernet address has the same name
as a given IP address, to check both the type and length.

svn path=/trunk/; revision=4716
2002-02-10 22:41:48 +00:00
Guy Harris ba43ce663f From Ronnie Sahlberg: display the mailslot header items only if we have
a tvbuff with the mailslot header.

Fix indentation.

svn path=/trunk/; revision=4715
2002-02-10 02:25:14 +00:00
Guy Harris e9c58fda32 From Ronnie Sahlberg: display the SAMR "Account Control" field in hex.
svn path=/trunk/; revision=4714
2002-02-10 02:23:17 +00:00
Guy Harris a5d1606394 Make the fields that correspond to Boolean bitfields be FT_BOOLEANs.
Display the VLDB flags in hex, not decimal.

svn path=/trunk/; revision=4713
2002-02-10 02:22:02 +00:00
Guy Harris 1112b4b506 Support for the new restart TLV, from Hannes Gredler.
svn path=/trunk/; revision=4712
2002-02-09 23:44:38 +00:00
Nathan Neulinger 089a32b1eb rename some macros, start getting rid of redundant macros, add more vldb dissection
svn path=/trunk/; revision=4711
2002-02-08 22:36:21 +00:00
Guy Harris 2f3a001d65 Fixes from Ronnie Sahlberg.
svn path=/trunk/; revision=4710
2002-02-08 11:02:03 +00:00
Guy Harris 89a4acb438 Have Wiretap set the snapshot length to 0 if it can't be derived from
reading the capture file.  Have callers of "wtap_snapshot_length()"
treat a value of 0 as "unknown", and default to WTAP_MAX_PACKET_SIZE (so
that, when writing a capture file in a format that *does* store the
snapshot length, we can at least put *something* in the file).

If we don't know the snapshot length of the current capture file, don't
display a value in the summary window.

Don't use "cfile.snap" as the snapshot length option when capturing -
doing so causes Ethereal to default, when capturing, to the snapshot
length of the last capture file that you read in, rather than to the
snapshot length of the last capture you did (or the initial default of
"no snapshot length").

Redo the "Capture Options" dialog box to group options into sections
with frames around them, and add units to the snapshot length, maximum
file size, and capture duration options, as per a suggestion by Ulf
Lamping.  Also add units to the capture count option.

Make the snapshot length, capture count, maximum file size, and capture
duration options into a combination of a check box and a spin button.
If the check box is not checked, the limit in question is inactive
(snapshot length of 65535, no max packet count, no max file size, no max
capture duration); if it's checked, the spinbox specifies the limit.
Default all of the check boxes to "not checked" and all of the spin
boxes to small values.

Use "gtk_toggle_button_get_active()" rather than directly fetching the
state of a check box.

svn path=/trunk/; revision=4709
2002-02-08 10:07:41 +00:00
Guy Harris ad1ce4a43d From Ronnie Sahlberg: add dissectors for the rest of SAMR.
svn path=/trunk/; revision=4708
2002-02-08 06:34:44 +00:00
Guy Harris f9c109a239 Support in Wiretap for DLT_HHDLC, from Tomas Kukosa.
svn path=/trunk/; revision=4707
2002-02-07 20:41:28 +00:00
Guy Harris 932fc43798 Additional cipher suite names for SSL, from Nathan Neulinger and Scott
Renfro.

svn path=/trunk/; revision=4706
2002-02-07 18:56:55 +00:00
Guy Harris f6563d402e If you compile with IBM's compiler on AIX 5.1, the compiler apparently
somehow doesn't like the structure member name "fh_len", for some reason
(probably some #define in some header file); change that (and other
"fh_len" variables) to "fh_length" instead.

svn path=/trunk/; revision=4705
2002-02-06 22:54:01 +00:00
Guy Harris 672006c8f5 Use "value_string" tables to map EAP code and type values to strings -
and fix up the table for EAP types.

svn path=/trunk/; revision=4704
2002-02-06 22:45:43 +00:00