Commit Graph

7241 Commits

Author SHA1 Message Date
Laurent Deniel dc01cb646b - conversation_get_protocol_data -> conversation_get_proto_data
- miscellaneous typos corrected

svn path=/trunk/; revision=7329
2003-03-09 22:00:26 +00:00
Jörg Mayer 52487949b5 Remove used parameter pinfo from dissect_ser
svn path=/trunk/; revision=7328
2003-03-09 03:19:03 +00:00
Gerald Combs 628be571bd From Markus Friedl: Remove duplicate code in packet-ssh.c.
svn path=/trunk/; revision=7327
2003-03-08 22:15:41 +00:00
Laurent Deniel 96a5616ada The SMPP dissector has a too light heuristic and
it wrongly decodes non SMPP packets.
Check that the overall PDU size is not greater
than 64K before accepting to decode the packet.
Check at least valid as of SMPP v3.4 issue 1.2.

svn path=/trunk/; revision=7326
2003-03-08 14:21:15 +00:00
Jörg Mayer 642d094419 Ruediger Oertel <ro@suse.de>
Fix invalid preprocessor token pasting.

svn path=/trunk/; revision=7325
2003-03-08 11:43:54 +00:00
Guy Harris 4d46ba0a27 If we have <windows.h>, we need to include it to declare OSVERSIONINFO.
Fix some typos.

