Alexis La Goutte [Fri, 12 Feb 2016 19:07:47 +0000 (20:07 +0100)]
TIPC: remove unneeded semicolon
Change-Id: I471ea1a322b921c45b62dbada73f486ec907c3a6
Reviewed-on: https://code.wireshark.org/review/13923
Reviewed-by: João Valverde <j@v6e.pt>
Alexis La Goutte [Wed, 10 Feb 2016 10:02:03 +0000 (11:02 +0100)]
umts_fp: fix ... defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I5866ea2d6a08a90799882b0c4626d0ed215069a8
error: ‘fake_lchid_macd_flow’ defined but not used [-Werror=unused-const-variable]
error: ‘hsdsch_macdflow_id_mac_content_map’ defined but not used [-Werror=unused-const-variable]
error: ‘hsdsch_macdflow_id_rlc_map’ defined but not used [-Werror=unused-const-variable]
Reviewed-on: https://code.wireshark.org/review/13871
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Fri, 12 Feb 2016 08:22:21 +0000 (09:22 +0100)]
tap-iostat: fix logical ‘or’ of equal expressions [-Werror=logical-op] found by gcc6
Change-Id: Ic10ba8df57ae69994f7ac0e6ddbdec92af797fc8
Reviewed-on: https://code.wireshark.org/review/13920
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Fri, 12 Feb 2016 08:25:44 +0000 (09:25 +0100)]
file: fix variable ‘progbar’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] found by gcc6
Change-Id: I24a2d48968826c079e696b8136d32929508a26dd
Reviewed-on: https://code.wireshark.org/review/13921
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Thu, 11 Feb 2016 19:19:45 +0000 (20:19 +0100)]
unistim: fix broadcast_phone_msgs’ defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: Icdf648e820c7a81546249c0e5060d8537278ffa4
Reviewed-on: https://code.wireshark.org/review/13904
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Thu, 11 Feb 2016 19:10:54 +0000 (20:10 +0100)]
Profinet (pn-mrp): fix statement is indented as if it were guarded by... [-Werror=misleading-indentation] found by gcc6
Change-Id: I1d8709857cf3e1e65bca0c0c94629c47fc1a3c06
Reviewed-on: https://code.wireshark.org/review/13903
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Francois Schneider [Thu, 11 Feb 2016 22:01:00 +0000 (23:01 +0100)]
packetbb: Fix the default value for end-index
RFC5444 §5.4.1 specifies that for address block TLVs:
end-index := <num-addr>-1
when both thassingleindex and thasmultiindex = 0.
It was incorrectly initialized to <num-addr> when <num-addr>!=0
(i.e for address block TLVs).
Change-Id: I4a78f263ffb122c0d6c0b54b4e8d1d6d525353e0
Reviewed-on: https://code.wireshark.org/review/13911
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Guy Harris [Fri, 12 Feb 2016 02:13:15 +0000 (18:13 -0800)]
Adjust time stamps even if the secs value of the time stamp is 0.
If the seconds value in a time stamp is 0, that says nothing whatsoever
about whether it's supported or not - it's the presence flag, which
we've already tested and found to be set, that indicates whether the
time stamp is supported.
Bug: 12116
Change-Id: I91354783af7b6356d9806c7559d35da44ea4567f
Reviewed-on: https://code.wireshark.org/review/13913
Reviewed-by: Guy Harris <guy@alum.mit.edu>
John A. Thacker [Thu, 11 Feb 2016 22:00:43 +0000 (17:00 -0500)]
Add in a default value for extended_port_offset to avoid warning (-> error)
with gcc-4.4.x
Change-Id: I823787dd7c4c92d74cd294e6e2d44b3574ae4d20
Reviewed-on: https://code.wireshark.org/review/13909
Reviewed-by: Michael Mann <mmann78@netscape.net>
Roman Leonhartsberger [Wed, 3 Feb 2016 08:59:08 +0000 (09:59 +0100)]
flexray: add a dissector for flexray protocol
Bug: 12033
Change-Id: I04ad97933639b1c6192608d12a1fb72f4c3725e2
Reviewed-on: https://code.wireshark.org/review/13576
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Juanjo Martin [Wed, 10 Feb 2016 11:07:41 +0000 (12:07 +0100)]
RTPS: Adding position in the batch to the rtps_dissector_data
Adding this information is useful for custom dissectors so they can
add it to the display. When a lot of samples are sent in RTPS in
the same batch, it is very helpful to have the index in the display.
Change-Id: I0f158eeb9d5e9b4fcf67ef6e72dcfa655b9cc427
Reviewed-on: https://code.wireshark.org/review/13875
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Thu, 11 Feb 2016 20:08:51 +0000 (21:08 +0100)]
Qt: Add Show as C Array and YAML in Show Packet Bytes
Change-Id: Ib9ccd72128f55741d4c94cf849f8e0f8866c2cb7
Reviewed-on: https://code.wireshark.org/review/13907
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Christoph Burger-Scheidlin [Tue, 9 Feb 2016 22:14:25 +0000 (23:14 +0100)]
CoAP: Add support for tracking requests and responses
Use CoAP's token to match responses to requests in CoAP.
Change-Id: I13141e3490d54aa27aea7c94d8199dcc0166d493
Reviewed-on: https://code.wireshark.org/review/13859
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
anilkumar911 [Fri, 5 Feb 2016 06:30:07 +0000 (12:00 +0530)]
nstrace: Allow opening of files that are not multiples of 16kB
in size.
Wireshark/Tshark hangs when netscaler trace file smaller than 16KB is opened.
It also hangs when a gzipped trace file is opened. With this fix,
Files with sizes that are not multiple of 16KB and gzipped files can be opened.
Bug: 12083
Change-Id: I26b2fc406edafcb2f1f6161d69064ba5662ddf29
Reviewed-on: https://code.wireshark.org/review/13721
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Mon, 8 Feb 2016 06:57:26 +0000 (07:57 +0100)]
USB Audio: Fix cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
Change-Id: Ie50ecb88ad1ea5f95b5772d71a6a4b02f06c4e2f
Reviewed-on: https://code.wireshark.org/review/13817
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
João Valverde [Sat, 23 Jan 2016 23:17:17 +0000 (23:17 +0000)]
WHO: Remove cast to fix warning [-Wbad-function-cast]
Change-Id: I711c51fb4a141c76b904169b5d3eb797198cdc73
Reviewed-on: https://code.wireshark.org/review/13892
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 5 Feb 2016 05:22:24 +0000 (05:22 +0000)]
autotools: Add more silent build rules
Change-Id: I4abff8880d5b3ff439e6abc9cf3c2d17897501ea
Reviewed-on: https://code.wireshark.org/review/13816
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Wed, 10 Feb 2016 19:07:29 +0000 (19:07 +0000)]
Change some constness qualifications
Change-Id: I0ece488f43aae27e7c055c2edacbf09ff11ce16d
Reviewed-on: https://code.wireshark.org/review/13889
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Thu, 11 Feb 2016 15:55:36 +0000 (15:55 +0000)]
AES: Fix dereference of null pointer
Change-Id: Iddd21c8786e679eef51024a172403200ee6652cb
Reviewed-on: https://code.wireshark.org/review/13902
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
AndersBroman [Tue, 9 Feb 2016 17:33:22 +0000 (18:33 +0100)]
[GTP] In GTP' version 0 the 20 byte header is 6 bytes followed by 14 0
bytes.
Bug: 12063
Change-Id: Ie1e98626b605f08835812c944acf58d57f383fae
Reviewed-on: https://code.wireshark.org/review/13854
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 10 Feb 2016 11:40:28 +0000 (12:40 +0100)]
atn cm/cpdlc : fix variable ‘atn_cv’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] found by gcc6
Change-Id: If7541384aeb305b93963dd44d535015ea245f5ac
Reviewed-on: https://code.wireshark.org/review/13879
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Wed, 10 Feb 2016 12:52:58 +0000 (12:52 +0000)]
Use CMake conventional nomenclature for CXX_FLAGS
Change-Id: I2b67eed2bb04412b9d556e616fe3233176fac5bc
Reviewed-on: https://code.wireshark.org/review/13883
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Thu, 11 Feb 2016 13:26:57 +0000 (14:26 +0100)]
[NBAP] Array hsdsch_macdflow_id_rlc_map should be 8 elements.
Bug: 12112
Change-Id: I3d3fd822b291d459613030dda122963a72c13ee6
Reviewed-on: https://code.wireshark.org/review/13901
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 10 Feb 2016 11:23:55 +0000 (12:23 +0100)]
atn ulcs/cpdlc: fix ia5alpha’ defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I4483225d857636d3b76b6b03cab86868c366521d
Reviewed-on: https://code.wireshark.org/review/13874
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 10 Feb 2016 09:32:51 +0000 (10:32 +0100)]
SPICE: fix ... defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I9fa881bba2edaf6a6a66630af11b9e8c04a46e5e
Reviewed-on: https://code.wireshark.org/review/13877
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 10 Feb 2016 08:45:56 +0000 (09:45 +0100)]
NCP2222: fix ‘nds_scope_vals’ defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I8482ce09690a56b1c380abd17b158267c0b63fed
Reviewed-on: https://code.wireshark.org/review/13876
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Mon, 8 Feb 2016 04:38:27 +0000 (04:38 +0000)]
Fix test-programs to build with -Werror
When building without --enable-extra-compiler-warnings then -Werror
is enabled by default and the test-programs make target fails
because of a -Wclobbered warning.
Change-Id: I6f01d76f2bf9351e2ed306f4cbdcf8b6ed200fea
Reviewed-on: https://code.wireshark.org/review/13869
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Thu, 11 Feb 2016 06:19:23 +0000 (07:19 +0100)]
Q932: fix q932_.._vals defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I0b059caa0caa3fbd0ee54aa18327a948a67c4774
Reviewed-on: https://code.wireshark.org/review/13899
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 10 Feb 2016 10:07:48 +0000 (11:07 +0100)]
NBAP: fix ‘lchid_name_resolve’ defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: Iedf13ff9844a43625fa374d8df8da9b0e0fae55a
Reviewed-on: https://code.wireshark.org/review/13878
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 10 Feb 2016 11:47:20 +0000 (12:47 +0100)]
NBAP: fix ‘lchId_rlc_map’ defined but not used [-Werror=unused-const-variable] found by gcc6
Change-Id: I39ca2510d01a7ba3318dfcf9e380eab637994b08
Reviewed-on: https://code.wireshark.org/review/13880
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Wed, 10 Feb 2016 14:56:04 +0000 (15:56 +0100)]
randpktdump: change error messages.
Change-Id: Icf020d92cb2bef22afac2c74d3a719e54d36f95d
Reviewed-on: https://code.wireshark.org/review/13887
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Roland Knall [Thu, 11 Feb 2016 06:48:54 +0000 (07:48 +0100)]
extcap: Fix call to child watch
Child watch seems to keep executables in limbo, if extcap_cleanup
removed the watch before it could be fired at least once
Bug: 12080
Change-Id: I74afafe8545d464ec08b1043a6377a6450e4c772
Reviewed-on: https://code.wireshark.org/review/13900
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Stig Bjørlykke [Wed, 10 Feb 2016 19:39:55 +0000 (20:39 +0100)]
Qt: Add hint label in Show Packet Bytes
Show frame number, field name (abbrev) and number of bytes.
Added some translations.
Change-Id: I9777d43d63a52fcdb221864bad097a9604522d3a
Reviewed-on: https://code.wireshark.org/review/13888
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Mikael Kanstrup [Wed, 3 Feb 2016 11:14:15 +0000 (12:14 +0100)]
extcap: Convert settings to preference friendly key names
Preferences are only allowed to contain lowercase ASCII letters,
numbers, underscores or dot characters. Create a utility function
to convert an extcap setting to its equivalent preference key and
use it wherever conversion from setting to preference key is needed.
Bug: 12064
Change-Id: I39bbac7de5f0f905bd41c54257fa997a3b32442d
Reviewed-on: https://code.wireshark.org/review/13687
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
João Valverde [Sat, 23 Jan 2016 19:31:12 +0000 (19:31 +0000)]
GSM RR A: Add variable to avoid some warnings [-Wbad-function-cast]
Change-Id: Ia811293c2524d03104a04a16753381f75afdd6b2
Reviewed-on: https://code.wireshark.org/review/13891
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Thu, 11 Feb 2016 01:48:46 +0000 (17:48 -0800)]
Make file indices consistently unsigned in the merge code.
Change-Id: Ie531e5c24c32ca86abbe0c2b5d3526014e5fb831
Reviewed-on: https://code.wireshark.org/review/13897
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael McConville [Thu, 11 Feb 2016 00:29:18 +0000 (19:29 -0500)]
Avoid undefined behavior in overflow check
Signed overflow is undefined, so testing for overflow with
"if (i + 1 < i)" is itself undefined. Because this instance is an
increment, we can just test against G_MAXINT.
Change-Id: Ib8b7c23ec362d5637125fcf6457ea9423fedf0e1
Reviewed-on: https://code.wireshark.org/review/13896
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Tue, 9 Feb 2016 18:37:31 +0000 (19:37 +0100)]
mq: enable SSL dissection
Register dissector as "mq" (for Export SSL PDU) and consolidate
different heuristics dissector functions into one (TCP vs. non-TCP).
Make it possible to select mq for SSL and add heuristics.
Bug: 4652
Change-Id: Ib0812dc75dda3fe47f46a917f14399f4a92f5b76
Reviewed-on: https://code.wireshark.org/review/13856
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Wed, 10 Feb 2016 09:41:57 +0000 (10:41 +0100)]
TIPC: fix statement is indented as if it were guarded by... [-Werror=misleading-indentation] found by gcc6
b_inst_strlen = tvb_strsize(tipc_tvb, offset);
^~~~~~~~~~~~~
packet-tipc.c:1090:4: note: ...this ‘if’ clause, but it is not
if ((message_type == TIPCv2_RESET_MSG)
^~
Change-Id: I9a9f1e5e70ce183af30dd93242993bbddffdfd95
Reviewed-on: https://code.wireshark.org/review/13870
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Wed, 10 Feb 2016 14:01:02 +0000 (15:01 +0100)]
Qt: fix jitter buffer management
Small bugs were introduced when copy/pasting the code from GTK UI:
- arrive_offset is stored in seconds and not milliseconds
- some tests regarding the current playback mode were wrong
Change-Id: I21fb82ba8ff6c8defa7df90c815c040e9e074aaa
Reviewed-on: https://code.wireshark.org/review/13885
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Wed, 10 Feb 2016 13:14:30 +0000 (14:14 +0100)]
LTE RRC: fix defragmentation of ETWS / CMAS messages
Change-Id: I59d7e3dc3398973290746fc15a2dc9f24cfc03e3
Reviewed-on: https://code.wireshark.org/review/13884
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Stig Bjørlykke [Wed, 10 Feb 2016 19:36:23 +0000 (20:36 +0100)]
Qt: Fix plural translations
Change-Id: I17df0c0a3462b7ccdda2105204c0ad72e80fc175
Reviewed-on: https://code.wireshark.org/review/13882
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
João Valverde [Wed, 10 Feb 2016 19:25:06 +0000 (19:25 +0000)]
ieee802.11: Cleanup indentation
Change-Id: I5a2835340bb6733dd4af0284d0b3ecf32b40235a
Reviewed-on: https://code.wireshark.org/review/13890
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Stig Bjørlykke [Wed, 10 Feb 2016 08:08:33 +0000 (09:08 +0100)]
Qt: Align hex dump text in follow stream
Put some extra spaces between hex and text output in follow stream
hex dump to align with the layout used in ByteViewText.
Change-Id: Ie2743ccf46a8941595580878955e96b9ada56de9
Reviewed-on: https://code.wireshark.org/review/13867
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Wed, 10 Feb 2016 10:04:37 +0000 (11:04 +0100)]
Bring back packet_num in "Follow Stream"
The packet_num was left uninitialized after refactoring "Follow Stream".
Ping-Bug: 11988
Change-Id: Iaea2560c8417503de59ddb0337cd023bcbcbbfee
Reviewed-on: https://code.wireshark.org/review/13872
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Wed, 10 Feb 2016 08:07:13 +0000 (09:07 +0100)]
Qt: Add Show as Hex Dump in Show Packet Bytes
Change-Id: I81a42ef263d87880cfe0d1230dbbcb692e473d6f
Reviewed-on: https://code.wireshark.org/review/13868
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Francesco Fondelli [Tue, 9 Feb 2016 10:15:56 +0000 (11:15 +0100)]
BGP-LS: fix Adjacency-SID parsing
if length is set to 7 then the 20 *rightmost* bits of
the 'SID/Label/Index' field represent a MPLS label.
Change-Id: If196af244549b75a80de11c1d8e11507e9a6ce58
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/13848
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Dario Lombardo [Mon, 8 Feb 2016 15:15:01 +0000 (16:15 +0100)]
debian-setup: bug fix
Change-Id: I90cb9eafdef2d8f20d9c3ea0327b5cce06f2426b
Reviewed-on: https://code.wireshark.org/review/13822
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Tue, 9 Feb 2016 16:08:39 +0000 (17:08 +0100)]
prefs: set correct context for a preference
When a pref is renamed (e.g. from eth.qinq_ethertype to
vlan.qinq_ethertype), the latter module must be marked as changed.
Otherwise the pref has no effect as the vlan handoff routine is not
called.
For consistency, set the module for preferences migrated from smpp (the
gsm-sms-ud dissector does not have a handoff routine for these prefs,
so it has no functional effect for that dissector).
Undoes I89f4a2d125e18d113edec4bf35599f128249e913, fixes
I2a49dce93fdc7fab4ab3dc52dad90288c2d17434.
Change-Id: I255b49db23c7958f9fb2214c54f3f35386fa5e9a
Reviewed-on: https://code.wireshark.org/review/13851
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Tue, 9 Feb 2016 21:55:37 +0000 (22:55 +0100)]
Squelch array compared to NULL coverity events.
Using code annotation to squelch detection by Coverity of use of macro
parameter comparison to NULL, which we use to allow for leaving out
strings if we don't have them.
In this particular case it's happening in macro expansion.
Change-Id: I5782c5891cab99860a9bae9519cf259359a09712
Reviewed-on: https://code.wireshark.org/review/13858
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Wed, 10 Feb 2016 04:44:41 +0000 (20:44 -0800)]
Mark RPC fragments as such in the Protocol and Info columns.
Otherwise, they just look like TCP segments.
Change-Id: I2f7601316012811d64c903bf3b2ff4ac4c8f6ce2
Reviewed-on: https://code.wireshark.org/review/13864
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 10 Feb 2016 01:59:34 +0000 (17:59 -0800)]
Suggest pushing a decision lower in the code.
That leaves less room for getting it wrong.
Change-Id: Iea003fc102ccd14db2924b70fc685033ca34f291
Reviewed-on: https://code.wireshark.org/review/13863
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 10 Feb 2016 01:41:04 +0000 (17:41 -0800)]
Don't try reassembly on fragments sliced short during capture.
While we're at it, get rid of an unnecessary argument passed to the
defragmentation routines - it's always equal to the rpc_defragment
preference variable, so just use that.
Bug: 11913
Change-Id: Ia3b14ca11ae4fb423bcba4debb7c62245d8aed43
Reviewed-on: https://code.wireshark.org/review/13860
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 9 Feb 2016 21:17:18 +0000 (13:17 -0800)]
Properly check the return value of color_filters_set_tmp().
It returns FALSE, not TRUE, on failure.
Bug: 12101
Change-Id: I2fb4f407d2040e7b84f17af197de81555d64c647
Reviewed-on: https://code.wireshark.org/review/13857
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Jaap Keuter [Mon, 8 Feb 2016 22:27:12 +0000 (23:27 +0100)]
Fix classicstun att_family decoding for IPv6 (CID 280363)
Remove left over code from adding att_family IPv6.
Change-Id: I5414eb68f7d25139cb56ea8c5ce6b335ec774df4
Reviewed-on: https://code.wireshark.org/review/13838
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Mon, 8 Feb 2016 23:02:33 +0000 (00:02 +0100)]
Lua: Check out-of-bounds before tvb_strsize()
Add a check for out-of-bounds before calling tvb_strsize() because
this will THROW an exception if not finding a terminating NUL.
Unhandled exceptions will mess up Lua luaL_error() handling and
will end up in a crash.
Change-Id: Ieafef59a3858656e0d8c79904828b631657b4cbc
Reviewed-on: https://code.wireshark.org/review/13842
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 4 Nov 2015 07:57:10 +0000 (08:57 +0100)]
Update .mailmap
Change-Id: I38075e12d4da69d5102e5da671e2a166d3b66899
Reviewed-on: https://code.wireshark.org/review/12197
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Fri, 27 Nov 2015 17:18:24 +0000 (17:18 +0000)]
ceph: Fix more enum overflow warnings [-Wpedantic]
Change enum constants to a macro definition instead (even though not
all of them generate overflow warnings).
Change-Id: I276306055d5676b66020976d25665dc1dd7530ec
Reviewed-on: https://code.wireshark.org/review/13815
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Sat, 23 Jan 2016 01:35:05 +0000 (01:35 +0000)]
ceph: Declare convenience types as gint [-Wbad-function-cast]
Avoid casting integer to enum.
Change-Id: I704e64b3d27fb0f77059706629a47d4adb74e5ad
Reviewed-on: https://code.wireshark.org/review/13814
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Mon, 8 Feb 2016 22:48:39 +0000 (23:48 +0100)]
mpeg-audio: do not put bitrate and sampling rate in source and destination columns
Instead append them to info column.
Bug: 12099
Change-Id: I5451530af2f6cbef519ed541562bffae73e2b1f1
Reviewed-on: https://code.wireshark.org/review/13841
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Thu, 4 Feb 2016 06:47:21 +0000 (07:47 +0100)]
ieee80211: Add Overlapping BSS Scan (OBSS) IE Parameters (74)
Change-Id: I0a4ba886d8968e40fb1050d51df22670da350ced
Reviewed-on: https://code.wireshark.org/review/13723
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 8 Feb 2016 09:14:56 +0000 (10:14 +0100)]
ECMP: fix Unused value (UNUSED_VALUE) found by Coverity (CID
1348061)
Change-Id: Ibd5fa458b25e2a8940d036c6a98b61c5d5a4a331
Reviewed-on: https://code.wireshark.org/review/13818
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Tue, 9 Feb 2016 02:22:42 +0000 (18:22 -0800)]
And we need to check Nsts as well.
The check against 0 isn't really necessary, as stbc_streams >= 0 and
ieee80211_ht_streams[info_n->mcs_index] >= 1, but, what the heck.
Make stbc_streams unsigned, as the value assigned to it is unsigned.
Bug: 12085
Change-Id: I98e0edb718f62ee07bbe56b9d15859c68b7d2e43
Reviewed-on: https://code.wireshark.org/review/13844
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Mon, 8 Feb 2016 20:13:52 +0000 (12:13 -0800)]
QCP: Fix retina label calculations.
The retina fixes in gb10bad1 and gb3f3d66 were incomplete and caused
rendering problems in our axis labels. Handle the device pixel ratio in
a couple of more places so that our axis rects are correctly sized.
Add a switch (WS_ENABLE_DP_RATIO) to make it easy to turn scaling on and
off.
Change-Id: I633d94d633e0743be2a607c9a4cbb3409e9eed62
Ping-Bug: 11710
Reviewed-on: https://code.wireshark.org/review/13834
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Mon, 8 Feb 2016 21:59:47 +0000 (21:59 +0000)]
Revert "Lua: Remove WSLUA_ERROR on dissecting error"
This reverts commit
0f2a0e83fbb701a0836da36c16c162817d4a9b2f.
Change-Id: Ifc40f99385a5948a033bb611b4ce8a0fa615b333
Reviewed-on: https://code.wireshark.org/review/13837
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Pascal Quantin [Mon, 8 Feb 2016 18:55:38 +0000 (19:55 +0100)]
GSM SMS: fix dissection of alphanumeric address
Change-Id: I5d6f3c78b99979376243f722161b3ae25adad230
Reviewed-on: https://code.wireshark.org/review/13830
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Sat, 6 Feb 2016 00:50:58 +0000 (16:50 -0800)]
Qt: Restore sequence diagram labels, other fixes.
SequenceDiagram implements time, address, and comment labels using
QCPAxis::setTickVector and QCPAxis::setTickVectorLabels. It also calls
QCPAxis::setTicks(false) so that we don't draw tick marks. It appears
that doing so also disables the labels themselves in our current version
of QCP. Set the tick pen to Qt::NoPen instead.
Only draw node lines where we have nodes.
Add notes about a retina issue and the need for zooming.
Bug: 11710
Change-Id: I88c30a1ddcd29832f86b1ca8c018c7fa6b6d64a7
Reviewed-on: https://code.wireshark.org/review/13781
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Mon, 8 Feb 2016 16:56:44 +0000 (08:56 -0800)]
Regenerate RTSE dissector.
Change-Id: I1662b2b28ff993ec5e4fa8faabe60f76014f7b46
Reviewed-on: https://code.wireshark.org/review/13827
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Stig Bjørlykke [Mon, 8 Feb 2016 10:06:10 +0000 (11:06 +0100)]
Lua: Remove WSLUA_ERROR on dissecting error
On error in Dissector_call and DissectorTable_try we should not
terminate with WSLUA_ERROR because the error is already reported
in the tree with show_exception().
Change-Id: I60739f12cb8b16fe2270f47701286fd0dbf04c6f
Reviewed-on: https://code.wireshark.org/review/13819
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Sun, 7 Feb 2016 21:15:12 +0000 (22:15 +0100)]
Qt: Add Show Packet Bytes Dialog
Show selected packet bytes as ASCII, HTML, Image, ISO 8859-1, Raw or UTF-8.
Images supported are what's supported by QImage, and HTML supported
is what's supported by QTextEdit.
Change-Id: I96fc5c5d222c5389078576463cf78d82cf55528d
Reviewed-on: https://code.wireshark.org/review/13807
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Anders Broman [Mon, 8 Feb 2016 16:32:41 +0000 (16:32 +0000)]
Revert "Create an extended converstaion hastable taking more address information into consideration. This makes it possible to differentiate between packets on different vlans and can be expanded to handle tunnels."
This reverts commit
f80e9df7939be9d88062718d6c15fa2983e5e605.
Change-Id: I7877b250d479c30209cfe74351069d54359757b5
Reviewed-on: https://code.wireshark.org/review/13825
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Mon, 8 Feb 2016 16:16:27 +0000 (16:16 +0000)]
Revert "RTSE and PRES relies on the TCP conversation to do reassembly, switch to the new interface."
This reverts commit
c296001158b979497242dd726430b0b7cb26f984.
Change-Id: Ie67001c181b1e7437e5d6ecd8f64b61da15df2c3
Reviewed-on: https://code.wireshark.org/review/13823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Sun, 7 Feb 2016 14:01:28 +0000 (15:01 +0100)]
tools: improve valgrind script.
Change-Id: Ifae62e6334b48002516dfff6d1c2f094445f423c
Reviewed-on: https://code.wireshark.org/review/13820
Reviewed-by: Evan Huus <eapache@gmail.com>
Dario Lombardo [Mon, 25 Jan 2016 08:23:03 +0000 (09:23 +0100)]
sshdump: fix default value for capture filter.
Change-Id: I21c4d6fa6726165882ed104262b1e2b22557d8cd
Reviewed-on: https://code.wireshark.org/review/13522
Reviewed-by: Roland Knall <rknall@gmail.com>
Jaap Keuter [Sun, 7 Feb 2016 23:08:23 +0000 (00:08 +0100)]
Add missing breaks (CID
1348047 ..
1348051)
Add missing breaks in ZigBee dissectors.
Change-Id: I26e403e589aa6c0ed7ce5f4574e29a9814ba96c0
Reviewed-on: https://code.wireshark.org/review/13809
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Fri, 5 Feb 2016 12:26:12 +0000 (13:26 +0100)]
prefs.c: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I89f4a2d125e18d113edec4bf35599f128249e913
Reviewed-on: https://code.wireshark.org/review/13726
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michal Labedzki [Wed, 27 Jan 2016 12:01:49 +0000 (13:01 +0100)]
Rename Bluetooth OBEX dissector to OBEX
For historiacal reasons OBEX protocol was implemented as
"Bluetooth OBEX", that means it is OBEX + Bluetooth related stuff.
However Bluetooth related stuff does not caused any issue right now,
so allow to use this dissector in non-Bluetooth cases.
Bug: 11724
Change-Id: Ic645308bc854602d009f254ebbfd1b703a4c6a25
Reviewed-on: https://code.wireshark.org/review/13740
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Sun, 7 Feb 2016 12:04:18 +0000 (13:04 +0100)]
prefs: fix a leak.
This change fix a leak in the prefs subsystem when setting a preference as obsolete.
Found by valgrind.
==5779== 1 bytes in 1 blocks are definitely lost in loss record 7 of 3,421
==5779== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==5779== by 0xA7FE610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==5779== by 0xA815B0E: g_strdup (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0)
==5779== by 0x65E01DF: register_string_like_preference (prefs.c:1052)
==5779== by 0x65E054E: prefs_register_string_preference (prefs.c:1096)
==5779== by 0x688D010: proto_register_dtls (packet-dtls.c:1828)
==5779== by 0x71C4C34: register_all_protocols (register.c:350)
==5779== by 0x65EEFA7: proto_init (proto.c:521)
==5779== by 0x65CD621: epan_init (epan.c:126)
==5779== by 0x115330: main (tshark.c:1220)
Bug: 12096
Change-Id: I8f36114e2098b0255b4e774c6e0f35b64da6d366
Reviewed-on: https://code.wireshark.org/review/13798
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Kaiser [Sat, 6 Feb 2016 12:57:56 +0000 (13:57 +0100)]
add functions to calculate the CRC of an ISO14443-A message
Change-Id: I1ccd9885746a6044f298d7d531a9bc009a70288e
Reviewed-on: https://code.wireshark.org/review/13802
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Sun, 7 Feb 2016 23:50:59 +0000 (23:50 +0000)]
TCAP: Fix warning [-Wclobbered]
Add TCAP to clean ASN.1 dissector list.
Change-Id: I256dabe0961b681d22c230378f19968d9f7eda26
Reviewed-on: https://code.wireshark.org/review/13812
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Wed, 20 Jan 2016 19:39:54 +0000 (19:39 +0000)]
Cleanup indentation
Change-Id: I59e9a4806d047e8cc26e9927e76243ce58a57e6d
Reviewed-on: https://code.wireshark.org/review/13811
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Mon, 8 Feb 2016 00:43:56 +0000 (00:43 +0000)]
Revert "Add free_address_wmem() and other extensions to address API"
This reverts commit
13ec77a9fc3af3b0b502820d0b55796c89997896.
This commit introduces a segmentation fault for Lua code (uncovered by the test suite).
Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e
Reviewed-on: https://code.wireshark.org/review/13813
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 5 Feb 2016 13:44:57 +0000 (13:44 +0000)]
TCAP: Fix warning [-Wunused-function]
Change-Id: Ie30f39cf1d79f571824cb02583130e9ec828ede4
Reviewed-on: https://code.wireshark.org/review/13788
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 5 Feb 2016 12:45:31 +0000 (12:45 +0000)]
SNMP: Fix warning [-Wunused-function]
Add SNMP to clean dissectors also.
Change-Id: Ifc4d5a03c13f864bd9219294028323761cd19368
Reviewed-on: https://code.wireshark.org/review/13786
Petri-Dish: João Valverde <j@v6e.pt>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 5 Feb 2016 18:10:36 +0000 (18:10 +0000)]
autotools: Move SBC dependency to libwscodecs
Change-Id: I931961033798613b78f846c9176dffdb8385bf43
Reviewed-on: https://code.wireshark.org/review/13782
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Thu, 26 Nov 2015 04:44:52 +0000 (04:44 +0000)]
Add free_address_wmem() and other extensions to address API
Try to improve 'address' API (to be easier/safer) and also avoid
some constness warnings by not overloading the 'data' pointer to
store malloc'ed buffers (use private pointer for that instead).
Change-Id: I7456516b12c67620ceadac447907c12f5905bd49
Reviewed-on: https://code.wireshark.org/review/13463
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Sun, 7 Feb 2016 21:35:31 +0000 (21:35 +0000)]
GTK: Check if lrint() is usable, fix warnings [-Wbad-function-cast]
Change-Id: I4714ba6cfbd18847d99650f5c5cdc60dd2e7af26
Reviewed-on: https://code.wireshark.org/review/13808
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Tue, 26 Jan 2016 02:19:21 +0000 (02:19 +0000)]
proto_data: Remove superfluous casts
The casts should be to gpointer but are unnecessary.
Change-Id: I27229750ec53138820cce30b6fcc083d3ae5bea1
Reviewed-on: https://code.wireshark.org/review/13810
Reviewed-by: João Valverde <j@v6e.pt>
Guy Harris [Sun, 7 Feb 2016 20:51:28 +0000 (12:51 -0800)]
Check whether Ness is valid as well.
It's also used as an array index, and it also is no guaranteed to be in
the proper range in all capture files, so bounds-check it.
Make the variable's type match that of the field in the radio metadata.
(It's never negative, so it's unsigned.)
This appears to be the last of the unchecked array references from bug
12085.
Bug: 12085
Change-Id: I3e5b821a9b70dfd520d01036f6f7d02008aca200
Reviewed-on: https://code.wireshark.org/review/13806
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 7 Feb 2016 20:46:45 +0000 (12:46 -0800)]
MAX_MCS_INDEX is a valid array index.
The arrays have MAX_MCS_INDEX+1 entries; valid indices to from 0 to
MAX_MCX_INDEX.
Change-Id: Ibbd30d36cc16143482b34212b1c6ce8df9e555ab
Ping-Bug: 12085
Reviewed-on: https://code.wireshark.org/review/13805
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 7 Feb 2016 19:32:22 +0000 (11:32 -0800)]
MAX_MCS_INDEX is a valid array index.
The arrays have MAX_MCS_INDEX+1 entries; valid indices to from 0 to
MAX_MCX_INDEX.
Change-Id: Ib8b939e687a00505cab5e5f9b3b6dce34e9d0b47
Reviewed-on: https://code.wireshark.org/review/13803
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Sun, 7 Feb 2016 16:06:49 +0000 (08:06 -0800)]
[Automatic update for 2016-02-07]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: If7d44f7c40a98454261f9f71ce7e084a16b5add7
Reviewed-on: https://code.wireshark.org/review/13799
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Sat, 6 Feb 2016 09:53:22 +0000 (10:53 +0100)]
ndps: don't THROW() an exception from a dissector
if we just return the offset, there's no need to check for overflows
the caller continues dissection from the returned offset
if the offset is invalid, the core routines will throw an exception
if we call proto_item_set_end() with the calculated offset,
we can do the range check using tvb_ensure_bytes_exist()
Change-Id: I0e2a7b2a866596eda0d7ed4a948fbea8ed084845
Reviewed-on: https://code.wireshark.org/review/13792
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Alexis La Goutte [Sat, 6 Feb 2016 13:14:38 +0000 (14:14 +0100)]
TCAP: fix indent and add modelines (use 2 spaces)
Change-Id: I3ac35f3dd6514469bdcabd0acd67970077d5c364
Reviewed-on: https://code.wireshark.org/review/13793
Reviewed-by: João Valverde <j@v6e.pt>
Evan Huus [Sat, 6 Feb 2016 14:33:28 +0000 (09:33 -0500)]
llrp: limit recursion depth
LLRP defines fairly complex parameter nesting which we handle via recursion,
however this means a large crafted packet could cause very deep stacks and
potentially stack overflows. Limit our recursive depth to an arbitrary, which
should be more than enough for any legitimate packet (I hope).
Bug: 12048
Change-Id: I9ac31bddfa4ffd1a79809387d10d2261749b95e7
Reviewed-on: https://code.wireshark.org/review/13794
Reviewed-by: Evan Huus <eapache@gmail.com>
Stig Bjørlykke [Sat, 6 Feb 2016 11:28:16 +0000 (12:28 +0100)]
asn1: Cleanup space usage
Fix space issues in some ASN.1 dissectors.
Change-Id: I4ceccfbe9a13c93fc91821d1bfe4b7d6bb39c435
Reviewed-on: https://code.wireshark.org/review/13791
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
João Valverde [Fri, 5 Feb 2016 13:18:57 +0000 (13:18 +0000)]
TCAP: Fix dissect_tcap_ERROR() unused warning [-Wunused-function]
Change-Id: I0d9511ed9cb93446766d510b97fdefe56a86a826
Reviewed-on: https://code.wireshark.org/review/13787
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michal Labedzki [Sat, 2 Jan 2016 10:28:49 +0000 (11:28 +0100)]
Bluetooth: GATT: Add ability to filtering by Service and Characteristic level UUIDs
There are three level of characteristics: Services, Characteristics and
Configuration Characteristics. To properly analyzing packets
there is a need to display all three why dissecting UUID.
Change-Id: I3121338942c990b52ac2b3a45ced0529f80d4114
Reviewed-on: https://code.wireshark.org/review/13742
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Wed, 16 Dec 2015 17:19:55 +0000 (18:19 +0100)]
Bluetooth: GATT: Add support for OTS/OTP
OTS/OTP is the newset "profile" announced by Bluetooth SIG.
It name describe what it doing: Object Transfer Service/Profile,
so it is something like OPP.
While we are at this move some HID attributes to get right
order in switch-case.
Change-Id: I460963a422c7292b2cabf7e88f32dbd6e8d7051f
Reviewed-on: https://code.wireshark.org/review/13735
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Fri, 15 Jan 2016 14:37:35 +0000 (15:37 +0100)]
Bluetooth: BTLE: Fix Random Rx/Tx BdAddr bit presentation
Random Rx/Tx bit are properly decoded but incorrect present
in parent tree.
Change-Id: I4c31d8e77b1adb5f821da6074bde5dff400d6c04
Reviewed-on: https://code.wireshark.org/review/13738
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
git.samba.org / metze / wireshark / wip.git / log