Commit Graph

19939 Commits

Author SHA1 Message Date
Jeff Morriss 49466f95bc Introduce, and start using, TVB_SET_ADDRESS() and TVB_SET_ADDRESS_HF(). They
are like the non-TVB versions except that they take a TVB and an offset
instead of (frequently) a pointer into the TVB.

Calling tvb_get_ptr() before modifying the rest of the fields should help fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7960 (though I can't
reproduce that problem).


Replace a bunch of calls like:

SET_ADDRESS(..., AT_XXX, length, tvb_get_ptr(tvb, offset, length));

with:

TVB_SET_ADDRESS(..., AT_XXX, tvb, offset, length);

svn path=/trunk/; revision=46324
2012-12-02 04:49:13 +00:00
Jeff Morriss da4442d638 Use g_error() to generate an explanatory message (and a core) when
ABORT_ON_DISSECTOR_BUG is set and we pass MAX_TREE_ITEMS.

If ABORT_ON_DISSECTOR_BUG is set and we get an unregistered hf, generate
an explanatory message (and a core).

svn path=/trunk/; revision=46323
2012-12-02 03:34:06 +00:00
Jeff Morriss 2403ef591d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8033 :
Register hf_btavdtp_number_of_signal_packets.

Remove (unused) hf_btavdtp_header_compression_rfa.

svn path=/trunk/; revision=46322
2012-12-02 03:25:38 +00:00
Jeff Morriss a92bbbcd5c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030 :
Don't store an AT_STRINGZ address in ep_ allocated memory: that memory is
freed before the addresses may be used.  Use se_ memory instead (no, that's
not really ideal either).

It would appear that several other dissectors have the same problem.

svn path=/trunk/; revision=46320
2012-12-02 02:46:12 +00:00
Evan Huus 400cb55a10 Remove unneeded include.
svn path=/trunk/; revision=46314
2012-12-01 17:48:01 +00:00
Evan Huus b14c53a2a9 Fix some checkAPI warnings and remove some unnecessary variable
initializations.

Also add an $Id$ tag which I somehow missed despite adding the actual
SVN property.

svn path=/trunk/; revision=46313
2012-12-01 17:44:51 +00:00
Evan Huus 99d5535cb1 From Krishnamurthy Mayya and Nikitha Malgi via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8019

Dissection support for PW-OAM messages (RFC 6478).

svn path=/trunk/; revision=46311
2012-12-01 15:39:14 +00:00
Jeff Morriss 3a0a1d49ea Fix an unitialized-read detected by Valgrind while processing:
https://www.wireshark.org/download/automated/captures/fuzz-2012-11-30-20336.pcap

(I can't reproduce the actual fuzz failure and this uninitialized-read
shouldn't have caused an out-of-memory condition--which is what the buildbot
said the problem with that capture was.)

Also stop marking a variable that is used as unused.

svn path=/trunk/; revision=46309
2012-11-30 20:25:21 +00:00
Anders Broman 962aaf121f From Michal Labedzki:
PATCH] USB: Add support for vendor_id/product_id,
 bus_id/device_address and class/subclass/protocol tables

USB subdissectors can be decoded by class/subclass/protocol. If fail try vendor_id/product_id.
bus_id/device_address is intented to use by DecodeBy, so user can decode specified device as need.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46306
2012-11-30 12:33:37 +00:00
Anders Broman 1a79540fdc From Michal Labedzki:
Bluetooth: Add support for HCI USB transport dissector

Based on Bluetooth Core 4.0 specification

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46305
2012-11-30 11:58:37 +00:00
Anders Broman d67f89f45b From Michal Labedzki:
Couple of coding style changes and fixes for:
warning: declaration of ‘k_frame_number’ shadows a previous local
warning: assignment discards qualifiers from pointer target type

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46304
2012-11-30 11:31:28 +00:00
Stig Bjørlykke 37c7d006ad Added check for missing/empty ProtoField abbrev also in
integer, boolean, time and other cases.

svn path=/trunk/; revision=46302
2012-11-30 11:01:01 +00:00
Anders Broman 79d8f9f5f9 From Mike Morrin:
The gsm rlcmac dissector truncates the 12 bit BSNs to 8 bits when storing them.

