jelmer/wireshark.git
10 years agoUe TFS & VALS macros for certain 'fieldconvert' fields.
Bill Meier [Thu, 6 Mar 2014 02:20:40 +0000 (21:20 -0500)]
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>
10 years agoAdd test to dump glossaries.
Evan Huus [Wed, 5 Mar 2014 18:14:26 +0000 (13:14 -0500)]
Add test to dump glossaries.

All it checks is that they don't crash, but this is enough to catch malformed
extended value strings and other oddities.

Change-Id: If853e8e2b19517a784daa4bbb8e41eddc7c7ddd9
Reviewed-on: https://code.wireshark.org/review/520
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoCorrected mrp decoding of link up and down
Widok [Wed, 5 Mar 2014 13:18:39 +0000 (14:18 +0100)]
Corrected mrp decoding of link up and down
Added DCP decoding of reset to factory
removed unused value_strings
corrected decoding of PDSubFrameBlock
most of the length display added a dec_hex display

Signed-off-by: Widok <kellingwido@aol.com>
Change-Id: I17b59b45eff37b65047a7a3e5e275f01a37ee616
Reviewed-on: https://code.wireshark.org/review/517
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoAdd command-line arg for input file format for tshark/wireshark
Hadriel Kaplan [Tue, 4 Mar 2014 11:19:01 +0000 (06:19 -0500)]
Add command-line arg for input file format for tshark/wireshark

Now that we have the ability to choose input file format type
in the GUI, we might as well have it in the command-line too.
Plus it would help me in test-stuies if we had a commandline.
So I've added a '-X read_format:Foo' for this.  Using just
'-X read_format:', or with a bad name, will make it print out
the full list (in tshark); just like the '-F' does for output
file formats.

Note: I am *not* putting in code for Win32 GUI,
because I can't compile that and I wouldn't have even
done the GTK one if I could compile Qt originally. (I don't think we need
to add any more features to GTK or Win32, just Qt from now on,
right?)

Change-Id: I2fe6481d186f63bd2303b9e591edf397a2e14b64
Reviewed-on: https://code.wireshark.org/review/493
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years ago(Trivial) Fix a typo.
Bill Meier [Wed, 5 Mar 2014 15:26:11 +0000 (10:26 -0500)]
(Trivial) Fix a typo.