Put the build number after the "szCSDVersion" value; on NT, that makes
it show up as "Windows {NT x.y,2000,XP,etc.} Service Pack N, build N",
and on OT, it might make it show up as "Windows {95,98,Me} X, build N",
where "X" might be "A" or "B" or something such as that.  (We might want
to omit the space before "szCSDVersion" on Windows OT - I think the
"right" name might be something like "Windows 95B", but I'm not sure.)

svn path=/trunk/; revision=7324
2003-03-08 11:15:49 +00:00
Guy Harris ad8856029b WTAP_ENCAP_ENC was, in fact, intended for use for DLT_ENC, so just
rename WTAP_ENCAP_ENC0 to WTAP_ENCAP_ENC.

un-#if 0 out the code to handle the value 109 for DLT_ENC, as I've just
checked in support for DLT_ENC in tcpdump.org libpcap and tcpdump, which
maps DLT_ENC to 109 in the file header.

Give packet-enc.c an RCS ID.

svn path=/trunk/; revision=7323
2003-03-08 09:11:53 +00:00
Guy Harris c6f038a787 Treat the Peripheral Qualifier field the same way we treat the
Peripheral Device Type field, i.e. as a registered field that's a
bitfield with a value_string table.  Give it the correct bitmask.

Fix up some device type names, and add some additional ones from the 25
July 2002 SPC-3 draft.

Correctly adjust the length of the LUN list in the Report LUNs response
(subtract 8 from the payload length before comparing, don't subtract 8
from the resulting length after comparing and adjusting), and rename the
variable to reflect the fact that it's a length in bytes, not a number
of LUNs.

svn path=/trunk/; revision=7322
2003-03-08 08:02:20 +00:00
Guy Harris 0b1702c359 The time deltas are for AFS, not ONC RPC.
svn path=/trunk/; revision=7321
2003-03-08 07:27:41 +00:00
Guy Harris 170b5028e9 Put the code to get version numbers of various libraries with which
Ethereal/Tethereal was linked into a common routine, and use that in
both Ethereal and Tethereal.

Add to that routine code to get OS version information.

svn path=/trunk/; revision=7320
2003-03-08 07:00:48 +00:00
Guy Harris 55e1519797 Add some missing entries, and put the entries in the same order as the
AUTHORS file.

svn path=/trunk/; revision=7319
2003-03-08 05:37:32 +00:00
Guy Harris 774477f405 From Lars Roland: fix for his entry in the AUTHORS list.
svn path=/trunk/; revision=7318
2003-03-08 05:36:30 +00:00
Guy Harris c73d1525b6 Documentation for the MGCP tap,f rom Lars Roland.
svn path=/trunk/; revision=7317
2003-03-08 05:34:51 +00:00
Gerald Combs 15bd53ef9e Updates for 0.9.10.
svn path=/trunk/; revision=7315
2003-03-08 03:12:32 +00:00
Guy Harris 5bf33b9ca9 Note that you need <io.h> on Windows if you want to use "open()",
"close()", "read()", "write()", etc..

svn path=/trunk/; revision=7314
2003-03-07 21:50:34 +00:00
Gerald Combs 40606a6ed2 Add an average packet size, as suggested by Daniel Jackson.
svn path=/trunk/; revision=7313
2003-03-07 20:27:02 +00:00
Guy Harris fb65eca073 Include <io.h>, if present, to get "_open()", "_close()", etc. declared.
svn path=/trunk/; revision=7312
2003-03-07 19:47:07 +00:00
Guy Harris 723612fe3e Make the DISSECTOR_SRC macro match the Makefile.am one, with the
dissectors for the OpenBSD enc(4) encapsulating interface and RFC 3378
Ethernet-over-IP.

svn path=/trunk/; revision=7311
2003-03-07 19:15:48 +00:00
Gerald Combs 0b94d9a228 From Markus Friedl:
Add support for the OpenBSD enc(4) encapsulating interface.  Add
  support for Ethernet over IP (RFC 3378).

Fold Markus' .h files into their respective .c files, add a define to
ipproto.h and use it.

svn path=/trunk/; revision=7310
2003-03-07 16:52:46 +00:00
Gerald Combs 41ab264d0a Add packet-mgcp.h to the distribution.
svn path=/trunk/; revision=7309
2003-03-07 04:13:26 +00:00
Guy Harris d63f5fdae3 Add another sanity check - there shouldn't be more than 47 bytes of
padding before the AAL5 trailer.

svn path=/trunk/; revision=7308
2003-03-07 03:19:50 +00:00
Jörg Mayer d7bcd8e261 Declare f_tempname and r_tempname static
svn path=/trunk/; revision=7307
2003-03-07 01:18:21 +00:00
Guy Harris e4677cd36e Add in some additional Cisco URLs for NetFlow documentation.
According to the V9 documentation at the first of those URLs, the length
field in a data flowset includes the lengths of the flowset ID and
length fields, so subtract that before calling "dissect_v9_data()" - and
don't call "dissect_v9_data()" if the length isn't positive after that's
done.

Don't bother checking whether there's data in the tvbuff in the loop
that dissects V9 data flowsets - if there isn't, we *want* an exception
to be thrown, as that's a short or malformed frame.  Do, however, make
sure we have at least as much data left in the flowset as the template
claims should be there - otherwise, we have padding, not a record.
Display that padding as such.

Make the length argument to "dissect_v9_data()" unsigned, so that we
don't get compiler warnings when comparing it with the unsigned "length"
field of a template.

If we don't find the template for a data flowset, just show the data as
such.

svn path=/trunk/; revision=7306
2003-03-07 00:43:30 +00:00
Jörg Mayer eb98c553d5 FAQ was updated
svn path=/trunk/; revision=7305
2003-03-07 00:29:05 +00:00
Guy Harris a7d60117c4 NO_DATA is apparently #defined by some header file when building with
MSVC++ on Windows - stick TAP_RTP_ in front of all the error enum
values, to avoid name collisions.

Do *NOT* allocate a zero-length array as an automatic variable,
especially if you're going to assign to the first element of that
array....

svn path=/trunk/; revision=7304
2003-03-07 00:03:47 +00:00
Guy Harris 60ab93fa97 Get rid of CRs.
Get rid of comments about the format string to use with guint16 and
guint32 - we're using the right string, which is neither "%lu" (as that
requires a 64-bit argument on platforms with 64-bit longs) nor "%d" (as
that expects a *signed* quantity, not an *unsigned* quantity), but "%u".

Protect the include of <unistd.h> with "#ifdef HAVE_UNISTD_H", as it's
not present on Windows if you're not building with a UNIXalike wrapper
library.

Use "wb", not "w", when creating binary files with "fopen()"; the "b" is
required on Windows.

