Commit graph

24920 commits

Author SHA1 Message Date
Hanspeter Portner
93a59e74c3 Open Sound Control dissector.
Dissector for specification at http://opensoundcontrol.org/spec-1_0.

- use value_string
- add integer oferflow protection
- remove trailing white space
- add capture file to bug tracker: Bug 9837
- fix warnings by tools/fix-encodings-args.pl
- make use of VALS
- dissect MIDI controller messages separately

Change-Id: Iab0dc01d4bf1c08eac175b6af1dd07809090c35a
Reviewed-on: https://code.wireshark.org/review/454
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-06 09:21:54 +00:00
Michal Labedzki
c9dd46c278 Bluetooth: Make Source/Destination BD_ADDRs and names filterable
Source/Destination BD_ADDRs and name are filterable.
Also simplify code around wmem trees, and enable commented "data"
field in unreassembled case and fix btl2cap offsets
(discovered by enabling "data" field).

Change-Id: Ic28c9bf19bcd6281b652be538b221da74df4bb76
Reviewed-on: https://code.wireshark.org/review/471
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06 05:58:06 +00:00
Michal Labedzki
248c284622 Bluetooth: Fix interface_id
Interface ID should correspond to the Wireshark Interface Id
to avoid mixing data from various interfaces in dissectors.

Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7
Reviewed-on: https://code.wireshark.org/review/472
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06 05:53:52 +00:00
Guy Harris
e2ed48a8d3 Have NFLOG TLV type and length be in host byte order.
When capturing, they'll be in host byte order.  The top of the libpcap
trunk and 1.5 branch, when reading a file, will, if necessary, byte-swap
the type and length values so that they're in the byte order of the host
reading the file (rather than the host that wrote the file).

Do the same when we read a file, and have the NFLOG dissector assume
host byte order for those fields.

Change-Id: I493aed1e07b626af1157d75f3bc293b0a694ad07
Reviewed-on: https://code.wireshark.org/review/148
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06 05:53:08 +00:00
Bill Meier
7a4702d9d8 Ue TFS & VALS macros for certain 'fieldconvert' fields.
Change-Id: I8d7468e62d5de99eb68b554134be71b17d1b87c8
Reviewed-on: https://code.wireshark.org/review/525
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-06 03:19:41 +00:00
Alexis La Goutte
abc6fb24fa Fix some code remove by 296591399f
(Copyright or info about file...)

Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1
Reviewed-on: https://code.wireshark.org/review/515
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05 09:25:47 +00:00
Guy Harris
8881f3f61a Don't truncate the options field.
Create a placeholder protocol tree item under which to put the options,
do the analysis of fields from the fixed-length portion of the TCP
header (such as sequence numbers), and then do a straightforward
dissection of the options, throwing an exception if we run past the end
of the options field.

This is a bit simpler, and doesn't add confusing notes about
truncation of the options.

XXX - we're currently not including selective acknowledgments in any of
the SEQ/ACK analysis; should we?  That means, of course, that we have to
dissect the options before doing that analysis, and if the options were
cut short by slicing, you lose....

Change-Id: I425a6c83f26512b802267f76739cbf40121b3040
Reviewed-on: https://code.wireshark.org/review/511
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-05 02:33:20 +00:00
Evan Huus
35098d20a2 Fix memory-alignment in the block allocator.
The previous macro gave the correct alignment, but there was one case where it
would add a whole block of unnecessary ALIGN_SIZE bytes. The new one is also
slightly faster to compute.

Benchmark win of about 3%.

Change-Id: I5d8bad0f78dc0e383e14c2c7a951328a06400020
Reviewed-on: https://code.wireshark.org/review/492
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-04 17:09:40 +00:00
Pascal Quantin
75a67e6991 Fix warnings introduced in g2965913
Change-Id: I7b0fedf0c508404b3f2dea789f50b7b5db4e2eb7
Reviewed-on: https://code.wireshark.org/review/502
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04 16:39:02 +00:00
Pascal Quantin
02c741b42b Fix compilation broken by g2965913
Change-Id: I5af8c0ae049bb3d2caed04bd3229c11a81f7b5b9
Reviewed-on: https://code.wireshark.org/review/501
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04 15:46:05 +00:00
Alexis La Goutte
296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Evan Huus
01467c294a Remove assertions from block allocator.
It has been extremely well-tested at this point, and is a very hot code path so
the performance gain is measurable (~1-2% on most captures I tried).