Change-Id: Ib084b7e9d463c54fc836745833005b1456a82709
Reviewed-on: https://code.wireshark.org/review/518
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years agoFix some code remove by 296591399f90a9d89be958d91047aa724a77ee6d
Alexis La Goutte [Wed, 5 Mar 2014 07:53:22 +0000 (08:53 +0100)]
Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6d
(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>
10 years agoDon't truncate the options field.
Guy Harris [Wed, 5 Mar 2014 02:32:00 +0000 (18:32 -0800)]
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>
10 years agoAdd gitversion.h.
Gerald Combs [Tue, 4 Mar 2014 19:18:26 +0000 (11:18 -0800)]
Add gitversion.h.

Change-Id: Ia1609a20b060cb535a366c96be5618dccb6e055f
Reviewed-on: https://code.wireshark.org/review/507
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agoAdd a cast.
Gerald Combs [Tue, 4 Mar 2014 19:15:46 +0000 (11:15 -0800)]
Add a cast.

Change-Id: Ib1885bcbe061942ecba55b90e6b1d9b20f033f41
Reviewed-on: https://code.wireshark.org/review/505
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agowin32: Implement format type selector in open file dialog
Michal Labedzki [Wed, 26 Feb 2014 15:27:20 +0000 (16:27 +0100)]
win32: Implement format type selector in open file dialog

Change-Id: Idef1829fcc2b7b08783e5288bb6486ce19c4779b
Reviewed-on: https://code.wireshark.org/review/405
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoOne more fix from g2965913
Evan Huus [Tue, 4 Mar 2014 17:20:52 +0000 (12:20 -0500)]
One more fix from g2965913

Change-Id: I68d5bd33a44783c42a75e8244ef53c73a4f484f9
Reviewed-on: https://code.wireshark.org/review/503
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoFix memory-alignment in the block allocator.
Evan Huus [Tue, 4 Mar 2014 04:44:12 +0000 (23:44 -0500)]
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>
10 years agoFix warnings introduced in g2965913
Pascal Quantin [Tue, 4 Mar 2014 16:36:59 +0000 (17:36 +0100)]
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>
10 years agoFix compilation broken by g2965913
Pascal Quantin [Tue, 4 Mar 2014 15:43:25 +0000 (16:43 +0100)]
Fix compilation broken by g2965913

Change-Id: I5af8c0ae049bb3d2caed04bd3229c11a81f7b5b9
Reviewed-on: https://code.wireshark.org/review/501
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoRemove all $Id$ from top of file
Alexis La Goutte [Tue, 4 Mar 2014 12:14:53 +0000 (13:14 +0100)]
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>
10 years agoRemove assertions from block allocator.
Evan Huus [Tue, 4 Mar 2014 13:11:57 +0000 (08:11 -0500)]
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>
10 years agoWhen dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM
Pascal Quantin [Tue, 4 Mar 2014 11:32:50 +0000 (12:32 +0100)]
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>
10 years agocmake: Add missing exported_pdu dissector
Michal Labedzki [Tue, 4 Mar 2014 11:39:52 +0000 (12:39 +0100)]
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>
10 years agoreplace label_mark_truncated_start() with a macros that calls
Martin Kaiser [Sat, 1 Mar 2014 21:08:42 +0000 (00:08 +0300)]
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>
10 years ago(Trivial) Fix 2 typos; Reformat some long lines.
Bill Meier [Tue, 4 Mar 2014 02:52:11 +0000 (21:52 -0500)]
(Trivial) Fix 2 typos; Reformat some long lines.

Change-Id: If7d009b7764e858bd210d613ac9af219e9e20464
Reviewed-on: https://code.wireshark.org/review/491
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years agoShow ymsg.content as bytes; it's not a simple string.
Guy Harris [Mon, 3 Mar 2014 22:49:20 +0000 (14:49 -0800)]
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>
10 years agotruncate UTF-8 strings only at the boundary between two characters
Martin Kaiser [Sat, 1 Mar 2014 10:25:47 +0000 (13:25 +0300)]
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>
10 years agoCreate/use extended value_strings; add editor modelines as needed.
Bill Meier [Mon, 3 Mar 2014 21:10:35 +0000 (16:10 -0500)]
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>
10 years agoMove value_string defs from .h file; create/use extended value_string; Other minor...
Bill Meier [Mon, 3 Mar 2014 18:27:24 +0000 (13:27 -0500)]
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>
10 years agoCreate/use an extended value-string; Move value-string array from .h file; Do other...
Bill Meier [Mon, 3 Mar 2014 16:17:57 +0000 (11:17 -0500)]
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>
10 years agoCreate/use several extended value-strings; Do several other small changes.
Bill Meier [Mon, 3 Mar 2014 06:53:50 +0000 (01:53 -0500)]
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>
10 years agoCreate/use an extended value_string; Do other misc minor changes.
Bill Meier [Mon, 3 Mar 2014 05:43:39 +0000 (00:43 -0500)]
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>
10 years agoSSL: dynamically allocate session ticket storage area to avoid buffer overflow
Pascal Quantin [Sun, 2 Mar 2014 17:25:31 +0000 (18:25 +0100)]
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>
10 years agoshow if the current service is scrambled or free
Martin Kaiser [Fri, 28 Feb 2014 08:58:11 +0000 (11:58 +0300)]
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>
10 years agoadd cleartext values for retention limit
Martin Kaiser [Mon, 24 Feb 2014 08:50:49 +0000 (09:50 +0100)]
add cleartext values for retention limit

Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067
Reviewed-on: https://code.wireshark.org/review/461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agomove URI dissection to a separate function
Martin Kaiser [Mon, 24 Feb 2014 08:23:04 +0000 (09:23 +0100)]
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>
10 years agouse tvb_memdup() instead of tvb_get_ptr()
Martin Kaiser [Tue, 25 Feb 2014 08:06:22 +0000 (11:06 +0300)]
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>
10 years agoremove unnecessary if (tree) check
Martin Kaiser [Tue, 25 Feb 2014 18:41:27 +0000 (21:41 +0300)]
remove unnecessary if (tree) check

Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675
Reviewed-on: https://code.wireshark.org/review/458
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
10 years agoskip empty service provider name and empty service name
Martin Kaiser [Wed, 26 Feb 2014 10:21:09 +0000 (13:21 +0300)]
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>
10 years agoservice provider name is a DVB-SI string
Martin Kaiser [Wed, 26 Feb 2014 09:10:02 +0000 (12:10 +0300)]
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>
10 years agoservice name is a DVB-SI string
Martin Kaiser [Tue, 25 Feb 2014 19:04:19 +0000 (22:04 +0300)]
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>
10 years agoDon't pass an invalid length to proto_item_set_len
Evan Huus [Sun, 2 Mar 2014 14:58:49 +0000 (09:58 -0500)]
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>
10 years agoImprove SCTP association lookup.
Evan Huus [Sun, 2 Mar 2014 15:19:41 +0000 (10:19 -0500)]
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>
10 years agoScan-build didn't like the fixes in g79ef36a5f.
Gerald Combs [Sun, 2 Mar 2014 20:11:37 +0000 (12:11 -0800)]
Scan-build didn't like the fixes in g79ef36a5f.

Change-Id: I1083136f9e4fb38b55e9b9c2fec74ddec35f198e
Reviewed-on: https://code.wireshark.org/review/452
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agoRemove unneeded line of code.
Bill Meier [Sun, 2 Mar 2014 19:27:43 +0000 (14:27 -0500)]
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>
10 years agoClear INFO column at the beginning of the dissector.
Bill Meier [Sun, 2 Mar 2014 19:11:51 +0000 (14:11 -0500)]
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>
10 years agotvb_length() --> tvb_reported_length() in several cases + other misc changes.
Bill Meier [Sun, 2 Mar 2014 18:43:06 +0000 (13:43 -0500)]
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>
10 years agoAdded Cisco Starent Diameter dictionary entries.
Josip Medved [Sun, 2 Mar 2014 17:23:36 +0000 (09:23 -0800)]
Added Cisco Starent Diameter dictionary entries.

Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1
Reviewed-on: https://code.wireshark.org/review/438
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoClear INFO col; Create/use extended value-string; Do other minor changes
Bill Meier [Sun, 2 Mar 2014 17:33:25 +0000 (12:33 -0500)]
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>
10 years ago[Automatic manuf, services and enterprise-numbers update for 2014-03-02]
Gerald Combs [Sun, 2 Mar 2014 16:06:15 +0000 (08:06 -0800)]
[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>
10 years agoFix packet-h223.c:842:18: error: will never be executed [-Werror,-Wunreachable-code]
Alexis La Goutte [Sun, 23 Feb 2014 18:19:32 +0000 (19:19 +0100)]
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>
10 years agoFix ui/iface_lists.c - type attribute is not copied
Roland Knall [Wed, 26 Feb 2014 12:14:01 +0000 (13:14 +0100)]
Fix ui/iface_lists.c - type attribute is not copied

 temp is a clone of the local if_info, but the type
 attribute is not copied correctly

 Additionally, the if_type member is exposed via the
 capture options

Change-Id: Id53f0dfd1e127921e1b89bbf78cb431ee257a96c
Reviewed-on: https://code.wireshark.org/review/404
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoFix text2pcap.c: Argument with 'nonnull' attribute passed null (clang analyzer)
Hadriel Kaplan [Tue, 25 Feb 2014 15:44:39 +0000 (10:44 -0500)]
Fix text2pcap.c: Argument with 'nonnull' attribute passed null (clang analyzer)

Clang scan analysis reports API error for text2pcap.c.

Change-Id: Ie0861d75888e258d9fd928d5d7441e1e3a8279ba
Reviewed-on: https://code.wireshark.org/review/367
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
10 years agoCreate/use two extended value-strings & do other minor changes.
Bill Meier [Sat, 1 Mar 2014 21:26:07 +0000 (16:26 -0500)]
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>
10 years agoAdd the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that dissector.
Jeff Morriss [Fri, 28 Feb 2014 19:47:56 +0000 (14:47 -0500)]
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>
10 years agoFix some scan-build warnings.
Gerald Combs [Sat, 1 Mar 2014 19:13:08 +0000 (11:13 -0800)]
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>
10 years agoGlusterFS: add support for ZEROFILL fop
Niels de Vos [Wed, 26 Feb 2014 16:41:52 +0000 (17:41 +0100)]
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>
10 years agoDisable IPv4 checksum verfification to match TCP and UDP.
Gerald Combs [Thu, 27 Feb 2014 23:31:10 +0000 (15:31 -0800)]
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>
10 years agoFix bug which (somewhat) randomly caused UAT pref to not display on a proto pref...
Bill Meier [Fri, 28 Feb 2014 18:55:43 +0000 (13:55 -0500)]
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>
10 years agoAdd 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411.
Jeff Morriss [Fri, 28 Feb 2014 18:51:59 +0000 (13:51 -0500)]
Add 3GPP Slh AVPs 2400, 2405, 2407 and 2409-2411.

This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9793

Change-Id: Ia104767d2c1b3c26da851887c08973485f99f58b
Reviewed-on: https://code.wireshark.org/review/432
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
10 years agopacket-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistently
Florian Fainelli [Fri, 28 Feb 2014 00:40:42 +0000 (01:40 +0100)]
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>
10 years agopacket-homeplug-av: fix missing reserved byte for station dump
Florian Fainelli [Fri, 28 Feb 2014 00:37:00 +0000 (01:37 +0100)]
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>
10 years agoFix build with recent lua changes.
Evan Huus [Thu, 27 Feb 2014 21:59:08 +0000 (16:59 -0500)]
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>
10 years agoFix prefs.c: Argument with 'nonnull' attribute passed null (redux)
Hadriel Kaplan [Tue, 25 Feb 2014 17:57:52 +0000 (12:57 -0500)]
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>
10 years agoFix coverity warnings for all wslua files. (redux)
Hadriel Kaplan [Thu, 27 Feb 2014 04:42:15 +0000 (23:42 -0500)]
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>
10 years agoFix dumpcap.c: Assigned value is garbage or undefined (clang analyzer)
Hadriel Kaplan [Tue, 25 Feb 2014 16:25:47 +0000 (11:25 -0500)]
Fix dumpcap.c: Assigned value is garbage or undefined (clang analyzer)

Change-Id: I61dbf5e1e206b1c0d2e594bfba38e83e51e8f09c
Reviewed-on: https://code.wireshark.org/review/371
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
10 years agoEnsure ieee802154_packet struct is initialized.
Evan Huus [Thu, 27 Feb 2014 00:11:12 +0000 (19:11 -0500)]
Ensure ieee802154_packet struct is initialized.

A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be
called with an incompletely-initialized structure, leading to valgrind errors.

Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159
Closes-Bug: #9735
Reviewed-on: https://code.wireshark.org/review/418
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoSherman, set the Wayback Machine for 1997.
Guy Harris [Thu, 27 Feb 2014 00:58:22 +0000 (16:58 -0800)]
Sherman, set the Wayback Machine for 1997.

The URLs for the CRC-10 code are dead; use Wayback Machine URLs.

Change-Id: I3924e9cabb3b49b0e1abb31fbffa9b89f95cd0ce
Reviewed-on: https://code.wireshark.org/review/419
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoDocument tvb_memdup() in more detail.
Guy Harris [Wed, 26 Feb 2014 22:25:38 +0000 (14:25 -0800)]
Document tvb_memdup() in more detail.

Change-Id: Iec94342b7d033fb6e8597bbffea563128182316b
Reviewed-on: https://code.wireshark.org/review/417
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoFix some wmem-related documentation.
Evan Huus [Wed, 26 Feb 2014 22:22:22 +0000 (17:22 -0500)]
Fix some wmem-related documentation.

Discovered while reviewing Ibd3efb92a203861f507ce71bc8d04d19d9d38a93

Change-Id: Ie4dfc1b9b7a99f14657148ed5a935bbb079c2b4e
Reviewed-on: https://code.wireshark.org/review/415
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoRegularize the formatting of some comments.
Guy Harris [Wed, 26 Feb 2014 22:24:24 +0000 (14:24 -0800)]
Regularize the formatting of some comments.

Change-Id: I1009c75d5a4f074767dbc3600e7a6edfd0031460
Reviewed-on: https://code.wireshark.org/review/416
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoFix a copy-and-pasteo.
Guy Harris [Wed, 26 Feb 2014 22:20:58 +0000 (14:20 -0800)]
Fix a copy-and-pasteo.

Change-Id: Ied8830e2e7a689197870a4d839fd08b36546c75f
Reviewed-on: https://code.wireshark.org/review/414
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoSome g_free() -> wmem_free() changes missed in earlier checkins.
Guy Harris [Wed, 26 Feb 2014 22:14:16 +0000 (14:14 -0800)]
Some g_free() -> wmem_free() changes missed in earlier checkins.

Change-Id: I5858e0ee8fc8584b35145c943e19e8e5f7dba77c
Reviewed-on: https://code.wireshark.org/review/413
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoMore tvbuff API deprecation, comment expansion, and documentation updates.
Guy Harris [Sun, 23 Feb 2014 22:16:24 +0000 (14:16 -0800)]
More tvbuff API deprecation, comment expansion, and documentation updates.

Do with tvb_get_stringz() what was done with tvb_get_string().

Redo the comments for the string get routines to try to give more detail
in a fashion that's a bit less hard to read.

Warn, in comments, of the problems with using
tvb_get_string()/tvb_get_stringz() (i.e., if your strings are non-ASCII,
all bytes with the 8th bit set are going be replaced by the Unicode
REPLACEMENT CHARACTER, and displayed as such).

Warn, in a comment, of the problems with tvb_get_const_stringz() (i.e.,
it gives you raw bytes, rather than guaranteed-to-be-valid UTF-8).

Update documentation and release notes appropriately.

Change-Id: Ibd3efb92a203861f507ce71bc8d04d19d9d38a93
Reviewed-on: https://code.wireshark.org/review/327
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoRemove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
Bill Meier [Wed, 26 Feb 2014 19:29:17 +0000 (14:29 -0500)]
Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.

Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years agoRemove a trailing space from a line of generated code.
Bill Meier [Wed, 26 Feb 2014 19:27:36 +0000 (14:27 -0500)]
Remove a trailing space from a line of generated code.

Change-Id: Ib95c0db932c54f5664905bde9286aad7a195570f
Reviewed-on: https://code.wireshark.org/review/411
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years agoCreate/use an extended value_string.
Bill Meier [Wed, 26 Feb 2014 17:40:51 +0000 (12:40 -0500)]
Create/use an extended value_string.

Change-Id: I1cd20d68ebb50d11ecfa00bf76e9be7c47a45860
Reviewed-on: https://code.wireshark.org/review/410
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years ago(Minor) Use col_add_str() iso col_set_str().
Bill Meier [Wed, 26 Feb 2014 17:30:01 +0000 (12:30 -0500)]
(Minor) Use col_add_str() iso col_set_str().

Change-Id: I3d430e7e6a6bbdcb518f0110bd81ab32f88c17f0
Reviewed-on: https://code.wireshark.org/review/409
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years agoCreate/use some extended value-strings. Do some whitespace changes.
Bill Meier [Wed, 26 Feb 2014 03:18:37 +0000 (22:18 -0500)]
Create/use some extended value-strings. Do some whitespace changes.

Change-Id: Iee5cb12d3b6669c7e45e18352ebcd151db721ad3
Reviewed-on: https://code.wireshark.org/review/408
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
10 years agoFix capture_sync: Assigned value is garbage or undefined (clang analyzer)
Hadriel Kaplan [Tue, 25 Feb 2014 17:15:05 +0000 (12:15 -0500)]
Fix capture_sync: Assigned value is garbage or undefined (clang analyzer)

I'm not 100% positive this fix is the right way to handle this condition,
but it seems the safest way without changing a lot of other code.

Change-Id: Icaa8d6f38bc03177162f046d1e7ca55d87bad6a6
Reviewed-on: https://code.wireshark.org/review/373
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
10 years agoUse proto_tree_add_item() for most string encodings.
Guy Harris [Wed, 26 Feb 2014 10:16:27 +0000 (02:16 -0800)]
Use proto_tree_add_item() for most string encodings.

We support ISO 8859-1 and 8859-8, so use proto_tree_add_item() for them.
That leaves only EUC-KR.

Change-Id: Ie61f69af43be03e5abeb84b95601a407900fb79b
Reviewed-on: https://code.wireshark.org/review/403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoUse tvb_get_string_enc(..., ENC_ASCII|ENC_NA) for 8-bit encoding.
Guy Harris [Wed, 26 Feb 2014 10:12:53 +0000 (02:12 -0800)]
Use tvb_get_string_enc(..., ENC_ASCII|ENC_NA) for 8-bit encoding.

If there are 8-bit "extended ASCII" encodings, either one should be
wired in or there should be a preference for them.

Change-Id: Id62381b2579e8edf3719bd92959821c21f7ba223
Reviewed-on: https://code.wireshark.org/review/402
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoReplace tabs by spaces
Pascal Quantin [Wed, 26 Feb 2014 09:21:32 +0000 (10:21 +0100)]
Replace tabs by spaces

Change-Id: Ib7b97c415fdf924783637bfe566f1e7d21e28369
Reviewed-on: https://code.wireshark.org/review/401
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agopacket-smb-direct: register as a infiniband subdissector
Stefan Metzmacher [Fri, 31 Jan 2014 14:24:34 +0000 (15:24 +0100)]
packet-smb-direct: register as a infiniband subdissector

This is implemented based on the documentation, I sadly don't
have a capture to verify this.

Change-Id: Ia7dc371cb5b17ea42be0e686c97797f8c06ccabd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/358
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agopacket-infiniband: pass a struct infinibandinfo to subdissectors
Stefan Metzmacher [Fri, 31 Jan 2014 14:23:06 +0000 (15:23 +0100)]
packet-infiniband: pass a struct infinibandinfo to subdissectors

Change-Id: I187a1a91f34b1b758cad03bd9902ba132272cd3a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/357
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agopacket-smb-direct: only handle RDMA_SEND_* messages
Stefan Metzmacher [Fri, 31 Jan 2014 15:20:12 +0000 (16:20 +0100)]
packet-smb-direct: only handle RDMA_SEND_* messages

Change-Id: I08fa1092e2722c108bf6f847f8fc230f131e584b
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/356
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agopacket-iwarp-ddp-rdmap: pass struct rdmapinfo with opcode to the subdissectors
Stefan Metzmacher [Fri, 31 Jan 2014 15:16:48 +0000 (16:16 +0100)]
packet-iwarp-ddp-rdmap: pass struct rdmapinfo with opcode to the subdissectors

Change-Id: I51bb8a3047bbc16d55d0c089fe869c7534d4c0b5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/355
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agoWe don't use EBCDIC_to_ASCII(), so we don't need to include <epan/charsets.h>.
Guy Harris [Wed, 26 Feb 2014 07:56:48 +0000 (23:56 -0800)]
We don't use EBCDIC_to_ASCII(), so we don't need to include <epan/charsets.h>.

Change-Id: Ief609f48493f406ba0818ed3e6febe9a8ef0aaf2
Reviewed-on: https://code.wireshark.org/review/400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoUse tvb_get_string_enc() to get UCS-2 strings.
Guy Harris [Wed, 26 Feb 2014 07:50:22 +0000 (23:50 -0800)]
Use tvb_get_string_enc() to get UCS-2 strings.

Also, note that the "8-bit" encoding is "user-defined".

Change-Id: Ic4786873150d837d8793d2d3d20af50cd0003cc7
Reviewed-on: https://code.wireshark.org/review/399
Reviewed-by: Guy Harris <guy@alum.mit.edu>
10 years agoAs long as the NEWS file is part of the source distribution it really
Joerg Mayer [Tue, 25 Feb 2014 23:52:36 +0000 (00:52 +0100)]
As long as the NEWS file is part of the source distribution it really
needs to be updated every time the file docbook/release-notes.asciidoc
get changed.

Change-Id: Idea130c883b3b3645d696b830e25fe052f889860
Reviewed-on: https://code.wireshark.org/review/398
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
10 years agoFix indentation and numbering.
Gerald Combs [Tue, 25 Feb 2014 23:41:14 +0000 (15:41 -0800)]
Fix indentation and numbering.

Change-Id: Ic1b528db9128420e106affcc8b3639d2d5fc65c0
Reviewed-on: https://code.wireshark.org/review/397
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agoRemove the line that causes the following message:
Joerg Mayer [Tue, 25 Feb 2014 22:29:48 +0000 (23:29 +0100)]
Remove the line that causes the following message:
asciidoc: WARNING: developer-guide.asciidoc: line 25: include file not found: /home/jmayer/work/wireshark/git/docbook/wsdg_src/WSDG_chapter_.asciidoc

Change-Id: I65c035da7e44e0bca7aa9fe26a9d77da5238e205
Reviewed-on: https://code.wireshark.org/review/394
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
10 years agoGet Windows build working again.
Gerald Combs [Tue, 25 Feb 2014 22:43:04 +0000 (14:43 -0800)]
Get Windows build working again.

Change 16 / g579e7e1 introduced a breaking change in
capture_file_dialog.cpp on Windows. This works around the problem
temporarily until we come up with a proper fix.

Fix a Q_OS_WIN check while we're at it.

Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb
Reviewed-on: https://code.wireshark.org/review/396
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agoAdd a few more dissectors to release notes
Pascal Quantin [Tue, 25 Feb 2014 22:36:24 +0000 (23:36 +0100)]
Add a few more dissectors to release notes

Change-Id: I9d3262fe8205d21baf46b7a7389ca0154a16d165
Reviewed-on: https://code.wireshark.org/review/395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
10 years agopacket-smb: register a dissector on top of smb_direct
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:49 +0000 (20:21 +0200)]
packet-smb: register a dissector on top of smb_direct

Change-Id: I316b958c6a91dc333bcdb468368f2c19fe8845d6
Old-Change-Id: I26a3088df12de9d74cf6c224b938003417b758f5
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/58
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit d0d83e5b85173cd9fdc9001a2efb2f596124e2a2)
Reviewed-on: https://code.wireshark.org/review/389