Use O_BINARY when opening binary files, and #define it as 0 if it's not
defined; O_BINARY is required on Windows.

svn path=/trunk/; revision=7303
2003-03-06 23:09:09 +00:00
Guy Harris e431a83cde Throw in some additional portability notes about:
not using "%l[doux]" with guint32;

	not including <unistd.h> without #ifdef HAVE_UNISTD_H;

	not fopening binary files with "r", "w", etc., and not opening
	them with "open()" without using O_BINARY.

svn path=/trunk/; revision=7302
2003-03-06 22:41:39 +00:00
Guy Harris 4af8b71f79 Get rid of CRs.
svn path=/trunk/; revision=7301
2003-03-06 22:36:43 +00:00
Guy Harris c4f6fed5b5 Give a bunch of files RCS IDs.
svn path=/trunk/; revision=7300
2003-03-06 21:57:17 +00:00
Laurent Deniel 58a4a837e0 Move RTP Analysis to Statistics menu
(all taps should be located here especially
 very protocol specific ones)

svn path=/trunk/; revision=7299
2003-03-06 21:21:43 +00:00
Laurent Deniel d17a08f9cd - Protect tap_rtp.h against multiple inclusions
- Add $Id$ to tap_rtp.[hc]

svn path=/trunk/; revision=7298
2003-03-06 21:15:59 +00:00
Ronnie Sahlberg 05dad0c310 From Miha Jemec :
Functionality to reassemble a RTP stream and save it as a file.
Support for G.711 coded

svn path=/trunk/; revision=7297
2003-03-06 20:35:12 +00:00
Guy Harris 2b7866f33b "transid" values are guint32's, and should be printed with "%u" (on
most, if not all, platforms on which Ethereal runs, a guint32 is an
"unsigned int", not an "unsigned long", and on platforms where an
"unsigned long" is 64 bits, "%ld" is definitely wrong - and so is
"%lu").

svn path=/trunk/; revision=7296
2003-03-06 19:15:09 +00:00
Guy Harris e2c1862af7 Declare functions as extern, as some of them are part of the plugin ABI,
and compilation fails on Windows if they're not declared as externs.

svn path=/trunk/; revision=7295
2003-03-06 19:04:28 +00:00
Ronnie Sahlberg e00fb8c413 From Lars Ronald :
MGCP request/response matching and
MGCPSTAT RTT calculation.

For those with MGCP captures, try
-z mgcp,rtd[,filter]

svn path=/trunk/; revision=7294
2003-03-06 09:01:47 +00:00
Ronnie Sahlberg b1a9c6e00f Update and added text to README.tapping based on comments in the
contributed RTP tap for voice.

Explained when a tap listener is called and somethings to keep in
mind when adding taps to protocols that may appear multiple times inside the
same packet.

svn path=/trunk/; revision=7293
2003-03-06 07:54:24 +00:00
Ronnie Sahlberg 1f3ad48739 From Jamie F,
I forgot to fix the field names when adding the AFS ReplyIn and friends
yesterday, thus causing
-z proto,colinfo,rpc.time,rpc.time  not to work.

They should not have been called rpc.* anyway.

I fixed RequestIn, ReplyIn, TimeFromRequest fields for AFS
request/response matching to have proper names starting with afs.
so we dont collide with the names for the ONC-RPC ones.

svn path=/trunk/; revision=7292
2003-03-06 07:39:19 +00:00
Guy Harris 60de380663 From Devin Heitmueller: follow TCP Stream support for showing stream
data as C byte arrays.

svn path=/trunk/; revision=7291
2003-03-06 04:23:51 +00:00
Guy Harris 169be53c11 Make various variables containing unsigned quantities unsigned.
Check whether a device identifier in a vital product data page (not a
vital data product page, although I guess most SCSI devices could be
considered data products) is bigger than the page before displaying it.

Don't bother to check whether the full identifier is in the packet - if
it's not, an exception will be thrown and an error indication put into
the protocol tree, which is the correct thing to do.  Do, however, check
whether the identifier length is 0 before putting a protocol tree entry
in.

