Commit Graph

46485 Commits

Author SHA1 Message Date
Chris Maynard ab10fed503 Trivial: remove extraneous word, 'is'.
svn path=/trunk/; revision=49423
2013-05-20 01:35:17 +00:00
Evan Huus 7e0082988b At the suggestion of Stuart Kendrick via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8647
Improve documentation for tshark's -z io,stat somewhat so that it's clear(er)
that filters for the statistics must be associated with the -z flag and not
applied via -Y.

svn path=/trunk/; revision=49422
2013-05-19 19:49:36 +00:00
Anders Broman d06cb317a6 Add filter capabillities.
svn path=/trunk/; revision=49419
2013-05-19 17:14:33 +00:00
Anders Broman a68080a1c6 Don't access nbap_dch_chnl_info if the index is > maxNrOfDCHs
svn path=/trunk/; revision=49418
2013-05-19 15:21:33 +00:00
Chris Maynard c2a54d11d0 Trivial change so all longnames are aligned.
svn path=/trunk/; revision=49417
2013-05-19 15:12:01 +00:00
Jeff Morriss fcdc86eb1f test-fuzzed-cap.sh is now test-captures.sh
svn path=/trunk/; revision=49416
2013-05-19 15:00:32 +00:00
Ronnie Sahlberg 44e9de065d SCSI: Add support for report-one-command structure for REPORT SUPPORTED OPCODES
svn path=/trunk/; revision=49415
2013-05-19 14:45:12 +00:00
Ronnie Sahlberg a9b5d79a41 SCSI: REPORT SUPPORTED OPCODES print the reporing options in human readable
text.

svn path=/trunk/; revision=49414
2013-05-19 14:24:31 +00:00
Evan Huus 50acddcc97 Fix a memory leak by using seasonal memory for building all parts of one of
the address resolution tables.

Showed up with https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8670
although I doubt it's the cause of the crash.

svn path=/trunk/; revision=49413
2013-05-19 13:00:06 +00:00
Evan Huus 7d63573632 Update test-fuzzed-cap.sh:
- support testing multiple files at once
- use tools/test-common.sh to make sure we have the most up-to-date environment
  variables set (the old version was missing the WMEM_ one for example)
- rename to test-captures.sh since it works just fine on non-fuzzed files

svn path=/trunk/; revision=49412
2013-05-19 12:51:35 +00:00
Pascal Quantin d560c14cae Regenerate t124 dissector
svn path=/trunk/; revision=49411
2013-05-18 17:50:10 +00:00
Pascal Quantin 4745ae8689 Revert r49406: it's not ready for prime time yet
svn path=/trunk/; revision=49410
2013-05-18 17:48:50 +00:00
Martin Kaiser 2592079230 distinguish between length and reported length when dissecting a packet
with DLT_USERxy

with this fix, the user-encap dissector hands over truncated packets to
the defined sub-dissector

(the previous version would assume length==reported length and throw an
execption for truncated packets)

svn path=/trunk/; revision=49409
2013-05-18 17:08:46 +00:00
Ronnie Sahlberg 783cf2eff2 SCSI: Add dissection of REPORT SUPPORTED OPCODES
svn path=/trunk/; revision=49408
2013-05-18 16:26:26 +00:00
Pascal Quantin a9ced211ac Do not display payload twice when using uncompressed profile
svn path=/trunk/; revision=49407
2013-05-18 11:41:44 +00:00
Jörg Mayer 0531d214ad Move kerberos back from broken list to normal list
svn path=/trunk/; revision=49406
2013-05-18 09:25:45 +00:00
Jörg Mayer d9dd3f3e4e Fix "set but not used" compile warning turning error
svn path=/trunk/; revision=49405
2013-05-18 08:13:51 +00:00
Guy Harris 82f74c35fc Fill in the struct wtap_pkthdr in the seek-read routine.
svn path=/trunk/; revision=49404
2013-05-18 03:42:06 +00:00
Guy Harris 3fc0506b41 In libpcap_process_header(), fill in what phdr points to, not wth->phdr.
svn path=/trunk/; revision=49403
2013-05-18 03:15:06 +00:00
Guy Harris 4097d6e676 Fill in the struct wtap_pkthdr in the seek-read routine.
svn path=/trunk/; revision=49402
2013-05-18 03:02:04 +00:00
Guy Harris 33e1232f23 In the pcapng seek-read routine, *don't* fill in wth->phdr; seek-read
routines are passed a separate struct wtap_pkthdr to be filled in.

Get rid of the pseudo_header member of the wblock structure - the
pseudo-header is part of the struct wtap_pkthdr.