10 years agopacket-smb2: register a dissector on top of smb_direct
Stefan Metzmacher [Wed, 19 Sep 2012 18:21:49 +0000 (20:21 +0200)]
packet-smb2: register a dissector on top of smb_direct

Change-Id: I6a87c57d513af9c8ce9dff783988f7242f5257d0
Old-Change-Id: If52130f7f9e9783a8ecc8b8b3c01d86a02e4f946
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/57
Reviewed-by: Evan Huus <eapache@gmail.com>
(cherry picked from commit cd9f6e077fdbdde2462acea6b7906e153c8c4864)
Reviewed-on: https://code.wireshark.org/review/390

10 years agopacket-smb-direct.c: add initial implementation
Stefan Metzmacher [Wed, 19 Sep 2012 14:21:21 +0000 (16:21 +0200)]
packet-smb-direct.c: add initial implementation

See [MS-SMBD] http://msdn.microsoft.com/en-us/library/hh536346.aspx

Change-Id: If2cf719bdf5da82bc5f5e086dd69d02caff2166a
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/55
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoAdd back an anchor removed in gc55c57a.
Gerald Combs [Tue, 25 Feb 2014 21:57:28 +0000 (13:57 -0800)]
Add back an anchor removed in gc55c57a.

Change-Id: I9795278b759d1a965abd9b22dc023c70fce19b77
Reviewed-on: https://code.wireshark.org/review/391
Reviewed-by: Gerald Combs <gerald@wireshark.org>
10 years agopacket-kerberos: remember in what frame a key was learned
Stefan Metzmacher [Mon, 13 Aug 2012 12:45:58 +0000 (14:45 +0200)]
packet-kerberos: remember in what frame a key was learned

