aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-17debian: Drop unused renaming of wireshark-qt binaryBalint Reczey1-2/+0
Change-Id: I9ff77d97016f33d1a276c7392f076413590a1099 Reviewed-on: https://code.wireshark.org/review/18241 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17debian: Update changelog timestamp to silence Lintian warningBalint Reczey1-1/+1
Change-Id: I4a27c10766587c3b61b088290a5f05a34d3c3cd8 Reviewed-on: https://code.wireshark.org/review/18239 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17debian: Stop using hardening-check during .deb package buildBalint Reczey2-4/+1
Hardening-check script has been removed from Debian unstable. Checking binaries' security features is implemented in Lintian instead which will raise proper warnings for not Position Independent Executables and binaries missing "bindnow" linker flag. This also fixes the Lintian error complaining about dependency on obsolete hardening-includes package. Change-Id: If3387aa1f2297927c19d85f27361ba639203aad9 Reviewed-on: https://code.wireshark.org/review/18238 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17debian: Update symbols file for new symbolsBalint Reczey1-0/+12
Change-Id: I2a38196fe8aa93b72a94a1b95caf665e2de645f3 Reviewed-on: https://code.wireshark.org/review/18237 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17InterfaceList: Change Buttons to comboboxRoland Knall8-97/+118
Change the buttons to a combobox selector, and move that selector to the right of the capture filter box. Bug: 12971 Change-Id: Ib85d51cca128ed76eb08886e92660ede51d5982f Reviewed-on: https://code.wireshark.org/review/18186 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-17ftp: use ws_strtou function.Dario Lombardo1-14/+31
Change-Id: Idd0496f5afe41506ae3b5e22bc0aec09b737be6c Reviewed-on: https://code.wireshark.org/review/18146 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-17cmake: fix missing docbook dependencyPeter Wu2-4/+20
Running "ninja developer_guide_html" somehow did not produce a new HTML docbook once wsluarm.ascii (a dependency of developer-guide.xml) was modified. It turns out that output file docbook/wsdg_html/index.html only had a ordering-only dependency on target generate_developer-guide.xml. An extra dependency is needed on the output file to ensure that the HTML file gets rebuild on changes. See the last note on https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/ Fixes v2.1.0rc0-2137-gd544ecd ("cmake: fix parallel docbook build"). Change-Id: I7689c71994f13b29cf7f8561f7c993aa8298632d Reviewed-on: https://code.wireshark.org/review/18225 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-17Fix typo in a messageJoerg Mayer1-1/+1
Change-Id: Ic1651c4ff0fd7ba7f13cd52b596f3d54cf6c3e00 Reviewed-on: https://code.wireshark.org/review/18245 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17Bluetooth: HFP: Fix incorrect field nameMichal Labedzki1-1/+1
In some AT commands field description was "Number", should be "Type". Change-Id: I33e3c8deb4f1fd0d51c3faae7a7ec45baacd82ca Reviewed-on: https://code.wireshark.org/review/18232 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-17Qt: Read our dynamic recent entries a bit earlier.Gerald Combs1-9/+10
Call recent_read_dynamic a bit earlier in the startup process. Note that it determines when we fill in the recent files list, so the earlier we call it the better. Change-Id: Iad37d3aa2222873259d6c96ba79672236c8e4cd5 Reviewed-on: https://code.wireshark.org/review/18235 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-17MQ: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I62a67c4fff4604a3d1e335500b2453bae4f95f37 Reviewed-on: https://code.wireshark.org/review/18223 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-17quakeworld: use ws_strtou function.Dario Lombardo1-8/+31
Change-Id: I2d4d97229ee4fee37b26a2dabab9d373a0401e13 Reviewed-on: https://code.wireshark.org/review/18149 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-17frame: print debug line according to new console preference.Dario Lombardo3-5/+12
Change-Id: I4e4b7d08e7765c43904469bbf8ba5c0581428382 Reviewed-on: https://code.wireshark.org/review/18231 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-17Add fc00 dissectorEmery Hemingway4-0/+350
http://fc00.io/ Bug: 13014 Change-Id: I846d4dc28a8cb03bc877f0b4a392864100019d2d Reviewed-on: https://code.wireshark.org/review/18117 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17Add a comment how to run git review after using --no-verfiy.Joerg Mayer1-0/+3
Change-Id: I07cde41ef6f8074efbb77eacde91b46b62c2f59e Reviewed-on: https://code.wireshark.org/review/18230 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17Some get rid of the remaining trivial Q_UNUSED cases.Joerg Mayer2-14/+11
Fix the placement of Q_UNUSED inside #ifdef Change-Id: I015ff87fcb300a701bf8ccb42bd85e3068a08138 Reviewed-on: https://code.wireshark.org/review/18228 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17Get rid of the trivial Q_UNUSED casesJoerg Mayer1-76/+33
Change-Id: Ia7ddde278158f3321eb4244189375bdd51c8976d Reviewed-on: https://code.wireshark.org/review/18227 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-16extcap_example.py: fix hang on exitPeter Wu1-41/+20
I guess that when SIGINT is intercepted, then the writes are restarted and the doExit condition is never checked. Remove this racy check in favor of catching the KeyboardInterrupt exception. Test: tshark -i example1; kill tshark; check process list for python. Bug: 11657 Change-Id: Ia8b1ee560b9dcd31dd91df27fbfb8e91237581c9 Reviewed-on: https://code.wireshark.org/review/18218 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-16extcap_example.py: fixes for Python 3Peter Wu1-37/+32
Fixes trivial syntax error in try/except, ensure that the message are bytes instead of a string and remove unnecessary use of an append_bytes function. Did not try to fix the other Python issues, at least it runs now. Change-Id: Ib24f6116bc9d3cf177bc940da9f89aff90695a93 Reviewed-on: https://code.wireshark.org/review/18212 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-16CIP: no previous prototype for ‘dissect_cip_attribute’ ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: I61f388b136e66db9c4b909c4509db0441b1f1865 Reviewed-on: https://code.wireshark.org/review/18221 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-16addr_resolv(.c): no previous prototype for ↵Alexis La Goutte1-2/+2
‘add_ss7pc_name/ss7pc_name_lookup_init’ [-Wmissing-prototypes] Change-Id: Ice8c901e41e1881210c0f4bf70851810ca480e81 Reviewed-on: https://code.wireshark.org/review/18222 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-16raknet: fix Value stored to 'ti' is never readAlexis La Goutte1-1/+1
Change-Id: I2b3fe3a2b951cc99f6e6091389ec17bba367e8c6 Reviewed-on: https://code.wireshark.org/review/18224 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-16ZigBee MAC and ZDO dissectors: put useful information into column ↵dsrsupport4-5/+15
description for Association req and ZDo Node Desc Resp. I added that information to column description because I always need it when analyzing logs. For Association request it is joining device type (FFD or RFD), for Node Descriptor Response this is stack version (r21 or legacy). Change-Id: Ic7ca237b1f4b598f9354b406f105c2befe45140d Reviewed-on: https://code.wireshark.org/review/17534 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-10-16[Automatic update for 2016-10-16]Gerald Combs12-91/+656
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I016f035d04c44a68163ea0670e27fa454f4ba660 Reviewed-on: https://code.wireshark.org/review/18217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-16Inspired by prevous commit: grep for wlan_mgt turned up a few more ↵Joerg Mayer2-4/+4
occurrences. Fix them. Change-Id: I6661f483f7bf1e34c96467917358dbddf45f808e Reviewed-on: https://code.wireshark.org/review/18216 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-16More wlan_mgt cleanup:Joerg Mayer2-7/+1
- Fix test script to use wlan instead of wlan_mgt - Remove a now useless test in the dissector Change-Id: I9a7644947c3002c759a7ae5728a8559682cfd4fd Reviewed-on: https://code.wireshark.org/review/18215 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-16Get rid of wlan_mgt. Handle these elements as part of wlan. The separation ↵Joerg Mayer1-1212/+1204
was artificial and irritiating. Change-Id: I45d4c3f5d518466df1d0b88ba6e10226662ee6e1 Reviewed-on: https://code.wireshark.org/review/18214 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-16dmp: Fix UDP ports preference conversionStig Bjørlykke1-1/+1
The preferences change in 2eb7b05b had a typo for the old preference name. Change-Id: Ie4d85160050f5bea01b59a1803011b49a6c4d748 Reviewed-on: https://code.wireshark.org/review/18213 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-10-15Eliminate a global variable.Guy Harris1-11/+14
Have the packet length be a local variable, and pass it to routines. Yes, that means we fetch it twice - no great loss. Change-Id: Id9f95b3d8a19bf235d6b19993165e0f73a2e5732 Reviewed-on: https://code.wireshark.org/review/18211 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-15Fix bin2hex().Guy Harris1-3/+3
It was repeatedly overwriting the first character in the buffer, rather than appending characters. Change-Id: Ie34d194d69ac3d685416323c93764aa401d78faa Reviewed-on: https://code.wireshark.org/review/18209 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-15megaco: use ws_strtoi function.Dario Lombardo1-11/+23
Change-Id: I8e4807e29524976898f2656f2c6f06d890748f36 Reviewed-on: https://code.wireshark.org/review/18148 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>
2016-10-15ZigBee Green Power: implement dissection for Proxy Table Request and Sink ↵Vladlen Popov1-3/+102
Table Request commands of GP Cluster Change-Id: Ib6d538eebd9f74be168f49b8570463bda97c7a8a Reviewed-on: https://code.wireshark.org/review/18199 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> 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-10-15ZigBee green Power: fix commissioning reply, fix PAN ID fieldVladlen Popov1-1/+17
Parse field frame counter in comm_reply Fix PAN ID field name in comm_reply Change-Id: I2f30437fe7eef81af982fb8388ad43341043eb64 Reviewed-on: https://code.wireshark.org/review/18200 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> 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-10-15udpdump: fix issues from coverity.Dario Lombardo1-4/+7
Change-Id: I1d82d8166abe8eda6588ae2970ae9f2d096adf9d Reviewed-on: https://code.wireshark.org/review/18198 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-10-15Add the directory containing the executables to a file in /etc/paths.d.Guy Harris1-0/+7
Do for executables what we do for man pages. Change-Id: I066f0199fd6064cae21e6ad079a1f344e1002c66 Reviewed-on: https://code.wireshark.org/review/18205 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-14Lua: allow creating TVBs after calling other (Lua) dissectors.Jeff Morriss1-6/+12
Don't set `lua_tvb` (or any of the other global variables) to NULL after a Lua dissector is called: it's possible that the caller is also a Lua dissector which may want/need that (global) variable to still be set (to the value it had before the sub-dissector was called). This fixes the problem reported in: https://ask.wireshark.org/questions/56110/lua-error-tvbs-can-only-be-created-and-used-in-dissectors Making these variables not be a globals (as suggested at the top of init_wslua.c) might be a better solution--for another day. Change-Id: I14fb8ec35b62abeda3f3471a323b88c80537a06e Reviewed-on: https://code.wireshark.org/review/18095 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl>
2016-10-14Retrieve CLNP option values from the right placeJaap Keuter1-8/+8
Use proper offsets when getting and presenting option values for error reports. Limit the use of the error position highlighting feature to 'field' only. Bug: 12993 Change-Id: Ie9d6644203cf849dbb8efe15e87249a3aace3b5c Reviewed-on: https://code.wireshark.org/review/18195 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-10-14Append Integer32 value to varbind also.Jaap Keuter2-2/+2
Integer32 is handled slightly different from other values, but that doesn't mean its pi_value shouldn't be saved to add to the varbind later on. Bug: 13013 Change-Id: I6789a75ffd3bb95b7dd68f9cb356dbd85fc669d4 Reviewed-on: https://code.wireshark.org/review/18189 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-10-14MAC LTE: add dissection of NB-IoT RARPascal Quantin1-113/+208
Change-Id: I81b6ad65732dd11e5af040ec79b0175a7f06b070 Reviewed-on: https://code.wireshark.org/review/18196 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-10-14CQL: Enhance version dissectionAlexis La Goutte1-2/+35
Display on hex (like spec) Add (sub) field for protocol version and direction Ping-Bug 12818 Change-Id: I6947f82915f54095f86cd0e2125982af42e9bbf9 Reviewed-on: https://code.wireshark.org/review/18188 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-10-14CQL: Add support of version 4Alexis La Goutte1-5/+68
Add new flag and new option Bug: 12818 Change-Id: I36a49cef407a5049f45ff3746d809a46c2520164 Reviewed-on: https://code.wireshark.org/review/17628 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-14CQL: Enhance flags dissectionAlexis La Goutte1-12/+48
Always display unused/reserved field 5th argument of proto_tree_add_bitmask is ett_ value add a display field for query flags Ping-Bug: 12818 Change-Id: I9f906f75c5fe8328bba41e560878dafdb6b6608d Reviewed-on: https://code.wireshark.org/review/18187 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-14UI: Free up the -m flag.Gerald Combs2-13/+0
The -m (monospace font) flag was deprecated in 2.2. Go ahead and remove it in 2.3 / 2.4. Change-Id: I6b4911174675cedec979621c2776353314e73eb1 Reviewed-on: https://code.wireshark.org/review/18193 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-14CMakeLists: Add man filesUli Heilmeier2-2/+5
Current Wireshark.app bundle on OS X doesn't include man pages. This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0 has been reverted. Now cmake gets the information that the man files are generated. Bug: 12746 Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb Reviewed-on: https://code.wireshark.org/review/18170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-13Fix a few typos in the Diameter XML to make it (mostly) valid XML again.Jeff Morriss1-57/+59
Fix up some white space while at it. Change-Id: I41efa63ad33288046b56c2eee6a20e066ac6b334 Reviewed-on: https://code.wireshark.org/review/18190 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey40-15277/+270
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-13Qt+macOS: Fix the default font name.Gerald Combs1-2/+8
"SF Mono" is the name of the new monospace font in Sierra. Note that it appears to have limited availability and that we're outside those limits. Fix up a comment. Change-Id: I97f0077098ea78d4550b58fb92645f4d62342b2e Reviewed-on: https://code.wireshark.org/review/18168 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-10-13iso8583: use unsigned and fix bug in conversion routine.Dario Lombardo1-9/+9
Change-Id: I0ba30bda3abec004f51f9402d65c38b3b1081113 Reviewed-on: https://code.wireshark.org/review/18144 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Paulo Roberto Brandão <betobrandao@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-13ZigBee Green Power: dissect endpoint and security_counter for gpdf with ↵Vladlen Popov1-3/+23
app_id = 010 and 001 Change-Id: I94ec94dbd6c81cf6a209e26c132557279d3c6ee2 Reviewed-on: https://code.wireshark.org/review/18182 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-10-13Fix compilation error without PCAP.Dario Lombardo1-1/+1
Change-Id: I414f11387ec5a48dfe7c1debb3bcef1dbc846b28 Reviewed-on: https://code.wireshark.org/review/18184 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 22:27:47 +0000