Get rid of the union wtap_pseudo_header * argument to
pcap_process_pseudo_header() - it's passed a pointer to a struct
pcap_pkthdr, and that structure contains the union in question.

Have libpcap_read_header() take a FILE_T argument, rather than using
only the "sequential" handle of the wtap it's handed.  Have the libpcap
read routine return the offset of the beginning of the pcap record, and
have the seek-read routine read the header and fill in the struct
wtap_pkthdr handed to it.

svn path=/trunk/; revision=49401
2013-05-18 02:36:00 +00:00
Guy Harris ba8ead5e61 Add some casts for C++ compatibility.
Make conv_get_fid() return a "const char *", as it can return a string
constant, and they are usually *not* writable.

svn path=/trunk/; revision=49400
2013-05-18 01:42:20 +00:00
Guy Harris a274d9de4a A "pointer to something" is a "void *", not a "char *". Using "void *"
avoids some alignment warnings from clang.

svn path=/trunk/; revision=49399
2013-05-18 00:45:20 +00:00
Guy Harris 055ff08c2f Use g_array_index() to get at elements of the encapsulation table array;
this avoids some compiler warnings from clang about alignment.

svn path=/trunk/; revision=49398
2013-05-18 00:41:30 +00:00
Guy Harris 288e81e40f Put the code to read trace record headers into a common routine used by
both the read and the seek-read routines.  Have the read routine return
the offset of the record header as the record's offset, so that the
seek-read routine can read that header.

svn path=/trunk/; revision=49397
2013-05-18 00:08:43 +00:00
Guy Harris ed76ed8c88 Don't pass globals as arguments to k12text_set_headers(), just use the
globals directly.  If we ever manage to make them *not* globals (which
might only be possible with newer versions of Flex), then we can do
better.

Get rid of an unused variable.

Squelch a 64-bit-to-32-bit conversion warning.

svn path=/trunk/; revision=49396
2013-05-17 23:53:44 +00:00
Guy Harris 4c679fb01a Rename k12text_set_pseudo_header() to k12text_set_headers() and have it
fill in the entire struct wtap_pkthdr.

svn path=/trunk/; revision=49388
2013-05-17 21:55:33 +00:00
Evan Huus 48285bb16b From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8643
When a TCP segment contains the end of two or more SSL PDUs, the TCP reassembly
code passes that segment up to the SSL dissector multiple times--one for each
SSL PDU. The SSL dissector queues the packet for SSL tap listeners each time it
is invoked. Therefore a single packet can be processed by SSL tap listeners
multiple times. But the tap data that the SSL dissector sends to its tap
listeners is a linked list of all PDUs in the packet.

The SSL tap listener responsible for populating the Follow SSL Stream dialog
did not account for the possibility of seeing a packet multiple times. As a
result, it would process the entire linked list of PDUs each time it received a
packet, and that would result in some SSL PDUs showing up two or more times in
the dialog.

This patch fixes the described bug. It also implements a few slight
improvements in closely related code. See bugzilla for details.


svn path=/trunk/; revision=49387
2013-05-17 21:50:27 +00:00
Pascal Quantin 0091c984df From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8695 :
packet-synphasor.c: use 'new_' versions of dissector registration and initialization

svn path=/trunk/; revision=49386
2013-05-17 21:24:20 +00:00
Pascal Quantin c080dd0474 More compilation fixes when having HAVE_KERBEROS
svn path=/trunk/; revision=49385
2013-05-17 19:31:44 +00:00
Anders Broman 6cfe8894b3 set col fence, in case there are more Diameter PDU:s in a transport message.
svn path=/trunk/; revision=49381
2013-05-17 16:24:46 +00:00
Jeff Morriss 86744b65da As suggested by Jakub: don't ep_alloc buffers for TVBs, use g_malloc()'d
memory with tvb-free-callback.

Fixes one of the "read after free" warnings from Valgrind reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197 and the one reported
in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8653

svn path=/trunk/; revision=49379
2013-05-17 14:38:36 +00:00
Pascal Quantin 5c56d95afe Prevent "'len' may be used uninitialized in this function" error when compiling with gcc 4.3.2
svn path=/trunk/; revision=49378
2013-05-17 13:37:36 +00:00
Guy Harris 08889b5e75 Pull some functions that fill in a struct wtap_pkthdr into common code,
and use it in both the read and seek-read routines.

svn path=/trunk/; revision=49377
2013-05-17 10:13:12 +00:00
Guy Harris 4dd1504036 Have iseries_parse_packet() fill in a struct wtap_pkthdr; that means it
doesn't need to return the number of bytes of captured packet data (it
can just stuff that into the struct wtap_pkthdr), so have it return a
Boolean success/failure indication.