Change-Id: Icd05d4941fdacac44094fafbad07f08ec4cbe976
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/364
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoasn1/kerberos: remember in what frame a key was learned
Stefan Metzmacher [Mon, 13 Aug 2012 06:59:22 +0000 (08:59 +0200)]
asn1/kerberos: remember in what frame a key was learned

Change-Id: I8e64e1d02ee8b4dff3845e1b9ec8f56174e76fbf
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/363
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoFix function prototypes.
Evan Huus [Tue, 25 Feb 2014 21:44:29 +0000 (16:44 -0500)]
Fix function prototypes.

Functions with no parameters must be written func(void). Fixes (some) of the
buildbots.

Change-Id: I1a6e5c0553e032e99419fe67eb4b573bbdfe7fe6
Reviewed-on: https://code.wireshark.org/review/388
Reviewed-by: Evan Huus <eapache@gmail.com>
10 years agoFix mergecap.c: Dereference of null pointer (clang analyzer)
Hadriel Kaplan [Tue, 25 Feb 2014 16:10:50 +0000 (11:10 -0500)]
Fix mergecap.c: Dereference of null pointer (clang analyzer)

Change-Id: I89076388db8522c5fbdf72505f50e1380f1ab391
Reviewed-on: https://code.wireshark.org/review/369
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoFix bug 6357: Lua all_field_infos() broken within tap/listener
Hadriel Kaplan [Fri, 21 Feb 2014 06:11:41 +0000 (01:11 -0500)]
Fix bug 6357: Lua all_field_infos() broken within tap/listener