Change-Id: I2f5e03d2f348f56e740bf0dfbc83a4fd9cc8c5a9
Reviewed-on: https://code.wireshark.org/review/499
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:18:51 +00:00
Pascal Quantin
3a4b311e8b When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM
Fixes bug 9829

Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8
Reviewed-on: https://code.wireshark.org/review/494
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 12:19:07 +00:00
Michal Labedzki
7a008e4f81 cmake: Add missing exported_pdu dissector
Change-Id: I9a6a91b11555e2b271b3d359f26bf97796d6742f
Reviewed-on: https://code.wireshark.org/review/495
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 12:14:42 +00:00
Martin Kaiser
ad76c350f7 replace label_mark_truncated_start() with a macros that calls
label_mark_truncated()

Change-Id: I7ede5f9776d26ebce2ccf427cf6ff5dec56814cd
Reviewed-on: https://code.wireshark.org/review/465
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-04 08:46:35 +00:00
Guy Harris
83b994909b Show ymsg.content as bytes; it's not a simple string.
The content of a YMSG message is a sequence of lines, each one of which
contains a text string (in some ASCII-based encoding) for a key, a
0xc080 separator, and a text string (in some ASCII-based encoding) for a
value.  That's not a string in any ASCII-based encoding I know of - 0xc0
0x80 is not, for example, a valid UTF-8 sequence (it's a too-long
sequence for NUL).

This should fix bug 9832:

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

by avoiding the general "GTK+ on Windows crashes when asked to copy
something that's not valid UTF-8" problem.

Fix some field descriptions while we're at it.

