Commit graph

38608 commits

Author SHA1 Message Date
Bill Meier
d412a94dd5 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.

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


svn path=/trunk/; revision=40445
2012-01-12 22:13:09 +00:00
Bill Meier
34a0aba9d3 Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.
svn path=/trunk/; revision=40444
2012-01-12 20:40:23 +00:00
Gerald Combs
f6ffb03ccb 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.

svn path=/trunk/; revision=40443
2012-01-12 19:16:15 +00:00
Bill Meier
dc96e5fee2 Re-indent for readability.
svn path=/trunk/; revision=40442
2012-01-12 15:04:09 +00:00
Martin Mathieson
427122a220 "Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3 payloads.
svn path=/trunk/; revision=40441
2012-01-11 21:31:11 +00:00
Bill Meier
98fb51a3ed Don't do tvb_get...() in arg of g_htonl(); Macro evals args multiple times.
svn path=/trunk/; revision=40440
2012-01-11 20:12:51 +00:00
Anders Broman
e5f14929f1 Add a dissector for h248.2 packages.
svn path=/trunk/; revision=40439
2012-01-11 19:31:45 +00:00
Gerald Combs
4defd2a34e Copy over updates from the 1.6 branch.
svn path=/trunk/; revision=40437
2012-01-11 17:03:54 +00:00
Anders Broman
665cfc31bf From Martin Kaiser:
DVB-CI / CI+ dissect sac message body.

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

svn path=/trunk/; revision=40435
2012-01-11 06:38:25 +00:00
Anders Broman
6fe073426a From Lei Chen:
An error in eutran_measurement_param_desc of GSM si2qua rest octet.

From me fix similar bugs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6721

svn path=/trunk/; revision=40434
2012-01-11 06:30:20 +00:00
Alexis La Goutte
65ce72e3a3 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'.

svn path=/trunk/; revision=40424
2012-01-10 15:12:13 +00:00
Alexis La Goutte
8b66d8fae7 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).

svn path=/trunk/; revision=40423
2012-01-10 13:59:27 +00:00
Alexis La Goutte
668e23f9fe 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)

svn path=/trunk/; revision=40422
2012-01-10 12:08:43 +00:00
Gerald Combs
17fb65a364 Remove some debug logging.
svn path=/trunk/; revision=40421
2012-01-09 19:31:31 +00:00
Jeff Morriss
6e2960f731 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.

svn path=/trunk/; revision=40420
2012-01-09 19:05:00 +00:00
Alexis La Goutte
2f820b8902 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Try to compile with cmake in Ubuntu 11.10

svn path=/trunk/; revision=40412
2012-01-09 16:36:56 +00:00
Alexis La Goutte
8f34b6760b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Try to compile with cmake in Ubuntu 11.10

svn path=/trunk/; revision=40411
2012-01-09 16:33:47 +00:00
Alexis La Goutte
09e95bda3f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Try to compile with cmake in Ubuntu 11.10

svn path=/trunk/; revision=40410
2012-01-09 16:32:53 +00:00
Gerald Combs
458de08ce9 Remove a generated file (pointed out by Gisle Vanem).
svn path=/trunk/; revision=40409
2012-01-09 06:21:19 +00:00
Anders Broman
82cec1ce89 From Martin Kaiser:
DVB-CI / CI+ decrypt SAC messages.

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

svn path=/trunk/; revision=40407
2012-01-08 15:34:23 +00:00
Anders Broman
ec2f398ad1 From Mike Morrin:
GSM RR CCCH dissection ignores last octet of PDU.

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