svn path=/trunk/; revision=49376
2013-05-17 09:48:19 +00:00
Guy Harris adb9282b0e If iseries_seek_next_packet() hits the EOF, *err will be set to 0; just
have it return -1 for errors or EOF, and have iseries_read() check for a
negative return value and return FALSE.  That simplifies it a bit, and
handles the "no more records in the file" case
(iseries_seek_next_packet() will hit EOF and return -1 with *err set to
0, which is what the callers of a read routine expect at EOF).

Get rid of duplicate (and incorrect before the change) comment.

svn path=/trunk/; revision=49375
2013-05-17 09:37:02 +00:00
Guy Harris 13694fde7b Get rid of duplicate code.
svn path=/trunk/; revision=49374
2013-05-17 08:56:43 +00:00
Guy Harris ab74872031 Pull the reading of record data and ATM post-processing into another
common routine.

svn path=/trunk/; revision=49373
2013-05-17 08:53:04 +00:00
Guy Harris 54d630d8c5 Add iptrace_process_rec_header_ routines to read record headers and fill
in a wtap_pkthdr, as well as skipping FDDI padding, etc..

svn path=/trunk/; revision=49372
2013-05-17 08:19:51 +00:00
Guy Harris d4ad2e087c Fix some more warnings that show up on platforms with 32-bit time_t.
Get rid of double semicolons.

svn path=/trunk/; revision=49371
2013-05-17 08:09:39 +00:00
Guy Harris 7634be8b27 IPFIX records have a time stamp (and, according to RFC 5101, it's UNIX
time, i.e. seconds since January 1, 1970, 00:00:00 UTC).

svn path=/trunk/; revision=49370
2013-05-17 07:45:36 +00:00
Guy Harris 04d33bca00 We need ipfix_read_message_header() for the open routine; have
ipfix_read_and_process_message_header() call it and then fill in the
wtap_pkthdr structure, and use the latter routine in the read and
seek-read routines.

Expand a comment, and fix indentation.

svn path=/trunk/; revision=49369
2013-05-17 07:28:34 +00:00
Guy Harris 4b1623d619 Pull the code that fills in a wtap_pkthdr structure into
ipfix_read_message_header() and rename it
ipfix_process_message_header().  Use it in the read and seek-read
routines.

svn path=/trunk/; revision=49368
2013-05-17 06:41:20 +00:00
Guy Harris 2c07003e67 Pull the record header processing code into i4b_read_rec_header(),
renaming it to i4b_process_rec_header(), so that it's used in the read
and the seek-read routines.

svn path=/trunk/; revision=49367
2013-05-17 06:08:40 +00:00
Anders Broman 4b85b45281 Squelch more warnings about empty structures.
svn path=/trunk/; revision=49366
2013-05-17 05:33:53 +00:00
Guy Harris a335cd8d87 Pull code to fill in a wtap_pkthdr into a hcidump_process_header()
routine, and use it in both the read and seek-read routines.

svn path=/trunk/; revision=49365
2013-05-17 05:31:21 +00:00
Guy Harris f296630024 Squelch warnings about empty structures and chopping off 64-bit values
at 32 bits.

svn path=/trunk/; revision=49364
2013-05-17 05:25:11 +00:00
Jeff Morriss 504d830981 From Dominique Martinet via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8589 :
Theses patches add alot of new message types for the 9P protocol and its
extensions (most specifically 9P2000.L), while staying compatible with the
legacy protocol (hence the hashtable with conversation information, since
version is only known at handshake)

It is still missing alot of 9P2000.u specifics, but I don't have any server
to test it with. I'm also missing some dump to test legacy, but I'm pretty
confident I didn't break much there as it is mostly compatible, most
differences are handled using different messages, the only one that was
changed would be RERROR.


second diff also adds deeper interpretation of the protocol, by following
the conversation stream and keeping a bigger hashtable associating fid (file
handles) and file names, for easier debugging.


From me: roll the contents of the (new) packet-9p.h back into the C file.

svn path=/trunk/; revision=49363
2013-05-17 02:00:05 +00:00
Evan Huus 5dc6e4598e Use proto_tree_add_int64 for 64-bit values.
svn path=/trunk/; revision=49362
2013-05-17 00:56:54 +00:00
Jeff Morriss 2572f8ac1e From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :
Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
to...". Update the associated widget, routine, and variable names in order
to facilitate future maintenance.

svn path=/trunk/; revision=49361
2013-05-17 00:42:45 +00:00