aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-28Have commandline_other_options() directly fill in the global structure.Guy Harris4-35/+35
Other code looks at the global structure, so there won't be other structures; just fill in the global structure directly. Change-Id: I4dc87b79168c5a7c9ab1f085aa2d78cc6d2c9019 Reviewed-on: https://code.wireshark.org/review/16184 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Don't set quit_after_cap if no pcap, as it's not present.Guy Harris1-1/+1
Change-Id: I871f75394ba66967d7d7be203bd9e235575458e1 Reviewed-on: https://code.wireshark.org/review/16183 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Make quit_after_cap an item in commandline_param_info_t.Guy Harris6-86/+84
And make the commandline_info structure global, so all the places that look at quit_after_cap can get at it. Change-Id: I006329cf8842c655cca36f024570855d1b16e107 Reviewed-on: https://code.wireshark.org/review/16182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-28Pull quit_after_cap out of the global capture options.Guy Harris8-11/+29
Really, all the GUI-related options should be pulled out, so they're not cluttering up dumpcap and tshark. Change-Id: I0276dee2be48bae3498a819d8c0c2747fe1352e7 Reviewed-on: https://code.wireshark.org/review/16180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27We need global_capture_opts if we have extcap, even without pcap.Guy Harris1-1/+1
Change-Id: I16b778064c1cd2bbf281fb5192bf35da252e99dd Reviewed-on: https://code.wireshark.org/review/16179 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27test: ensure temporary directory outside source treePeter Wu1-1/+1
The whole point of using mktemp is to get a temporary directory outside the source tree. Commit v2.1.0rc0-1027-ge01f8fb tried to fix the invocation for *BSD (including OS X), but by adding a template it dropped the implicit --tmpdir option for GNU mktemp on Linux.. Use the GNU mktemp invocation and if it fails (for example, because a template is expected for BSD/OS X), provide a template. Change-Id: I77bbc7dc2045e4fa756e102afa080860b0857713 Reviewed-on: https://code.wireshark.org/review/16178 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-06-27qt: fix linking error with global_capture_optsPeter Wu1-4/+0
global_capture_opts is already defined by ui/commandline.c which is also linked with wireshark-qt.cpp. Remove the duplicate definition to avoid a build failure with the gold linker. Fixes regression from v2.1.1rc0-192-g9b5b444. Change-Id: I4484e2769bf270dee1ec0378fd9c925e01eaf390 Reviewed-on: https://code.wireshark.org/review/16175 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-06-27cmake: add idl2wrs-dissectors target for DCERPCPeter Wu4-46/+56
Add a callable target such that dissectors can be generated without the AUTOGEN_dcerpc option. Modelled after the pidl CMakeLists.txt file and target. This approach has the advantage over the previous implementation such that the clean target does not remove the packet-dcerpc-X.c files. Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f Reviewed-on: https://code.wireshark.org/review/15989 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-06-27Qt: Clean up capture file callbacks.Gerald Combs2-12/+13
Mark some callbacks GTK+ only as appropriate. Change a debug message to an assert since we handle all callbacks. Change-Id: I4266f0d7134d19a9c0432354ea36de67501275b4 Reviewed-on: https://code.wireshark.org/review/16171 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-06-27Fixed tshark pdml output.Martin Kacer1-20/+13
Corrected if no protocol filter (-j) specified. Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0 Reviewed-on: https://code.wireshark.org/review/16164 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27There's no need to check the return from g_array_index().Jeff Morriss1-8/+0
g_array_index() returns an index into an array: we're sure to find something at that index (whether that something is in bounds is a-whole-nother question). This fixes CIDs 1362829 and 1362890/1362830. There were other CIDs like this but they've already been fixed. Change-Id: I94af0931b9adf3abd3bedc969e399cda98bbdd07 Reviewed-on: https://code.wireshark.org/review/16168 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27tvb_get_string_enc + proto_tree_add_item = proto_tree_add_item_ret_stringMichael Mann97-1129/+917
Also some other tricks to remove unnecessary tvb_get_string_enc calls. Change-Id: I2f40d9175b6c0bb0b1364b4089bfaa287edf0914 Reviewed-on: https://code.wireshark.org/review/16158 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-27CIP: Cleanup info column for MSP packetsD. Ulis1-6/+15
1. Skip printing class name in info column when it was an MSP, since it's implied. 2. Don't print response status for embedded messages in info column for MSP. It makes the line too long. 3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed. Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd Reviewed-on: https://code.wireshark.org/review/16162 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27endpoint dialog: fix compilation when we don't HAVE_GEOIP.Jeff Morriss1-3/+7
Also fix some indentation and white space. Remove a break-after-return. Bug: 12562 Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf Reviewed-on: https://code.wireshark.org/review/16159 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-27LTP: fix indentAlexis La Goutte1-3/+3
replace space by tab Change-Id: I52d5fefbf795fe6ee2dbdeda087c49280ba47503 Reviewed-on: https://code.wireshark.org/review/16166 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27DOCSIS: Fix unknown TLVs in UCD type29 caused parsing errors + bugfixesBruno Verstuyft1-271/+272
Change-Id: I9ab56ded7ebf9f087afceed979e451e369eaf1d6 Reviewed-on: https://code.wireshark.org/review/15967 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27Remove author comments and some accompanying useless code commentsJoerg Mayer1-61/+3
This only removes author's names that appear in the AUTHORS* files. In those cases where a group of people get mentioned, this patch does not remove any in case at least one name is not found in AUTHORS* Change-Id: I2259dbda3d4a1250bdc103f3fc5be93df5482489 Reviewed-on: https://code.wireshark.org/review/16154 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: Anders Broman <a.broman58@gmail.com>
2016-06-27autotools: Qt 5.7 requires C++11João Valverde3-8/+578
Change-Id: Icad622a052a84862ace98a7000f10ccf677f54a5 Reviewed-on: https://code.wireshark.org/review/16138 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-06-27s7comm: Sinumerik NC file transferThomas Wiens1-1/+117
Added decoding of up-/downloading files from/to a Sinumerik NC CNC control machine. Change-Id: If7939e56e972fc2b8feb12150c4184a880b0cdae Reviewed-on: https://code.wireshark.org/review/16129 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: Anders Broman <a.broman58@gmail.com>
2016-06-27AUTHORS: fix duplicate / wrong name entryAlexis La Goutte2-2/+3
Change-Id: I1e2bb98d1e78af193f449c75109eabc92f934c11 Reviewed-on: https://code.wireshark.org/review/16149 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: David Zoller <zollerd@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-27json: corrected json output format.Martin Kacer1-0/+32
Some pcaps caused invalid json and ek files. Bug: 11754 Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844 Reviewed-on: https://code.wireshark.org/review/16152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27CMake: Qt 5.7 requires C++ 11.Gerald Combs1-0/+11
Add -std=c++11 to CMAKE_CXX_FLAGS if we have Qt >= 5.7.0 and we're compiling with g++ or clang++. Change-Id: Id4ce5921ce5c475e9eb9cc67f94c3b3a895924a1 Reviewed-on: https://code.wireshark.org/review/16135 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: João Valverde <j@v6e.pt>
2016-06-27radiotap: Fix for the VHT 20MHz MCS 9 data rate not displayedAshish Shukla1-1/+1
MCS 9 at 20 MHz is valid for 3 and 6 spatial streams. Changed the rate table to include rate (mbps) for VHT 20MHz MCS 9. Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Bug: 12558 Change-Id: Ia16ae545a5ac1779131e24e1f54a5659390cd321 Reviewed-on: https://code.wireshark.org/review/16146 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-27circuit(.h): fix indent (and add modelines)Alexis La Goutte1-16/+24
Change-Id: I71bb0a8eaf9f5bd34395a4182e4158abaca4ace2 Reviewed-on: https://code.wireshark.org/review/16144 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-27Fix typo on AUTHORS.src (about @)Alexis La Goutte2-5/+4
Change-Id: Ie4ba5b6ca9cdcf0a90c4b7604b0b4ff89690f3d9 Reviewed-on: https://code.wireshark.org/review/16148 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-27The "coding" subfield of the VHT field is a bitmask.Guy Harris1-6/+7
Treat it as such. Fetch it once, regardless of whether we have any non-zero NSS values or not, and use the per-user NSS value to decide whether a particular bit in the bitmask is valid and worth displaying. Make the four coding fields bitfields, with the appropriate bit. Change-Id: I506b35afa9d07da8d800da5c304d5d0aadd87c54 Reviewed-on: https://code.wireshark.org/review/16155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-26Check for an invalid 11ac MCS/bandwidth/NSS combination.Guy Harris2-3/+184
A few of the combinations are marked as "Not valid" in 802.11ac-2013. Ping-Bug: 12558 Change-Id: I18b78ebb84ab32a6fc53c6d634ef07ae87fb4866 Reviewed-on: https://code.wireshark.org/review/16153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-26Decode partial virtual bitmap in TIM IEJoerg Mayer1-11/+31
- Add yet another filter name for an association id element - Minor (consistency) cleanups in the vicinity of the new hf element. Bug: 12545 Change-Id: Ic8e7580e7de7572e1b449ae03494b25567d86ea3 Reviewed-on: https://code.wireshark.org/review/16150 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-06-26[Automatic update for 2016-06-26]Gerald Combs18-4483/+5056
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id5cc1bbd3d7f899e48ae9c2de48613ef0366cc29 Reviewed-on: https://code.wireshark.org/review/16142 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-26Qt: Don't use QStyleOptionViewItemV4.Gerald Combs3-39/+47
It was deprecated in Qt 5.7. Just use QStyleOptionViewItem. Change-Id: I890305a11393940e21bdc68d90ca6602ade16769 Reviewed-on: https://code.wireshark.org/review/16137 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: Anders Broman <a.broman58@gmail.com>
2016-06-26Add an RA_INTERFACES register action.Gerald Combs5-12/+23
Add RA_INTERFACES between RA_PREFERENCES and RA_CONFIGURATION. Wireshark was spending a suspiciously long time loading module preferences here. (Now we just need to find out why that section of the code is slow.) Change-Id: Iecbe55e8e10c8844bcb151a13e383cb13a3f6eb1 Reviewed-on: https://code.wireshark.org/review/16133 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26Qt: Handle unhandled filter actions.Gerald Combs7-21/+29
Handle FilterAction::ActionColorize and ::ActionFind. Remove ::ActionConversation since it was unused. Assert when we encounter a missing FilterAction, similar to what we do in other parts of the code. Bug: 12363 Change-Id: I5c1ecd488e5bdb9700a80fc70ec7c047311054b6 Reviewed-on: https://code.wireshark.org/review/16131 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: Anders Broman <a.broman58@gmail.com>
2016-06-26Qt: Try to fix un-maximize behavior on OS X.Gerald Combs4-11/+40
On OS X, create dialogs with valid parents so that we don't trigger QTBUG-46701. Document QDialog's "on top", maximize, and minimize behaviors. Bug: 12544 Change-Id: I32c0ef01dba3f7132e5fd0cd61f9feb654b92009 Reviewed-on: https://code.wireshark.org/review/16127 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: Anders Broman <a.broman58@gmail.com>
2016-06-26Qt: Conversation and Endpoint dialog performance tweaks.Gerald Combs10-170/+217
Generate column text dynamically. This keeps us from having to iterate over our tree items each time we receive updates. Set the uniformRowHeights property. Stop automatically resizing columns after 200 items. Fixup name resolution behavior. Disable the checkbox if host name resolution is disabled. Change-Id: Ib2fef604d6ee9e39a8b1edd72d58d0cb02d3bb64 Reviewed-on: https://code.wireshark.org/review/16110 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: Anders Broman <a.broman58@gmail.com>
2016-06-26circuit: rename shadow variableDario Lombardo2-2/+2
Change-Id: I67e2c80e89af9526ba4b482933d64cab93b9490a Reviewed-on: https://code.wireshark.org/review/16105 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26app_mem_usage: rename shadow variableDario Lombardo2-5/+5
Change-Id: I0db888633118beeabfe4bb8fa6da419d0827c7c1 Reviewed-on: https://code.wireshark.org/review/16106 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-06-26conversation: rename shadow variableDario Lombardo33-56/+56
Change-Id: I8f738b2e01d7f448b21cdc1b488b16b7dd581911 Reviewed-on: https://code.wireshark.org/review/16104 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26ex-opt: rename shadow variableDario Lombardo2-4/+4
Change-Id: Iba19920e58ffb7f1a88c2a75964c518f0479c66f Reviewed-on: https://code.wireshark.org/review/16103 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26filter: rename shadow varDario Lombardo4-7/+7
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545 Reviewed-on: https://code.wireshark.org/review/16102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26srt: rename shadow variableDario Lombardo3-11/+11
Change-Id: I69bda25f79b6b46bdb288e32133847a853b614e0 Reviewed-on: https://code.wireshark.org/review/16101 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26stats_tree: rename shadow variableDario Lombardo1-2/+2
Change-Id: I5b3272cc4df728c70d6b0370b0d8a6d3482a0c6c Reviewed-on: https://code.wireshark.org/review/16100 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-26h248: rename shadow variable.Dario Lombardo5-5/+5
Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443 Reviewed-on: https://code.wireshark.org/review/16099 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-25Minor UI locale updates.Gerald Combs4-15/+12
Qt: Call setlocale before commandline_early_options so that we get proper "-v" output, similar to the GTK+ UI. GTK+: Call setlocale once at startup. Bug: 11960 Change-Id: I3c3a196b9d94fc768e1085200891bc8d67e21a08 Reviewed-on: https://code.wireshark.org/review/16132 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: João Valverde <j@v6e.pt>
2016-06-25wsutil: Move Win32 helper routines from capchildRoland Knall5-143/+258
Move error handling and argument quoting routines from capchild to wsutil, as those methods will be used by extcap_spawn as well. Change-Id: I2c4515fefd5aecad317fcdaefa721734288f792c Reviewed-on: https://code.wireshark.org/review/16123 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-24Qt: Fix "-l" behavior.Gerald Combs3-10/+3
gbcae998 didn't completely fix the missing "-l" behavior. Bug: 12311 Change-Id: Iee3c844013ac137e94848aaafca7aeb3de43e080 Reviewed-on: https://code.wireshark.org/review/16128 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-06-24Qt: Keep the syntax line edit cursor active.Gerald Combs2-0/+12
Ignore focusOutEvents when the syntax line edit completer is active. This keeps it from hiding its cursor. Bug: 12520 Change-Id: I8e25b92c097e039e26e2381c5209be1e27a6a7cd Reviewed-on: https://code.wireshark.org/review/16126 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-24print(.c): fix indentAlexis La Goutte1-86/+83
Change-Id: Ie7c55fb432b29abe689eed1968cfa30bd8e88e33 Reviewed-on: https://code.wireshark.org/review/16124 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-06-24tfshark: remove unused variableDario Lombardo1-2/+0
Change-Id: I30ab3e4e044de12b18b7b7213a605df7096d1c54 Reviewed-on: https://code.wireshark.org/review/16108 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-24Indicate how this should be done.Guy Harris1-0/+7
Assuming that it could, if registered as an "eth.trailer" heuristic dissector, get the length of the entire frame, that is. Change-Id: I1ac26feeb10bb8ba357089a80f4b768f580bb51d Reviewed-on: https://code.wireshark.org/review/16121 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-23Fix "disable this protocol by default".Guy Harris3-9/+28
Allow a dissector to mark its protocol as "disabled by default", which means that the "enable all protocols" routine won't enable it. This is necessary in order to allow the disabling of protocols not to be unintentionally changed due to profile changes; see bug 9826. Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f Ping-Bug: 9826 Reviewed-on: https://code.wireshark.org/review/16109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 21:26:14 +0000