8 years agoFrom Yi Zhang:
etxrab [Fri, 13 Jan 2012 06:29:03 +0000 (06:29 +0000)]
From Yi Zhang:
The DCD_CLID_BCAST_ID TLV is not supported in DOCSIS plugin.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40449 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Edward Sheldrake:
etxrab [Fri, 13 Jan 2012 06:22:56 +0000 (06:22 +0000)]
From  Edward Sheldrake:
Wireshark crashes if you open the file import dialog and choose something from the "Encapsulation type" list.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40448 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Mike Morrin:
etxrab [Fri, 13 Jan 2012 06:11:44 +0000 (06:11 +0000)]
From Mike Morrin:
This is largely a cosmetic update of the gsm_a_rr dissector:

•    TBF starting time is now fully decoded.
•    “Double indenting” of IE groups (where an IE dissector adds a subtree just
after the generic dissector adds a subtree) has been eliminated.
•    “Null” break points in CSN.1 IEs have been added where they were
previously missing (this could have caused some correct PDUs to be reported as
•    The calculation of CSN.1 IE lengths has been corrected: ((a – b)>>3)+1 is
not the same as (a>>3)-(b>>3)+1 .
•    The handling of CSN.1 padding bits is slightly improved.
•    The handling of CSN.1 “truncated” bits is slightly improved.
•    Eliminated superfluous checks for len==0 at the beginning of some
rest-octet dissectors (the generic dissector won’t call the CSN.1 dissector if
len is 0).
•    A few minor corrections to text strings and formatting.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40447 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoVarious minor mods;
wmeier [Thu, 12 Jan 2012 22:25:42 +0000 (22:25 +0000)]
Various minor mods;
- check-col() not needed;
- use tvb_new_subset_remaining() iso tvb_new();
- #if 0 (currently ?) unused 'erf_handle';
- Convert some '4 space tabs' to 4 spaces;
- other reformatting.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40446 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Tobias Witek: Add dissector table to 'meta' dissector.
wmeier [Thu, 12 Jan 2012 22:13:09 +0000 (22:13 +0000)]
From Tobias Witek: Add dissector table to 'meta' dissector.

  The attached patch adds a dissector table to the 'meta' dissector
  so that other protocol dissectors can register for specific values
  of 'meta.proto'.

  Additionally, the patch also adds three more protocol values.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40445 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.
wmeier [Thu, 12 Jan 2012 20:40:23 +0000 (20:40 +0000)]
Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40444 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
gerald [Thu, 12 Jan 2012 19:16:15 +0000 (19:16 +0000)]
CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before
register_tap_files so that the "-z" flag works for TShark.

epan/stat_cmd_args.c: Fixup whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40443 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRe-indent for readability.
wmeier [Thu, 12 Jan 2012 15:04:09 +0000 (15:04 +0000)]
Re-indent for readability.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40442 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago"Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3...
martinm [Wed, 11 Jan 2012 21:31:11 +0000 (21:31 +0000)]
"Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3 payloads.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40441 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't do tvb_get...() in arg of g_htonl(); Macro evals args multiple times.
wmeier [Wed, 11 Jan 2012 20:12:51 +0000 (20:12 +0000)]
Don't do tvb_get...() in arg of g_htonl(); Macro evals args multiple times.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40440 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a dissector for h248.2 packages.
etxrab [Wed, 11 Jan 2012 19:31:45 +0000 (19:31 +0000)]
Add a dissector for h248.2 packages.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40439 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCopy over updates from the 1.6 branch.
gerald [Wed, 11 Jan 2012 17:03:54 +0000 (17:03 +0000)]
Copy over updates from the 1.6 branch.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40437 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Martin Kaiser:
etxrab [Wed, 11 Jan 2012 06:38:25 +0000 (06:38 +0000)]
From Martin Kaiser:
DVB-CI / CI+ dissect sac message body.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40435 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Lei Chen:
etxrab [Wed, 11 Jan 2012 06:30:20 +0000 (06:30 +0000)]
From Lei Chen:
An error in eutran_measurement_param_desc of GSM si2qua rest octet.

From me fix similar bugs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40434 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6722
alagoutte [Tue, 10 Jan 2012 15:12:13 +0000 (15:12 +0000)]
From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6722
Small corrections in the Alcatel UA dissector

The most important change is to add a condition in dissector for TLV with ID equal to 104 as in the case of the 120. No condition causing 'malformed packet'.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40424 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jose Pedro Oliveira via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
alagoutte [Tue, 10 Jan 2012 13:59:27 +0000 (13:59 +0000)]
From Jose Pedro Oliveira  via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6719
pcapio.c: bug in libpcap_write_interface_description_block

The attached patch fixes a copy_and_paste error in the code of the function libpcap_write_interface_description_block(): strlen(name) instead of strlen(filter).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40423 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Wojciech Dubowik via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6720
alagoutte [Tue, 10 Jan 2012 12:08:43 +0000 (12:08 +0000)]
From Wojciech Dubowik via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6720
Add STBC flag to MCS field in radiotap packet dissector.

From me:
Replace VALS by TFS (and use boolean hf)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40422 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove some debug logging.
gerald [Mon, 9 Jan 2012 19:31:31 +0000 (19:31 +0000)]
Remove some debug logging.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40421 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIt appears that the intent of r35027 was to use reset_tap_update_timer() not
morriss [Mon, 9 Jan 2012 19:05:00 +0000 (19:05 +0000)]
It appears that the intent of r35027 was to use reset_tap_update_timer() not
just on Windows or when we have threads, so make it so.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40420 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 9 Jan 2012 16:36:56 +0000 (16:36 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

Try to compile with cmake in Ubuntu 11.10

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40412 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 9 Jan 2012 16:33:47 +0000 (16:33 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

Try to compile with cmake in Ubuntu 11.10

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40411 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Mon, 9 Jan 2012 16:32:53 +0000 (16:32 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

Try to compile with cmake in Ubuntu 11.10

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40410 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove a generated file (pointed out by Gisle Vanem).
gerald [Mon, 9 Jan 2012 06:21:19 +0000 (06:21 +0000)]
Remove a generated file (pointed out by Gisle Vanem).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40409 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Martin Kaiser:
etxrab [Sun, 8 Jan 2012 15:34:23 +0000 (15:34 +0000)]
From Martin Kaiser:
DVB-CI / CI+ decrypt SAC messages.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40407 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Mike Morrin:
etxrab [Sun, 8 Jan 2012 15:30:05 +0000 (15:30 +0000)]
From Mike Morrin:
GSM RR CCCH dissection ignores last octet of PDU.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40405 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-08]
gerald [Sun, 8 Jan 2012 15:03:27 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-08]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40404 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSimplify key for cid->context hash table. Copy more details between contexts when...
martinm [Sat, 7 Jan 2012 02:50:37 +0000 (02:50 +0000)]
Simplify key for cid->context hash table. Copy more details between contexts when updating.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40403 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoQuote some filename usage.
wmeier [Fri, 6 Jan 2012 18:25:20 +0000 (18:25 +0000)]
Quote some filename usage.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40397 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd quotes around some filename usage; Also: use $() instead of backticks
wmeier [Fri, 6 Jan 2012 18:22:50 +0000 (18:22 +0000)]
Add quotes around some filename usage; Also: use $() instead of backticks

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40396 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove support for MSVC < MSVC2005; Update Developer's Guide.
wmeier [Fri, 6 Jan 2012 15:45:46 +0000 (15:45 +0000)]
Remove support for MSVC < MSVC2005; Update Developer's Guide.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40395 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix: packet-rohc.c:439:20: error: variable ‘PS’ set but not used [-Werror=unused...
jmayer [Fri, 6 Jan 2012 10:11:30 +0000 (10:11 +0000)]
Fix: packet-rohc.c:439:20: error: variable ‘PS’ set but not used [-Werror=unused-but-set-variable]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40394 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Tobias Witek:
etxrab [Thu, 5 Jan 2012 19:43:37 +0000 (19:43 +0000)]
From Tobias Witek:
Patch to correctly format IMSI, IMEI and mobile cell in packet-meta.c


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40392 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix Coverity CID's 1348-1349: UNUSED_VALUE and CID 1344: CONSTANT_EXPRESSION_RESULT.
cmaynard [Thu, 5 Jan 2012 19:14:54 +0000 (19:14 +0000)]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40391 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some typos. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6709
cmaynard [Thu, 5 Jan 2012 18:53:29 +0000 (18:53 +0000)]
Fix some typos.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6709

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40390 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago- Add the beginning of compressed list handling.
martinm [Thu, 5 Jan 2012 17:40:41 +0000 (17:40 +0000)]
- Add the beginning of compressed list handling.
    - Will at least skip the single byte if there is nothing in the list.
    - Checks that the intended encoding type (ET) is found
    - Need to call from lots of places
- Pass correct subtree for feedback items (was passing NULL so items weren't there)
- show SNs as decimal
- remove a few stray tabs
- fix a typo

Still need to port some parts from packet-pdcp-lte.c that aren't handled (e.g. UO_0).  And the context lookup seems broken (at least for IxCatapult logs).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40388 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse length field from UDP header as the pseudo-header's UDP length field instead...
cmaynard [Thu, 5 Jan 2012 17:29:27 +0000 (17:29 +0000)]
Use length field from UDP header as the pseudo-header's UDP length field instead of using the reported_len.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6711

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40387 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix the following error :
alagoutte [Thu, 5 Jan 2012 08:29:58 +0000 (08:29 +0000)]
Fix the following error :
packet-gsm_a_rr.c: In function 'de_rr_p2_rest_oct':
packet-gsm_a_rr.c:4033:105: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40386 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Mike Morrin:
etxrab [Thu, 5 Jan 2012 07:24:21 +0000 (07:24 +0000)]
From Mike Morrin:
Improvements to handling of gsm_um traces and dissection of ccch protocol


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40385 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Mike Morrin:
etxrab [Thu, 5 Jan 2012 07:17:38 +0000 (07:17 +0000)]
From Mike Morrin:
Wrong tvb_get_bits function call in packet-csn1.c.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40384 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agodissect_esp(): 'i' is only (really) used if we HAVE_LIBGCRYPT.
morriss [Thu, 5 Jan 2012 02:06:08 +0000 (02:06 +0000)]
dissect_esp(): 'i' is only (really) used if we HAVE_LIBGCRYPT.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40383 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoShow % UL padding as a progress bar.
martinm [Thu, 5 Jan 2012 02:00:13 +0000 (02:00 +0000)]
Show % UL padding as a progress bar.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40382 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWrap lines for those of us who use editors that don't (by default) line wrap.
morriss [Thu, 5 Jan 2012 01:37:32 +0000 (01:37 +0000)]
Wrap lines for those of us who use editors that don't (by default) line wrap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40381 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix several warnings turned error of type:
jmayer [Wed, 4 Jan 2012 23:15:50 +0000 (23:15 +0000)]
Fix several warnings turned error of type:
 variable ‘mtu_flag’ set but not used [-Werror=unused-but-set-variable]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40380 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix compilation on Windows.
gerald [Wed, 4 Jan 2012 22:59:17 +0000 (22:59 +0000)]
Fix compilation on Windows.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40379 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd initial support for Qt along with a "ui" subdirectory.
gerald [Wed, 4 Jan 2012 22:13:01 +0000 (22:13 +0000)]
Add initial support for Qt along with a "ui" subdirectory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40378 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore C++ updates.
gerald [Wed, 4 Jan 2012 21:26:51 +0000 (21:26 +0000)]
More C++ updates.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40377 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse hfi->abbrev insted.
etxrab [Wed, 4 Jan 2012 19:06:34 +0000 (19:06 +0000)]
Use hfi->abbrev insted.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40376 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Wed, 4 Jan 2012 17:44:50 +0000 (17:44 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40375 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Wed, 4 Jan 2012 17:42:10 +0000 (17:42 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40374 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Wed, 4 Jan 2012 17:35:41 +0000 (17:35 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40373 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Wed, 4 Jan 2012 17:34:36 +0000 (17:34 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40372 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697
alagoutte [Wed, 4 Jan 2012 13:29:48 +0000 (13:29 +0000)]
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697
Modbus object support for CIP dissector

Support for the Modbus object within the CIP dissector.  Essentially wraps the Modbus protocol within a CIP object.

Also included update to Modbus error code per

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40371 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Andrei Maruseac via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6705
alagoutte [Wed, 4 Jan 2012 13:01:53 +0000 (13:01 +0000)]
From Andrei Maruseac via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6705
Multipath TCP Option

Extensions for Multipath Operation with Multiple Addresses, as defined in http://tools.ietf.org/html/draft-ietf-mptcp-multiaddressed-04. I implemented this as a TCP option.

From me :
Remove a subtree
Add Subtype in top of multiPath subtree

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40370 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTMR should be OCTET STRING
etxrab [Wed, 4 Jan 2012 07:26:00 +0000 (07:26 +0000)]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40369 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUpdate to V10.3.0 (2011-09)
etxrab [Wed, 4 Jan 2012 07:20:15 +0000 (07:20 +0000)]
Update to V10.3.0 (2011-09)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40368 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoExpand, and fix, a comment. Change a function argument name to match
guy [Wed, 4 Jan 2012 03:31:21 +0000 (03:31 +0000)]
Expand, and fix, a comment.  Change a function argument name to match
the name in the definition of the function it calls.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40367 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMove stuff that should *only* be known by the lowest-level code that
guy [Wed, 4 Jan 2012 03:02:13 +0000 (03:02 +0000)]
Move stuff that should *only* be known by the lowest-level code that
deals with the sync pipe - i.e., only by sync_pipe.c and dumpcap.c -
into sync_pipe.h.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40366 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake sure each value in a GHashTable is unique. This avoids a
gerald [Wed, 4 Jan 2012 00:37:14 +0000 (00:37 +0000)]
Make sure each value in a GHashTable is unique. This avoids a
double-free bug triggered by using the "any" address wildcard.

Use g_malloc0 instead of zeroing elements by hand. Check for SSL_FAST
the same way everywhere.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40365 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Pascal Quantin:
etxrab [Tue, 3 Jan 2012 22:12:16 +0000 (22:12 +0000)]
From Pascal Quantin:
Display Home eNodeB name.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40363 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse a hash table to gather information from IR packets and store it in per-packet...
etxrab [Tue, 3 Jan 2012 22:08:13 +0000 (22:08 +0000)]
Use a hash table to gather information from IR packets and store it in per-packet-data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40362 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoEnhance error information.
etxrab [Tue, 3 Jan 2012 22:06:42 +0000 (22:06 +0000)]
Enhance error information.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40361 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMove capture_sync.h as well.
guy [Tue, 3 Jan 2012 05:37:56 +0000 (05:37 +0000)]
Move capture_sync.h as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40359 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agocapture_sync.c is another file common to all programs that capture
guy [Tue, 3 Jan 2012 05:33:02 +0000 (05:33 +0000)]
capture_sync.c is another file common to all programs that capture
traffic by running dumpcap (not surprising, as it's the file with all
the "run dumpcap" routines).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40358 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Mike Morrin:
etxrab [Sun, 1 Jan 2012 19:57:47 +0000 (19:57 +0000)]
From Mike Morrin:
dissected when present as L3_INFO in RSL MEAS_RES PDUs.

It seems that the RSL L3_INFO needs to be handled by a different dissector
depending on whether it contains a DTAP, SACCH or CCCH PDU, which fortunately
can be deduced from the RSL PDU type.  packet-rsl.c is updated to implement

In packet-gsm_a_rr.c the dissection of PDUs with RR Short PD format is
improved, and also some items are renamed to make clearer the difference
between SACCH PDUs (which cna be normal or Short PD format) and RR Short PD
format PDUs (which can occur on SACCH, CCCH, or DCH).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40357 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-01]
gerald [Sun, 1 Jan 2012 15:03:27 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-01]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40354 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoHappy New Year!
stig [Sun, 1 Jan 2012 10:02:11 +0000 (10:02 +0000)]
Happy New Year!

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40353 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago- Update the graphical packages
jmayer [Sat, 31 Dec 2011 16:20:47 +0000 (16:20 +0000)]
- Update the graphical packages
- Newer versions of glib etc require xz. At least Snow Leopard
  does not provide xz, so (unconditionally) download and install this first.
- Put in infrastructure to set up a GTK3 environment instead of GTK2
  (not active by default because configure'ing Wireshark still fails for some
  reason with GTK3 installed).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40352 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPut back paragraph break.
guy [Sat, 31 Dec 2011 03:20:19 +0000 (03:20 +0000)]
Put back paragraph break.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40351 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoLeave more word-wrapping to the toolkit.
guy [Sat, 31 Dec 2011 03:14:30 +0000 (03:14 +0000)]
Leave more word-wrapping to the toolkit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40350 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd more entries and sort them.
gerald [Sat, 31 Dec 2011 01:23:06 +0000 (01:23 +0000)]
Add more entries and sort them.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40349 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd Gaurav Tungatkar.
cmaynard [Fri, 30 Dec 2011 19:19:19 +0000 (19:19 +0000)]
Add Gaurav Tungatkar.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40348 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix formatting issues.
stig [Fri, 30 Dec 2011 15:49:02 +0000 (15:49 +0000)]
Fix formatting issues.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40347 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix 'encoding-arg' for ptvcursor_add_with_subtree(): TRUE=>ENC_LITTLE_ENDIAN, etc
wmeier [Fri, 30 Dec 2011 15:30:32 +0000 (15:30 +0000)]
Fix 'encoding-arg' for ptvcursor_add_with_subtree(): TRUE=>ENC_LITTLE_ENDIAN, etc

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40346 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRegenerated packet-h245.c (should have been included in SVN #40311: add_new_data_sour...
wmeier [Fri, 30 Dec 2011 15:28:04 +0000 (15:28 +0000)]
Regenerated packet-h245.c (should have been included in SVN #40311: add_new_data_source() needed in several places).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40345 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6698
alagoutte [Fri, 30 Dec 2011 11:07:04 +0000 (11:07 +0000)]
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6698
Updates for newest profile identifier database, ZigBee 053298r19

Corrects error in Samsung manufacturer code in r18.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40344 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWe don't have any links to activate if we don't have pcap.
guy [Fri, 30 Dec 2011 07:31:18 +0000 (07:31 +0000)]
We don't have any links to activate if we don't have pcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40343 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake the links in the "WinPcap doesn't appear to be installed" text
guy [Fri, 30 Dec 2011 07:07:20 +0000 (07:07 +0000)]
Make the links in the "WinPcap doesn't appear to be installed" text

Get rid of hard returns, and make it word wrap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40342 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoClean up word wrapping a bit.
guy [Fri, 30 Dec 2011 04:26:33 +0000 (04:26 +0000)]
Clean up word wrapping a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40341 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFor the "don't have WinPcap" case, put up some stuff in the welcome
guy [Fri, 30 Dec 2011 00:52:15 +0000 (00:52 +0000)]
For the "don't have WinPcap" case, put up some stuff in the welcome
screen discussing that.  (XXX - those links should be made live.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40340 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoI had a capture_errs.c but capture-wpcap.c eated it.
guy [Fri, 30 Dec 2011 00:17:50 +0000 (00:17 +0000)]
I had a capture_errs.c but capture-wpcap.c eated it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40339 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGet rid of extra blank line.
guy [Thu, 29 Dec 2011 23:34:20 +0000 (23:34 +0000)]
Get rid of extra blank line.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40338 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoLeave it up to dumpcap to determine whether WinPcap was loaded and, if
guy [Thu, 29 Dec 2011 23:33:29 +0000 (23:33 +0000)]
Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40337 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoLeave it up to dumpcap to determine whether WinPcap was loaded and, if
guy [Thu, 29 Dec 2011 23:21:18 +0000 (23:21 +0000)]
Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40336 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSwallow cant_load_winpcap_err() up into capture-wpcap.c, so that
guy [Thu, 29 Dec 2011 23:09:42 +0000 (23:09 +0000)]
Swallow cant_load_winpcap_err() up into capture-wpcap.c, so that
anything that uses WinPcap can use that message text in its error

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40335 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd an additional DONT_HAVE_PCAP return value from get_interface_list()
guy [Thu, 29 Dec 2011 22:49:49 +0000 (22:49 +0000)]
Add an additional DONT_HAVE_PCAP return value from get_interface_list()
and capture_interface_list().  Return it if, on Windows, we ask for the
interface list but don't have WinPcap installed.  Handle it like

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40334 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoJust hard-code the error for "can't load WinPcap"; the one that
guy [Thu, 29 Dec 2011 22:06:22 +0000 (22:06 +0000)]
Just hard-code the error for "can't load WinPcap"; the one that
cant_load_winpcap_err() has some redundant gunk in it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40333 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoOn Windows, if we can't open a capture device, check whether WinPcap is
guy [Thu, 29 Dec 2011 21:59:24 +0000 (21:59 +0000)]
On Windows, if we can't open a capture device, check whether WinPcap is
loaded and, if not, report that as the problem, rather than suggesting
that you didn't specify the proper interface.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40332 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoForgot the buffer length argument to g_snprintf().
guy [Thu, 29 Dec 2011 21:43:59 +0000 (21:43 +0000)]
Forgot the buffer length argument to g_snprintf().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40331 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIf pcap_open_live() or pcap_open() fails due to not having WinPcap,
guy [Thu, 29 Dec 2011 21:18:08 +0000 (21:18 +0000)]
If pcap_open_live() or pcap_open() fails due to not having WinPcap,
supply an appropriate error string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40330 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAFAIKT sys/stat.h, sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes...
wmeier [Thu, 29 Dec 2011 21:08:53 +0000 (21:08 +0000)]
AFAIKT sys/stat.h, sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h  #includes aren't needed.
also: Add #include <epan/packet.h>  (altho included by one of the other includes).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40329 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAFAIKT sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.
wmeier [Thu, 29 Dec 2011 20:44:19 +0000 (20:44 +0000)]
AFAIKT sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40328 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDo whitespace cleanup; Reformat long lines;
wmeier [Thu, 29 Dec 2011 20:23:18 +0000 (20:23 +0000)]
Do whitespace cleanup; Reformat long lines;
Move proto_register...() to be near the end of the file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40327 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDefine GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
wmeier [Thu, 29 Dec 2011 16:58:41 +0000 (16:58 +0000)]
Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40326 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix LTP multiple bundle bug and allow LTP/DCCP. Fixes https://bugs.wireshark.org...
cmaynard [Thu, 29 Dec 2011 16:22:02 +0000 (16:22 +0000)]
Fix LTP multiple bundle bug and allow LTP/DCCP.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5035

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40325 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSet filter text after connecting to filter string callback so the
stig [Thu, 29 Dec 2011 11:54:08 +0000 (11:54 +0000)]
Set filter text after connecting to filter string callback so the
initial filter will be syntax checked.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40324 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFixed a typo: btyes -> bytes
stig [Thu, 29 Dec 2011 11:44:22 +0000 (11:44 +0000)]
Fixed a typo: btyes -> bytes

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40323 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd PLACE_OF_INTEREST_SIGN, a.k.a. the OS X Command key symbol. Annotate
gerald [Thu, 29 Dec 2011 00:12:22 +0000 (00:12 +0000)]
Add PLACE_OF_INTEREST_SIGN, a.k.a. the OS X Command key symbol. Annotate
entries with their decimal and hexadecimal values. Add a modeline blurb.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40322 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd 'extern "C"' wrappers and #include guards to various header files.
gerald [Thu, 29 Dec 2011 00:08:47 +0000 (00:08 +0000)]
Add 'extern "C"' wrappers and #include guards to various header files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40321 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPrepend the sita_phdr fields with "sita_" to make them less
gerald [Wed, 28 Dec 2011 23:39:14 +0000 (23:39 +0000)]
Prepend the sita_phdr fields with "sita_" to make them less

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40320 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd some CMake files and directories.
gerald [Wed, 28 Dec 2011 22:57:02 +0000 (22:57 +0000)]
Add some CMake files and directories.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40319 f5534014-38df-0310-8fa8-9805f1628bb7