aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2016-02-10Qt: Add Show as Hex Dump in Show Packet BytesStig Bjørlykke2-0/+50
Change-Id: I81a42ef263d87880cfe0d1230dbbcb692e473d6f Reviewed-on: https://code.wireshark.org/review/13868 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-10BGP-LS: fix Adjacency-SID parsingFrancesco Fondelli1-1/+1
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>
2016-02-10debian-setup: bug fixDario Lombardo1-3/+3
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>
2016-02-10prefs: set correct context for a preferencePeter Wu1-3/+7
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>
2016-02-10Squelch array compared to NULL coverity events.Jaap Keuter1-0/+4
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>
2016-02-10Mark RPC fragments as such in the Protocol and Info columns.Guy Harris1-5/+12
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>
2016-02-10Suggest pushing a decision lower in the code.Guy Harris1-1/+7
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>
2016-02-10Don't try reassembly on fragments sliced short during capture.Guy Harris1-6/+9
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>
2016-02-09Properly check the return value of color_filters_set_tmp().Guy Harris1-1/+1
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>
2016-02-09Fix classicstun att_family decoding for IPv6 (CID 280363)Jaap Keuter1-2/+0
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>
2016-02-09Lua: Check out-of-bounds before tvb_strsize()Stig Bjørlykke1-4/+13
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>
2016-02-09Update .mailmapAlexis La Goutte1-2/+17
Change-Id: I38075e12d4da69d5102e5da671e2a166d3b66899 Reviewed-on: https://code.wireshark.org/review/12197 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-09ceph: Fix more enum overflow warnings [-Wpedantic]João Valverde1-73/+48
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>
2016-02-09ceph: Declare convenience types as gint [-Wbad-function-cast]João Valverde1-4/+8
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>
2016-02-09mpeg-audio: do not put bitrate and sampling rate in source and destination ↵Pascal Quantin2-14/+10
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>
2016-02-09ieee80211: Add Overlapping BSS Scan (OBSS) IE Parameters (74)Alexis La Goutte1-0/+79
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>
2016-02-09ECMP: fix Unused value (UNUSED_VALUE) found by Coverity (CID 1348061)Alexis La Goutte1-1/+1
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>
2016-02-09And we need to check Nsts as well.Guy Harris1-1/+5
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>
2016-02-08QCP: Fix retina label calculations.Gerald Combs1-8/+16
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>
2016-02-08Revert "Lua: Remove WSLUA_ERROR on dissecting error"Stig Bjørlykke1-0/+8
This reverts commit 0f2a0e83fbb701a0836da36c16c162817d4a9b2f. Change-Id: Ifc40f99385a5948a033bb611b4ce8a0fa615b333 Reviewed-on: https://code.wireshark.org/review/13837 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-08GSM SMS: fix dissection of alphanumeric addressPascal Quantin1-4/+4
Change-Id: I5d6f3c78b99979376243f722161b3ae25adad230 Reviewed-on: https://code.wireshark.org/review/13830 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 22:09:39 +0000