svn path=/trunk/; revision=7290
2003-03-05 20:25:59 +00:00
Guy Harris ff1c297602 "gtk_box_pack_end()" expects a GtkBox, not a GtkContainer, as its first
argument.

svn path=/trunk/; revision=7289
2003-03-05 20:12:04 +00:00
Jörg Mayer 0af9ca446a Remove 00:40:96 from manuf.tmpl (Aironet, Ciron).
svn path=/trunk/; revision=7288
2003-03-05 17:29:33 +00:00
Jörg Mayer 79d8933408 Update manuf to current IEEE entries.
Remove 00:40:96 from manuf.tmpl (Aironet, Ciron).

svn path=/trunk/; revision=7287
2003-03-05 17:27:20 +00:00
Gerald Combs c0333e2784 Eliminate vertical padding in the IO Stat window.
svn path=/trunk/; revision=7286
2003-03-05 15:54:31 +00:00
Gerald Combs 4a9b4904a7 From Craig Rodrigues:
- correct dissection of giop-broken.pcap supplied by Guy Harris
- correct dissection of CodeSet service context, as supplied by Guy Harris
- correct dissection of RTCorbaPriority values, as supplied by me
- general cleanups and removal of unnecessary code

svn path=/trunk/; revision=7285
2003-03-05 15:33:12 +00:00
Ronnie Sahlberg f3868672bf Update for AFS and related protocols so that time between Request and
Response is calculated in the same way as for oncrpc, dcerpc, smb...

requests where a reply has been matched will now have a
Reply In:<framenumber>
in the tree pane.
replies where the request has been seen will have
Request In:<framenumber>
Time since request:<seconds>

later tethereal and ethereal rtt stats will be implemented.

svn path=/trunk/; revision=7284
2003-03-05 09:52:22 +00:00
Guy Harris 6e797c5b9d From Dinesh Dutt:
fix the Fibre Channel reassembly code;

	fix handling of addresses in FC frames encapsulated inside
	various internal Cisco protocols;

	display link state records & descriptors better so as to improve
	readability & reduce the need to expand tree to find useful
	information;

	handle older versions of SW_RSCN;

	fix saving of device type from Inquiry command;

	add another Ethertype used internally in Cisco switches.

svn path=/trunk/; revision=7283
2003-03-05 07:41:24 +00:00
Guy Harris 05c41a279f Use the reported length, not the captured length, as the fragment length
when doing reassembly.

In some additional places, use "tvb_bytes_exist()" to check whether we
have enough data to do reassembly, rather than checking to see if the
frame is short (it might be short but we might still have enough data to
do reassembly).

In DCE RPC, use the fragment length from the header as the number of
bytes of fragment data.

There's no need to check "pinfo->fragmented" before doing reassembly in
the DCERPC-over-SMB-pipes code - either we have all the data or we
don't.

In SNA and WTP reassembly, add a check to make sure we have all the data
to be reassembled.

svn path=/trunk/; revision=7282
2003-03-05 07:17:50 +00:00
Guy Harris 72a00f19ca Distinguish between the two directions of X.25 traffic when doing
reassembly - don't reassemble packets from different directions into a
single packet.

We don't need to check whether we have enough data for reassembly -
"fragment_add_seq_next()" does that for us.

If we're doing reassembly, show the user data of packets with the M bit
set as "User data".

svn path=/trunk/; revision=7281
2003-03-05 05:20:38 +00:00
Gerald Combs 287c2ef9c3 Update NEWS and ChangeLog to January 31.
svn path=/trunk/; revision=7280
2003-03-05 03:51:23 +00:00
Guy Harris bc0799079d When reassembling, test the correct M bit based on whether it's mod-8 or
mod-128.

Don't reassemble if we don't have all the payload (e.g., if we have a
short frame).

Clean up indentation.

Remove the "_x25" at the end of the preference for reassembling X.25
packets - it already has "x25." at the beginning.

Add a bunch of #defines for various bits to be tested, and use them.

svn path=/trunk/; revision=7279
2003-03-05 01:12:11 +00:00