Commit Graph

39350 Commits

Author SHA1 Message Date
Michael Tüxen dddfe189a1 Fix the handling of snaplen.
While there fix some whitespace issues.

svn path=/trunk/; revision=41164
2012-02-23 19:14:14 +00:00
Anders Broman 286f3425e7 Have the used interfaces show up if number of interfaces > 0.
(pcapng file).

svn path=/trunk/; revision=41163
2012-02-23 15:40:31 +00:00
Anders Broman 07c039ad17 From Dirk Leinenbach:
Follow TCP IPv6 - wrong hostname.

#BACKPORT
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6861

svn path=/trunk/; revision=41162
2012-02-23 13:24:54 +00:00
Anders Broman 59ce037134 Fix a 3GPP specification error.
svn path=/trunk/; revision=41161
2012-02-23 13:10:59 +00:00
Michael Tüxen 412c5a903c As discussed with Anders: Only write a single ISB at the end. Proivde
start/end time in the ISBs.

svn path=/trunk/; revision=41160
2012-02-23 12:57:17 +00:00
Michael Tüxen 2b3cd82cb1 interface id is 32-bit, not 64-bit.
svn path=/trunk/; revision=41159
2012-02-23 11:55:24 +00:00
Anders Broman 511d403ec2 From Kundok Park:
new_packet_list: crash in add_byte_views from decrypted zigbee data


The cause of the crash I saw was that the add_byte_views() function in
main_proto_draw.c relies on output from previous dissector run while the
function may eventually trigger dissector to run again which wipes out the
previous output.
The patch copies the output of the dissector before calling add_byte_tab() so
that even when add_byte_tab() updates the dissector output, the loop continues
with previous dissector output.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5130

svn path=/trunk/; revision=41158
2012-02-23 11:29:24 +00:00
Anders Broman 416117f63a From Steve Magnani:
USB: Add dissection for Interface Association descriptor.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6842

svn path=/trunk/; revision=41157
2012-02-23 11:20:52 +00:00
Anders Broman 9d545467ef From Tyson Key:
Clean up redundant Data handlers in the CCID dissector.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6860

svn path=/trunk/; revision=41156
2012-02-23 11:14:57 +00:00
Martin Mathieson 51c31cd7bd Move 'static' qualifier before 'const' in a couple of places. I didn't
know it mattered, but gcc warns.

svn path=/trunk/; revision=41155
2012-02-23 11:03:30 +00:00
Martin Mathieson 774be29de0 Mark some unused parameters. Still getting other warnings...
svn path=/trunk/; revision=41154
2012-02-23 10:55:57 +00:00
Guy Harris b6330fc765 Do a check of the block total length in pcapng_read_unknown_block().
That means we don't need to do the block length check in
pcapng_read_block(); each block type reader, including the one for
unknown block types, does a check that's as stringent as that block
length check or more stringent, which means any block whose length is
less than the minimum will fail with the same error in both cases.

Fix the message for a too-short NRB.

svn path=/trunk/; revision=41152
2012-02-23 10:03:16 +00:00
Anders Broman 1a42f455a5 From Tyson Key:
Support for switching USB CCID PC_to_RDR_XfrBlock payload dissectors

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6853

svn path=/trunk/; revision=41151
2012-02-23 09:12:30 +00:00
Anders Broman f77e059a2e From Yaniv Kaul:
Enhance the Spice dissector - small additional dissections.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6857

svn path=/trunk/; revision=41150
2012-02-23 09:06:33 +00:00
Anders Broman dea5452b95 From Lei Chen:
a patch to support decode FDD_CELL_INFORMATION of "UTRAN FDD Description" in packet-gsm_rlcmac.c

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6856

svn path=/trunk/; revision=41149
2012-02-23 08:57:40 +00:00
Anders Broman 2a35f59066 From Jeff Morriss:
H223: Buildbot crash output: fuzz-2012-01-25-22599.pcap

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6768

