aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-13Fix an indentation to get rid ofJoerg Mayer1-2/+3
text2pcap.c:1254:17: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] Change-Id: Ifa031f5faad3445bcd3ab893d83c5dc6386fe3a2 Reviewed-on: https://code.wireshark.org/review/13927 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-02-13androiddump: fix logical ‘or’ of equal expressions [-Werror=logical-op] ↵Alexis La Goutte1-9/+9
found by gcc6 EAGAIN and EWOULDBLOCK is the same value (now) http://www-numi.fnal.gov/offline_software/srt_public_context/WebDocs/Errors/unix_system_errors.html Change-Id: Ia8101d05194910f306e8439507ae5bde3ccd00ce Reviewed-on: https://code.wireshark.org/review/13905 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-13Dissection of SSAPs is a bit weird. 0x1 would be displayed as ">Unknown (0x01)"Joerg Mayer1-1/+2
on my particular trace. This duplicates the value with the C/R-bit set. Needs a proper fix eventually. Small indentation fix. Change-Id: I6bf7c560b5161994b8d90d7ae70724c03c6df73b Reviewed-on: https://code.wireshark.org/review/13926 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-02-13iso14443: verify the CRC of all messagesMartin Kaiser2-50/+89
define a function to dissect the CRC depending on the card type add a circuit for an activated card to keep track of the card type define a new circuit type CT_ISO1443 for this purpose, the circuit ID is always 0 as we support only a single active card Change-Id: I7250f834301612ba50743258ca7bdbe0199de3ea Reviewed-on: https://code.wireshark.org/review/13908 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-13packetbb: Add some descriptions for message and TLV typesFrancois Schneider1-12/+86
Change-Id: I2f1455cf50d9a90a516194ed09d7f6d6932e3afe Reviewed-on: https://code.wireshark.org/review/13912 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>
2016-02-12TIPC: remove unneeded semicolonAlexis La Goutte1-2/+2
Change-Id: I471ea1a322b921c45b62dbada73f486ec907c3a6 Reviewed-on: https://code.wireshark.org/review/13923 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-12umts_fp: fix ... defined but not used [-Werror=unused-const-variable] found ↵Alexis La Goutte3-56/+28
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>
2016-02-12tap-iostat: fix logical ‘or’ of equal expressions [-Werror=logical-op] ↵Alexis La Goutte1-1/+1
found by gcc6 Change-Id: Ic10ba8df57ae69994f7ac0e6ddbdec92af797fc8 Reviewed-on: https://code.wireshark.org/review/13920 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-12file: fix variable ‘progbar’ might be clobbered by ‘longjmp’ or ↵Alexis La Goutte1-1/+1
‘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>
2016-02-12unistim: fix broadcast_phone_msgs’ defined but not used ↵Alexis La Goutte1-0/+2
[-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>
2016-02-12Profinet (pn-mrp): fix statement is indented as if it were guarded by... ↵Alexis La Goutte1-16/+16
[-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>
2016-02-12packetbb: Fix the default value for end-indexFrancois Schneider1-1/+1
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>
2016-02-12Adjust time stamps even if the secs value of the time stamp is 0.Guy Harris1-6/+2
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>
2016-02-11Add in a default value for extended_port_offset to avoid warning (-> error)John A. Thacker1-1/+1
with gcc-4.4.x Change-Id: I823787dd7c4c92d74cd294e6e2d44b3574ae4d20 Reviewed-on: https://code.wireshark.org/review/13909 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-11flexray: add a dissector for flexray protocolRoman Leonhartsberger4-0/+492
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>
2016-02-11RTPS: Adding position in the batch to the rtps_dissector_dataJuanjo Martin2-1/+7
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>
2016-02-11Qt: Add Show as C Array and YAML in Show Packet BytesStig Bjørlykke2-8/+75
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>
2016-02-11CoAP: Add support for tracking requests and responsesChristoph Burger-Scheidlin1-0/+127
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>
2016-02-11nstrace: Allow opening of files that are not multiples of 16kBanilkumar9111-5/+14
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>
2016-02-11USB Audio: Fix cannot optimize loop, the loop counter may overflow ↵Alexis La Goutte1-6/+8
[-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>
2016-02-11WHO: Remove cast to fix warning [-Wbad-function-cast]João Valverde1-3/+3
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>
2016-02-11autotools: Add more silent build rulesJoão Valverde7-8/+17
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>
2016-02-11Change some constness qualificationsJoão Valverde3-18/+18
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>
2016-02-11AES: Fix dereference of null pointerJoão Valverde1-1/+4
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>
2016-02-11[GTP] In GTP' version 0 the 20 byte header is 6 bytes followed by 14 0AndersBroman1-29/+27
bytes. Bug: 12063 Change-Id: Ie1e98626b605f08835812c944acf58d57f383fae Reviewed-on: https://code.wireshark.org/review/13854 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-11atn cm/cpdlc : fix variable ‘atn_cv’ might be clobbered by ‘longjmp’ ↵Alexis La Goutte4-4/+4
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>
2016-02-11Use CMake conventional nomenclature for CXX_FLAGSJoão Valverde1-8/+8
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>
2016-02-11[NBAP] Array hsdsch_macdflow_id_rlc_map should be 8 elements.AndersBroman2-12/+14
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>
2016-02-11atn ulcs/cpdlc: fix ia5alpha’ defined but not used ↵Alexis La Goutte4-31/+31
[-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>
2016-02-11SPICE: fix ... defined but not used [-Werror=unused-const-variable] found by ↵Alexis La Goutte1-0/+22
gcc6 Change-Id: I9fa881bba2edaf6a6a66630af11b9e8c04a46e5e Reviewed-on: https://code.wireshark.org/review/13877 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-11NCP2222: fix ‘nds_scope_vals’ defined but not used ↵Alexis La Goutte1-0/+2
[-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>
2016-02-11Fix test-programs to build with -WerrorJoão Valverde1-1/+1
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>
2016-02-11Q932: fix q932_.._vals defined but not used [-Werror=unused-const-variable] ↵Alexis La Goutte3-58/+65
found by gcc6 Change-Id: I0b059caa0caa3fbd0ee54aa18327a948a67c4774 Reviewed-on: https://code.wireshark.org/review/13899 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-11NBAP: fix ‘lchid_name_resolve’ defined but not used ↵Alexis La Goutte2-0/+4
[-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>
2016-02-11NBAP: fix ‘lchId_rlc_map’ defined but not used ↵Alexis La Goutte4-40/+50
[-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>
2016-02-11randpktdump: change error messages.Dario Lombardo1-13/+13
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>
2016-02-11extcap: Fix call to child watchRoland Knall1-6/+2
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>
2016-02-11Qt: Add hint label in Show Packet BytesStig Bjørlykke3-2/+121
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>
2016-02-11extcap: Convert settings to preference friendly key namesMikael Kanstrup5-33/+55
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>
2016-02-11GSM RR A: Add variable to avoid some warnings [-Wbad-function-cast]João Valverde1-18/+26
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>
2016-02-11Make file indices consistently unsigned in the merge code.Guy Harris3-8/+8
Change-Id: Ie531e5c24c32ca86abbe0c2b5d3526014e5fb831 Reviewed-on: https://code.wireshark.org/review/13897 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-11Avoid undefined behavior in overflow checkMichael McConville1-1/+1
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>
2016-02-10mq: enable SSL dissectionPeter Wu1-19/+22
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>
2016-02-10TIPC: fix statement is indented as if it were guarded by... ↵Alexis La Goutte1-1/+2
[-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>
2016-02-10Qt: fix jitter buffer managementPascal Quantin2-5/+5
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>
2016-02-10LTE RRC: fix defragmentation of ETWS / CMAS messagesPascal Quantin2-16/+16
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>
2016-02-10Qt: Fix plural translationsStig Bjørlykke3-19/+24
Change-Id: I17df0c0a3462b7ccdda2105204c0ad72e80fc175 Reviewed-on: https://code.wireshark.org/review/13882 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-10ieee802.11: Cleanup indentationJoão Valverde1-8/+8
Change-Id: I5a2835340bb6733dd4af0284d0b3ecf32b40235a Reviewed-on: https://code.wireshark.org/review/13890 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-10Qt: Align hex dump text in follow streamStig Bjørlykke1-1/+1
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>
2016-02-10Bring back packet_num in "Follow Stream"Stig Bjørlykke1-0/+1
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>