svn path=/trunk/; revision=40405
2012-01-08 15:30:05 +00:00
Gerald Combs
f9e769ad7e [Automatic manuf, services and enterprise-numbers update for 2012-01-08]
svn path=/trunk/; revision=40404
2012-01-08 15:03:27 +00:00
Martin Mathieson
30d4a0dc7e Simplify key for cid->context hash table. Copy more details between contexts when updating.
svn path=/trunk/; revision=40403
2012-01-07 02:50:37 +00:00
Bill Meier
b0a4df4022 Quote some filename usage.
svn path=/trunk/; revision=40397
2012-01-06 18:25:20 +00:00
Bill Meier
d59b7b4370 Add quotes around some filename usage; Also: use $() instead of backticks
svn path=/trunk/; revision=40396
2012-01-06 18:22:50 +00:00
Bill Meier
0600db677f Remove support for MSVC < MSVC2005; Update Developer's Guide.
svn path=/trunk/; revision=40395
2012-01-06 15:45:46 +00:00
Jörg Mayer
b7356ab3cd Fix: packet-rohc.c:439:20: error: variable ‘PS’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=40394
2012-01-06 10:11:30 +00:00
Anders Broman
a5b75fde8e From Tobias Witek:
Patch to correctly format IMSI, IMEI and mobile cell in packet-meta.c

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

svn path=/trunk/; revision=40392
2012-01-05 19:43:37 +00:00
Chris Maynard
95ff0e0999 Fix Coverity CID's 1348-1349: UNUSED_VALUE and CID 1344: CONSTANT_EXPRESSION_RESULT.
svn path=/trunk/; revision=40391
2012-01-05 19:14:54 +00:00
anonsvn
5e76833ee6 Fix some typos. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6709
svn path=/trunk/; revision=40390
2012-01-05 18:54:02 +00:00
Martin Mathieson
21a7e5cc13 - 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).

svn path=/trunk/; revision=40388
2012-01-05 17:40:41 +00:00
Chris Maynard
20d92719ea 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
svn path=/trunk/; revision=40387
2012-01-05 17:29:27 +00:00
Alexis La Goutte
96ba099770 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]

svn path=/trunk/; revision=40386
2012-01-05 08:29:58 +00:00
Anders Broman
755c083fd8 From Mike Morrin:
Improvements to handling of gsm_um traces and dissection of ccch protocol

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

svn path=/trunk/; revision=40385
2012-01-05 07:24:21 +00:00
Anders Broman
7237eb3c49 From Mike Morrin:
Wrong tvb_get_bits function call in packet-csn1.c.

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

svn path=/trunk/; revision=40384
2012-01-05 07:17:38 +00:00
Jeff Morriss
0b52b73a46 dissect_esp(): 'i' is only (really) used if we HAVE_LIBGCRYPT.
svn path=/trunk/; revision=40383
2012-01-05 02:06:08 +00:00
Martin Mathieson
56643a4091 Show % UL padding as a progress bar.
svn path=/trunk/; revision=40382
2012-01-05 02:00:13 +00:00
Jeff Morriss
58d5653caa Wrap lines for those of us who use editors that don't (by default) line wrap.
svn path=/trunk/; revision=40381
2012-01-05 01:37:32 +00:00
Jörg Mayer
c2e213202b Fix several warnings turned error of type:
variable ‘mtu_flag’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=40380
2012-01-04 23:15:50 +00:00
Gerald Combs
307416d5a6 Fix compilation on Windows.
svn path=/trunk/; revision=40379
2012-01-04 22:59:17 +00:00
Gerald Combs
23a520237b Add initial support for Qt along with a "ui" subdirectory.
svn path=/trunk/; revision=40378
2012-01-04 22:13:01 +00:00
Gerald Combs
9dc580af2a More C++ updates.
svn path=/trunk/; revision=40377
2012-01-04 21:26:51 +00:00
Anders Broman
cd6d0b075f Use hfi->abbrev insted.
svn path=/trunk/; revision=40376
2012-01-04 19:06:34 +00:00
Alexis La Goutte
dbe733fcfc Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40375
2012-01-04 17:44:50 +00:00
Alexis La Goutte
b30eadd6ef Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40374
2012-01-04 17:42:10 +00:00
Alexis La Goutte
c21455ce0e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40373
2012-01-04 17:35:41 +00:00
Alexis La Goutte
360f156220 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40372
2012-01-04 17:34:36 +00:00
Alexis La Goutte
00dd4b455e 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 
http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html

svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
Alexis La Goutte
c3c5e75678 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


svn path=/trunk/; revision=40370
2012-01-04 13:01:53 +00:00
Anders Broman
e6fdbd30a6 TMR should be OCTET STRING
svn path=/trunk/; revision=40369
2012-01-04 07:26:00 +00:00