svn path=/trunk/; revision=41148
2012-02-23 08:40:23 +00:00
Anders Broman 228d0e37e7 From Josip Medved: Add 3GPP AVP 1506 and 1507
svn path=/trunk/; revision=41146
2012-02-23 05:29:28 +00:00
Guy Harris 4bf0c5bf5b Fix typo introduced by previous checkin.
svn path=/trunk/; revision=41145
2012-02-22 23:44:25 +00:00
Anders Broman b95b53cd19 Added aplications and one AVP from Josip Medved
svn path=/trunk/; revision=41144
2012-02-22 23:01:28 +00:00
Guy Harris 3b262a0621 Add sanity checks to make sure the claimed block size is big enough to:
1) contain the block length fields and block type field;

	2) contain that plus the fixed-length portion of the block;

	3) for blocks that have a variable-length portion other than the
	   options, contain that variable-length portion.

Fixes a crash we're seeing with a bad pcap-NG file in the Wireshark
menagerie (7799-lastPacketWithoutComment.pcapng - the last packet's
block length is 128, but it claims to have 98 bytes of packet data,
which requires a 132-byte block).

Clean up white space (use 8-space tabs).

svn path=/trunk/; revision=41143
2012-02-22 18:32:43 +00:00
Anders Broman 0ebef9a0fa From Josip Medved:
In line 4722 of dictionary.xml file there is comment:
<-- Requesting-Node-Type is from old (v8.1.0 - v8.2.0) versions of 29.272. -->

This is not a valid XML comment and that line should read:
<!-- Requesting-Node-Type is from old (v8.1.0 - v8.2.0) versions of 29.272. -->

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6858

svn path=/trunk/; revision=41141
2012-02-22 16:06:02 +00:00
Anders Broman ace4d65e47 Grr forgot debug flag - again.
svn path=/trunk/; revision=41140
2012-02-22 16:02:38 +00:00
Bill Meier 81d3b58f02 Whitespace cleanup: Convert 4 space tabs to spaces ...
svn path=/trunk/; revision=41139
2012-02-22 15:47:30 +00:00
Bill Meier 397d29e83b Rename some enumeration constants; Do some minor code simplification & reformatting.
svn path=/trunk/; revision=41138
2012-02-22 15:42:50 +00:00
Anders Broman 8fff390455 - Write ISB(s) at start and end of capture.
- Read all options.
- Prepare to write ISB.

svn path=/trunk/; revision=41137
2012-02-22 14:41:02 +00:00
Anders Broman af2100d4c3 Expand the API for ISB:s
svn path=/trunk/; revision=41136
2012-02-22 10:01:16 +00:00
Alexis La Goutte d9a4d939b3 Reverse Revision 41134 (Need to fix error/warning before...)
svn path=/trunk/; revision=41135
2012-02-22 09:18:30 +00:00
Anders Broman ad360ce0dd From Lars Ruoff:
Dissector for Alcatel-Lucent Enterprise Universal Alcatel- and NOE protocol
families.
Meant as a replacement for existing UA-dissector in trunk because of better
feature set:
- latest protocol specifiaction
- more detailed dissection and filtering possibilities on subprotocols
- RTP stream setup
- NOE over SIP

Lars Ruoff
On behalf of Alcatel-Lucent Enterprise

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6844

svn path=/trunk/; revision=41134
2012-02-22 08:37:46 +00:00
Guy Harris 4d6a05e2ff More debugging information - in at least one of the failures, neither of
the "Wrote xxx" messages was printed, although the compiler appeared to
have been run on the .c file that was never claimed to have been
written, but got an error because it couldn't find the .h file (also
never claimed to have been written), and in one of the successes on the
same buildbot, they were both printed for the same file.

svn path=/trunk/; revision=41133
2012-02-22 03:13:38 +00:00
Guy Harris 46cb65974b Handle the case where there are no IDBs before the first non-SHB/non-IDB
block, which could be the case even in a *valid* file (consider a file
with an SHB, an NRB, an IDB, and a packet block, in that order); even if
there's no IDB before the first packet block, that should be reported to
the user as "interface N not less than interface count M", to more
precisely indicate the problem.

(Yes, the loop should probably keep going until it finds a packet block,
not just a non-IDB block.)