Fix this and the handling of BSN2 is refactored to clarify the difference between BSN2 (the stored value) and BSN2_offset (the value transferred at the air interface).

svn path=/trunk/; revision=46301
2012-11-30 09:42:58 +00:00
Pascal Quantin 91576e1f70 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8023 :
Fix typo in LPPa protocol name

svn path=/trunk/; revision=46300
2012-11-30 08:34:50 +00:00
Martin Mathieson 5e90582d54 Add versions of a function that doesn't need do substitute specifiers.
svn path=/trunk/; revision=46298
2012-11-29 22:25:18 +00:00
Jeff Morriss 04c9d29799 Make an enum_val_t static.
svn path=/trunk/; revision=46293
2012-11-29 20:21:30 +00:00
Jeff Morriss 0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Gerald Combs c33b0ad215 Add version info to the top of the SSL debug log.
svn path=/trunk/; revision=46291
2012-11-29 19:20:29 +00:00
Michael Tüxen 749e52d996 The padding of the last parameter is not included in the length of the chunk
as described in RFC 4960, section 3.2.

svn path=/trunk/; revision=46290
2012-11-29 18:09:51 +00:00
Pascal Quantin 6f3c7f1f99 Add missing newline at end of file
svn path=/trunk/; revision=46289
2012-11-29 16:46:41 +00:00
Jeff Morriss 5063663377 Another couple size_t-to-int warning fixes (I hope).
svn path=/trunk/; revision=46288
2012-11-29 16:26:12 +00:00
Jeff Morriss 79d3e696a8 (Try to) fix some size_t-to-int warnings.
svn path=/trunk/; revision=46286
2012-11-29 15:39:34 +00:00
Jeff Morriss 10b145c8b5 usb.c is in the dissectors directory.
svn path=/trunk/; revision=46285
2012-11-29 15:34:25 +00:00
Anders Broman 21abe5567c From Michal Labedzki:
USB: Add support for vendor_id/product_id,
 bus_id/device_address and class/subclass/protocol
 tables

USB subdissectors can be decoded by class/subclass/protocol. If fail try vendor_id/product_id.
bus_id/device_address is intented to use by DecodeBy, so user can decode specified device as need.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46283
2012-11-29 13:59:36 +00:00
Jeff Morriss 910097ffb6 Remove the second definition of a variable. Define an undefined variable.
svn path=/trunk/; revision=46282
2012-11-29 13:54:07 +00:00
Anders Broman d19d4f9c5f Fix a typo.
svn path=/trunk/; revision=46281
2012-11-29 13:45:35 +00:00
Anders Broman 5a61f202d4 From Michal Labedzki:
USB: Add support for vendor and product names from
 usb.ids database

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46280
2012-11-29 13:39:08 +00:00
Anders Broman a8b7b8b86c From Michal Labedzki:
USB: Update some descriptions found in USB 3.0
 specification

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46279
2012-11-29 13:29:50 +00:00
Anders Broman 900b884f55 From Michal Labedzki:
Bluetooth: Add support for source/destination addresses

Within resolving devices names. Also make header file more generic,
packet-hci_h4.h renamed to packet-bluetooth-hci.h.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46278
2012-11-29 13:21:10 +00:00
Anders Broman f4de95f1e3 From Michal Labedzki:
Bluetooth: Fix length issue described in XXX comment

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46276
2012-11-29 12:05:55 +00:00
Anders Broman 11c4c6d4f3 Use qui_tree.
svn path=/trunk/; revision=46275
2012-11-29 12:04:11 +00:00
Anders Broman 2b8b65ee68 - Fix a typo; Authentication Quadruplets not dissected correctly.
- Add RSFP index IE dissection.

svn path=/trunk/; revision=46274
2012-11-29 10:57:33 +00:00
Gerald Combs bd19dcd8bf Add an add_hosts_file routine that adds a "hosts" path to an array and
use it in tshark.c instead of read_hosts_file. This lets us use "-H"
multiple times. Make read_hosts_file static.

svn path=/trunk/; revision=46273
2012-11-29 00:32:39 +00:00
Guy Harris f208489b56 Slightly less hacky way to arrange that dictionary_load() be called
before hf_base[] is initialized.