The current API for Lua provides a global function
"all_field_infos()" which returns all the populated field_info nodes
in the current proto_tree.

By default all_field_infos() "works", in the literal sense: it returns
exactly the fields the previous dissectors of the packet have
populated at that instant of time.  But of course dissectors don't
populate all the applicable fields most of the time, because of the
TRY_TO_FAKE_THIS_ITEM optimization where they don't fill in things
that aren't needed at the time by a display, color, or tap's dfilter.

So this commit offers a way to force the dissectors to populate
all the applicable field_infos in the tree, by setting the proto_tree
to be visible.  Obviously that is going to impact performance, since
it basically bypasses the TRY_TO_FAKE_THIS_ITEM optimization; so the
patch only does this if the Lua script author told it to explicitly,
by adding an argument to Listener.new() and register_postdissector().

Change-Id: I11d3559fbe8c14fbadf1b51415a3701dc1200b7b
Reviewed-on: https://code.wireshark.org/review/286
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoAdds some Lua helper functions: some commonly used functions, and to help troubleshoo...
Hadriel Kaplan [Tue, 18 Feb 2014 15:03:04 +0000 (10:03 -0500)]
Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts

There are some common things people need to do, such as convert to/from hex or get
the raw binary string in a ByteArray/Tvb/TvbRange. These have been added, as well
as some tests for them in the testsuites. Also, functions have been added to allow
a script to get all the available tap types and filter fields, since they are
not exactly what one can see in the Wireshark gui.

Change-Id: I92e5e4eae713bb90d79b0c024eaa4e55b99cc96b
Reviewed-on: https://code.wireshark.org/review/249
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
10 years agoFix file.c: Dereference of null pointer (clang analyzer)
Hadriel Kaplan [Tue, 25 Feb 2014 16:05:17 +0000 (11:05 -0500)]
Fix file.c: Dereference of null pointer (clang analyzer)

Change-Id: Ib96e5ffb284234562c2883c13e93109173e22179
Reviewed-on: https://code.wireshark.org/review/368
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>