Change-Id: I4084dabc89b0186ecd1a7329452ca2f1cb48f1c0
Reviewed-on: https://code.wireshark.org/review/488
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-03 22:52:27 +00:00
Martin Kaiser
f94674d2fb truncate UTF-8 strings only at the boundary between two characters
Change-Id: Ib3ffc1593e877f4f7c708712b82209cf969cecff
Reviewed-on: https://code.wireshark.org/review/464
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-03 22:05:17 +00:00
Bill Meier
4ddd7a637e Create/use extended value_strings; add editor modelines as needed.
Change-Id: I36ebee937ddd1c5ccbfa36f284a4794bc63631dc
Reviewed-on: https://code.wireshark.org/review/482
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03 21:15:13 +00:00
Bill Meier
1795b4021c Move value_string defs from .h file; create/use extended value_string; Other minor changes.
- Multiple value string arrays were defined in packet-fcels.h (which was included
  in two differnt .c files). Only one of the arrays was actually used in two
  different .c files. All the value_string arrays (and most of the #defines)
  moved to packet-fcels.c.

- Other:
  Use -1 instead of tvb_length() for the length param of several proto_tree_add...() calls.
  Add editor modelines.

Change-Id: Idc642caf1c8d62b658147a234d5560b8f2fd0630
Reviewed-on: https://code.wireshark.org/review/479
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03 18:36:29 +00:00
Bill Meier
1f2f2ba5fa Create/use an extended value-string; Move value-string array from .h file; Do other misc.
- Value string arrrays should never be defined in a .h file (especially one
   included in multiple .c files).
  So: a. The value_string array (and associated #defines) was moved from the .h file
         to packet-rtp_events.c
      b. A public extended value_string was created in packet-rtp_events.c
          and declared as external in packet-rtp_events.h

- Other:
  Remove a few unneeded initializers;
  Add editor modelines.

Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1
Reviewed-on: https://code.wireshark.org/review/468
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03 16:32:03 +00:00
Bill Meier
69a8881106 Create/use several extended value-strings; Do several other small changes.
- Move setting COL_PROTO & clearing COL_INFO to before a tvb fetch which
   could cause an exception;
- Remove some unneeded initializers;
- Fix up some long-lines and whitespace;
- Use a consistent indentation;
- Add editor modelines.

Change-Id: I8a8015a65d5dc581ed02cbd134231481b9f96263
Reviewed-on: https://code.wireshark.org/review/467
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03 16:31:42 +00:00
Bill Meier
40e9465fd5 Create/use an extended value_string; Do other misc minor changes.
- Localize some vars;
- Use a consisten 4-space indentation & whitespace style;
- Add editor modelines;

Change-Id: I0d6270eea3fae804788a56557d3c7e171afa8aaa
Reviewed-on: https://code.wireshark.org/review/466
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03 16:31:16 +00:00
Pascal Quantin
5fc9db83cf SSL: dynamically allocate session ticket storage area to avoid buffer overflow
Fixes bug 9825

Change-Id: I20ae65331ec11b2f6774054df4c026fd5fa76d3a
Reviewed-on: https://code.wireshark.org/review/447
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-03 15:36:21 +00:00
Martin Kaiser
2ab72685fb show if the current service is scrambled or free
Change-Id: I9e50920fbc09fdf0650be3a63fee8153ce0fd3df
Reviewed-on: https://code.wireshark.org/review/462
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:34:48 +00:00
Martin Kaiser
c8b62c9237 add cleartext values for retention limit
Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067
Reviewed-on: https://code.wireshark.org/review/461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:34:26 +00:00
Martin Kaiser
f91f43360d move URI dissection to a separate function
Change-Id: Ia1db91ef9344e46a3f32204bbf9cdbcc514980ce
Reviewed-on: https://code.wireshark.org/review/460
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:34:04 +00:00
Martin Kaiser
64ee2935e1 use tvb_memdup() instead of tvb_get_ptr()
Change-Id: I1e9ff715c3e315c9e36abb69fb5f441b71477501
Reviewed-on: https://code.wireshark.org/review/459
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:33:45 +00:00
Martin Kaiser
2286437b2f remove unnecessary if (tree) check
Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675
Reviewed-on: https://code.wireshark.org/review/458
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:33:19 +00:00
Martin Kaiser
e6d241597e skip empty service provider name and empty service name
Change-Id: I355600320865a9c7c17093d37fc693b02f0a7f0c
Reviewed-on: https://code.wireshark.org/review/457
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:24:11 +00:00
Martin Kaiser
0156add5e9 service provider name is a DVB-SI string
Change-Id: Idea44f0e4678f738336215f4a250b9e9d9a60fbc
Reviewed-on: https://code.wireshark.org/review/456
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:23:29 +00:00
Martin Kaiser
070ae30842 service name is a DVB-SI string
Change-Id: I81ef4cd363acf6cff99fd0f75b135962c4c22f53
Reviewed-on: https://code.wireshark.org/review/455
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:22:10 +00:00
Evan Huus
a79fbf0397 Don't pass an invalid length to proto_item_set_len
Fixes bug #9818.

Change-Id: I4fb4cf2b5b31ed6efc55a48df67f2ec4949d47c3
Reviewed-on: https://code.wireshark.org/review/442
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-02 22:31:22 +00:00
Evan Huus
9afdd44eec Improve SCTP association lookup.
It's still O(n) in the worst case since the comparison function doesn't appear
to be suitable for use in a tree or hash-table, but at least we no longer spend
O(n) by default just finding the end of the list so we can iterate backwards.

Discovered while investigating bug #9823, but probably not the cause of that
bug.

Change-Id: Ib6c3691cff8e7fa49703df7c75635ef797c8fbe8
Reviewed-on: https://code.wireshark.org/review/443
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02 21:52:09 +00:00
Bill Meier
26e06356f8 Remove unneeded line of code.
Change-Id: Ic2769d5c125d8db7d32b6ad3ab0e4363f513f599
Reviewed-on: https://code.wireshark.org/review/451
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02 19:36:56 +00:00
Bill Meier
122f99ae66 Clear INFO column at the beginning of the dissector.
Change-Id: Iea901674e1d9c4745b891ac4330bd781d5eb76ec
Reviewed-on: https://code.wireshark.org/review/450
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02 19:36:30 +00:00
Bill Meier
add121340e tvb_length() --> tvb_reported_length() in several cases + other misc changes.
Misc changes:
 - sort entries in an enum by value;
 - add some XXX notes as to possible missing entries in a value-string array;
 - remove an unneeded initializer;
 - 0 --> FALSE for several boolean values;
 - whitespace.

Change-Id: I6c8f1c1f37edad120d979fcd2d7278e7981ca5a7
Reviewed-on: https://code.wireshark.org/review/449
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02 18:57:14 +00:00
Bill Meier
14c8c642b3 Clear INFO col; Create/use extended value-string; Do other minor changes
- val_to_str() -> val_to_str_const() in a few cases;
- localize some vars;
- remove some unneeded initializers;
- convert "4 space tabs" indentation to "4 spaces";
   revise editor modelines to match;
- do some whitespace changes.

Change-Id: Ic91df02022971c973b27c71e6127395ed3ef06d3
Reviewed-on: https://code.wireshark.org/review/448
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02 17:45:55 +00:00
Gerald Combs
58c3c7e85e [Automatic manuf, services and enterprise-numbers update for 2014-03-02]
Change-Id: Ie382028102569030ac00084125a26d49a05432b9
Reviewed-on: https://code.wireshark.org/review/444
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-02 16:24:06 +00:00
Alexis La Goutte
0a202bc4f6 Fix packet-h223.c:842:18: error: will never be executed [-Werror,-Wunreachable-code]
Change-Id: I8255a3841add78eaa167ef631effe58d9fb12736
Reviewed-on: https://code.wireshark.org/review/323
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-02 13:19:31 +00:00
Bill Meier
111c0778bd Create/use two extended value-strings & do other minor changes.
- Use VALUE_STRING_ENUM/VALUE_STRING_ARRAY macros to create one of the
   value string arrays instead of using the usual separate #defines & array definition;
- Remove a few unneeded initializers;
- prefs_register_protocol() need not be called under 'if (gp_zbee_prefs == NULL)'
- Do some minor whitespace changes;
- Add editor modelines.

Change-Id: I33669b25fa18ecc452b83a0d88a6c0b33aae904a
Reviewed-on: https://code.wireshark.org/review/441
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-01 21:40:39 +00:00
Jeff Morriss
54cf849419 Add the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that dissector.
Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go
in that file.  Inspired by the rejection of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332

Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1
Reviewed-on: https://code.wireshark.org/review/434
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
2014-03-01 21:16:59 +00:00
Gerald Combs
79ef36a5f0 Fix some scan-build warnings.
Fix a modeline while we're at it.

Change-Id: Ief6d5edbe33456170059cfab4f436f0844de32a1
Reviewed-on: https://code.wireshark.org/review/440
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-01 19:15:38 +00:00
Niels de Vos
0cb4b4e44d GlusterFS: add support for ZEROFILL fop
Implementation details in http://review.gluster.org/5327

BUG: 9812
Change-Id: Ib1650fb7ca8221def4e9c6a323008847dc7b5f62
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/429
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-01 15:16:56 +00:00
Gerald Combs
104a6edd1f Disable IPv4 checksum verfification to match TCP and UDP.
Offloading seems to be very common nowadays and having this option
enabled by default generates a lot of false positives. Suggested by
Laura Chappell.

Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff
Reviewed-on: https://code.wireshark.org/review/426
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-01 13:49:56 +00:00
Bill Meier
616ed71918 Fix bug which (somewhat) randomly caused UAT pref to not display on a proto pref page.
Introduced in ga2b2dd4b (SVN #53880)

Change-Id: I3dd24ab5e1b45367b03b8096a5892f346782217f
Reviewed-on: https://code.wireshark.org/review/433
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-28 19:03:09 +00:00
Florian Fainelli
d08586867d packet-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistently
The HomePlug AV dissector was not consistently using the
HOMEPLUG_AV_MMVER_1_1 constant and was sometimes using it and sometimes
using mmver == 1 directly. Make sure we use that constant throughout the
code to help clarifiying which version tests are applying to.

Change-Id: I602413163e4e44dedfbf3e2364448a951fa70f54
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Reviewed-on: https://code.wireshark.org/review/428
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-28 03:36:19 +00:00
Florian Fainelli
e6277bdedd packet-homeplug-av: fix missing reserved byte for station dump
dissect_homeplug_av_nw_info_sta() was processing stations
information correctly, except that after the first station dump, all
dumps would be off-by-one byte because we were not reserving a missing
byte at the end of the station dump. Fixes #9798.

Change-Id: Iff3afd5ff536ae718fa446de3c59cd5e9851ff20
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Reviewed-on: https://code.wireshark.org/review/427
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-28 00:40:25 +00:00
Evan Huus
54cccefef6 Fix build with recent lua changes.
Use FT_NONE instead of 0 to initialize an enum.
Drop use of lround/llround since they are not available on Windows.

Change-Id: I3961c1921304bafc090c763f0d6de8532f0b3510
Reviewed-on: https://code.wireshark.org/review/425
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27 22:00:49 +00:00
Hadriel Kaplan
655f2e4dd4 Fix prefs.c: Argument with 'nonnull' attribute passed null (redux)
Change-Id: I795df36039278283008132d647aaf51e76dbe218
Reviewed-on: https://code.wireshark.org/review/424
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-27 21:23:32 +00:00
Hadriel Kaplan
c826191be0 Fix coverity warnings for all wslua files. (redux)
This fixes/addresses all the coverity warnings shown by
the buildbots. (I hope)

Change-Id: Ic2722df97c577d274e3cf3f0cbdca1902edde047
Reviewed-on: https://code.wireshark.org/review/423
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-27 21:23:09 +00:00