svn path=/trunk/; revision=46271
2012-11-28 23:11:08 +00:00
Jeff Morriss 3029a76dc3 Fix pretty-printing of the application ID in the protocol-details pane by
putting an "unused" variable (which was taken out in r24377) back in.  This
time add a (bogus) "use" of the variable and explain why we're doing what
we're doing.

Use VALS() (in one case anyway) and PINFO_FD_NUM.

svn path=/trunk/; revision=46266
2012-11-28 22:45:31 +00:00
Bill Meier a8112e6529 Fix [-Wshadow] warnings;
Also (for one or more of the files):
 - create/use one or more extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - convert apparent 4-space tabs to spaces;
 - do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46265
2012-11-28 22:41:07 +00:00
Guy Harris 84afa22969 It's not going to pass the
if (protocol_version_identifier >= 4 && version_1_length == 0
          && tvb_reported_length(tvb) >= 106) {

test if it doesn't pass the

    if (protocol_version_identifier >= 3 && version_1_length == 0 &&
        tvb_reported_length(tvb) >= 102) {

test.

svn path=/trunk/; revision=46258
2012-11-28 21:24:32 +00:00
Guy Harris 33b1d3abd9 Redo the MSTI stuff a bit, making a copy of total_msti_length at the
time we start processing the MSTI messages and decrementing the copy;
it's a bit clearer, and may make it easier to avoid the "uninitialized
variable" problem.

svn path=/trunk/; revision=46257
2012-11-28 21:08:28 +00:00
Guy Harris 1ce0f9234d "??" introduces a trigraph in C; escape "???" to avoid that.
svn path=/trunk/; revision=46256
2012-11-28 21:05:17 +00:00
Guy Harris fe9fe6b6e9 Squelch a "may be uninitialized" warning.
svn path=/trunk/; revision=46255
2012-11-28 20:31:13 +00:00
Guy Harris bab056d43c Clean up indentation.
svn path=/trunk/; revision=46254
2012-11-28 20:29:24 +00:00
Bill Meier c1b6433dcf Fix a [-Wshadow] warning;
Also:
 - create/use several extended variable strings;
 - remove some uneeded variable initializers;
 - reformat some long lines;
 - reformat hf[] entries;
 - do some whitespace and formatting changes to use a consistent style.


svn path=/trunk/; revision=46253
2012-11-28 20:03:10 +00:00
Anders Broman 70b35e6583 Remove an unused variable
svn path=/trunk/; revision=46252
2012-11-28 19:59:32 +00:00
Jeff Morriss c1c964db17 There's a macro for the Request bit. Use it instead of hard-coded 0x80.
svn path=/trunk/; revision=46249
2012-11-28 16:29:31 +00:00
Anders Broman ff85ba42ac From gyanesh:
BPDU dissector enhancement to recognize Shortest Path Bridging(SPB) BPDUs version 4 .

- Got rid of a couple of tvb_get_ptr().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7970

svn path=/trunk/; revision=46248
2012-11-28 15:59:53 +00:00
Michael Tüxen 99d406059f Add native SCTP encapsulation.
svn path=/trunk/; revision=46244
2012-11-28 12:16:12 +00:00
Bill Meier 629f6d3291 Fix typo which cased compile error ...
svn path=/trunk/; revision=46242
2012-11-28 00:36:09 +00:00
Bill Meier 4297992b02 General cleanup:
- fix extensive use of expert...() under 'if(tree)'
- fix  a [-Wshadow] warning;
- create/use several extended variable strings;
- "localize" some variable definitions;
- remove some uneeded variable initializers;
- do some whitespace and formatting changes to use a consistent style.

svn path=/trunk/; revision=46240
2012-11-28 00:10:50 +00:00
Jeff Morriss 4da68e75e0 Warn about non-final parameters that aren't padded correctly. I'm not sure
that final parameters *with* padding is all that important (maybe it should
be there but not PI_ERROR?).

svn path=/trunk/; revision=46239
2012-11-27 23:13:56 +00:00
Bill Meier 3a40f4d2a0 Fix [-Wuninitialized] warning.
svn path=/trunk/; revision=46237
2012-11-27 21:54:10 +00:00