svn path=/trunk/; revision=41132
2012-02-22 03:03:34 +00:00
Guy Harris 4a20fd003c We need to build libui even if we're only building TShark. Fixes bug
6855.

svn path=/trunk/; revision=41131
2012-02-22 02:15:23 +00:00
Michael Tüxen e52bc42404 Small fix.
svn path=/trunk/; revision=41129
2012-02-21 21:50:08 +00:00
Michael Tüxen f3895780f6 From Irene Ruengeler: Describe what we currently have in trunk/
related to capturing from multiple
                      interfaces.

svn path=/trunk/; revision=41128
2012-02-21 21:46:06 +00:00
Michael Tüxen c92cab9892 From Irene Ruengeler: Updated screenshots.
svn path=/trunk/; revision=41127
2012-02-21 21:27:02 +00:00
Michael Tüxen b85f69ebde Fix bugs which resulted in the buildbot errors.
svn path=/trunk/; revision=41126
2012-02-21 20:37:22 +00:00
Michael Tüxen 28b74c5760 Correctly write os string...
svn path=/trunk/; revision=41125
2012-02-21 18:01:44 +00:00
Michael Tüxen f7dc80cb18 Whitespace changes.
svn path=/trunk/; revision=41124
2012-02-21 18:01:01 +00:00
Michael Tüxen 2764d9977b Use wtap_dump_open_ng() in tshark.
svn path=/trunk/; revision=41123
2012-02-21 17:19:45 +00:00
Michael Tüxen acb9414db9 This should fix the buildbots...
The problem was that when reading a .pcap file, we don't have any IDBs.
If reqested to write out an pcapng file, we (now) build a dummy IDB which
uses the file's encapsulation as the interface encapsulation. Therefore
it can't be per=packet.
We need to fix this by using wtap_dump_open_ng()...

svn path=/trunk/; revision=41122
2012-02-21 17:07:57 +00:00
Michael Tüxen 660a348df1 When saving a file and the are no IDBs, create a default one.
This seems right, but doesn't make the buildbots happy, because
a read pcap file is reported a per packet encaps...

svn path=/trunk/; revision=41121
2012-02-21 16:51:23 +00:00
Anders Broman 5bc3ad3cf7 From Lori Tribble:
BACnet: Allow vendor specified network layer messages.'

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6852

svn path=/trunk/; revision=41120
2012-02-21 16:43:20 +00:00
Michael Tüxen 4ea2838bdb Disable debug output...
svn path=/trunk/; revision=41119
2012-02-21 16:33:33 +00:00
Michael Tüxen 877edcc89d When writing an option in an IDB, also write an endofoption option.
Use (consistently) 0 as the default for the interface speed.
While there, do some whitespace cleanups.

svn path=/trunk/; revision=41118
2012-02-21 16:32:25 +00:00
Michael Tüxen bb3a686a99 Whitespace changes.
svn path=/trunk/; revision=41117
2012-02-21 16:30:22 +00:00
Michael Tüxen 307a310391 Whitespace changes.
svn path=/trunk/; revision=41116
2012-02-21 16:29:29 +00:00
Michael Tüxen 41df09c92a Whitespace changes.
svn path=/trunk/; revision=41115
2012-02-21 16:28:42 +00:00
Anders Broman 1cf19ea95f From Jose Pedro Oliveira:
dumpcap: only free os_version_str after the
libpcap_write_interface_description_block() calls.

svn path=/trunk/; revision=41114
2012-02-21 16:14:57 +00:00
Michael Tüxen 3806dfa6c8 Whitespace changes.
svn path=/trunk/; revision=41113
2012-02-21 15:38:30 +00:00
Michael Tüxen 822782f7c4 Improve the error handling.
svn path=/trunk/; revision=41112
2012-02-21 15:36:08 +00:00
Michael Tüxen 7d7c5ca02d Don't dereference idb_inf in wtap_dump_open_ng() when
you provide NULL when you call it via wtap_dump_open.

This does not make the buildbots happy, but at least
tshark doesn't crash anymore.

svn path=/trunk/; revision=41111
2012-02-21 15:21:01 +00:00