aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-05-20[Automatic update for 2018-05-20]Gerald Combs12-33/+300
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ied42aaad58b11ec1796d6c14c4981b8d54258769 Reviewed-on: https://code.wireshark.org/review/27665 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-20CIP: Code cleanupDylan Ulis3-306/+282
1. Convert more things to proto_tree_add_bitmask 2. Remove unnecessary pathpos param everywhere 3. Replace some tvb_get_xxx with proto_tree_add_item_ret_uint 4. Remove unused variables, params 5. Remove if(tree) There are no functional changes. In the area where there is a lot of diff (eg: pathpos), I verified using the pcap from Bug: 12049, and compared the PDML output before and after, just as a sanity check. Change-Id: I9564172ccece558cf1877b667f713b584a00d73f Reviewed-on: https://code.wireshark.org/review/27642 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-20Get rid of add_async_dns_ipv4().Guy Harris1-13/+7
We don't have add_async_dns_ipv6(), we just do the same stuff inline in host_lookup6(); this removes an irrelevant difference between host_lookup() and host_lookup6(). Change-Id: Ib4aa1783ddec1bc390e2a7f64c87f1c8441fa849 Reviewed-on: https://code.wireshark.org/review/27661 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-20Make private variables static.Guy Harris1-2/+2
Change-Id: I0844795597cec83dfb6752fb986d2a9957789530 Reviewed-on: https://code.wireshark.org/review/27657 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-19cmake: move extcap sections to extcap/CMakeLists.txt.Dario Lombardo2-213/+227
Change-Id: Ie7d9f6ad3d8b788e0d22e3ce15159fc46f5a93e8 Reviewed-on: https://code.wireshark.org/review/27638 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-19prefs: fix bug in color savingPaul Zander1-6/+6
Colors were only saved and effectuated when all 3 color components are changed. Change-Id: I0d82ac8d62780e507714bc48c310338e87deefea Reviewed-on: https://code.wireshark.org/review/27639 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-19If the OS version of curl isn't new enough, download and install from source.Guy Harris1-19/+74
The Mountain Lion version, and presumably earlier versions, can't handle the site for xz. This means we don't need to check the OS version before downloading Ninja or MaxMindDB. Change-Id: I0afa2216d67cddc58d5c3d91d1620f3004026dfa Reviewed-on: https://code.wireshark.org/review/27652 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18Install CMake 3.5.2 on Lion and 3.7.2 on later releases.Guy Harris1-5/+12
See the comment for the painful details. Change-Id: Ic82de342b1d9c8d118e08c7b298ab7514a6f4ed3 Reviewed-on: https://code.wireshark.org/review/27651 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18Older versions of Clang don't understand -Wpedantic.Guy Harris8-48/+71
Define DIAG_OFF_PEDANTIC and DIAG_ON_PEDANTIC, and have it do nothing on Clang prior to 4.0. Change-Id: Ic6b2e607659db66f3210401024bf3f2239665506 Reviewed-on: https://code.wireshark.org/review/27649 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18Don't try to download MaxMindDB on Lion or earlier.Guy Harris1-1/+4
Same problem as with Ninja - I guess this version can't handle the TLS version those sites use. Change-Id: I659313813d0e0d68c9ab7426e8feaf1f3f52b06e Reviewed-on: https://code.wireshark.org/review/27648 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18maxmind: Process our requests more often.Gerald Combs1-2/+12
The answer to // XXX Should we call maxmind_db_lookup_process first? in maxmind_db.c is "yes", since it's possible to fill up our pipe between host name lookup intervals, at least on Windows. Note that we might want to move request processing to a thread. Bug: 14701 Change-Id: I8cfb77444d7f999e77571bc6bb61ea7f1f677778 Reviewed-on: https://code.wireshark.org/review/27644 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-18Wrong Darwin major version - Lion is 11, not 10.Guy Harris1-1/+1
Change-Id: I3977bf33b7c9d66c299fa945b49791dac7a03126 Reviewed-on: https://code.wireshark.org/review/27646 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18Don't try to download Ninja on Lion or earlier.Guy Harris1-12/+34
The version of curl that comes with Lion gets a TLS error when trying to download Ninja. Also note some other issues. Change-Id: I0e26a5b2f2f54e36461d3d3909f719fcca2ac04b Reviewed-on: https://code.wireshark.org/review/27645 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18ieee80211: fix typos related to 802.11adChaitanya Tata1-6/+6
fix a few typos related to 802.11ad 1. 802.11-2016 changed the acronym from ECPAC to ECAPC 2. dmp_params to dmg_params Change-Id: I4e3bc02cdceff826ab334bc93ebfb008c5041f74 Reviewed-on: https://code.wireshark.org/review/27643 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18cmake: remove dependency of i18n.qrc on .qm filesPeter Wu1-1/+0
The i18n.qrc file is generated at cmake time while the .qm files are also built as dependency of the AUTORCC process. The extraneous .qm dependency of i18n.qrc possibly causes duplicate wireshark_zh_CN.qm builds (see v2.9.0rc0-605-g644939ed9e), so remove it. Change-Id: I629e7b809486a65b27158f66a7e62cfcf61657d3 Reviewed-on: https://code.wireshark.org/review/27633 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-18prefs: remove wimaxasncp.udp.wimax_port compatibilityPeter Wu1-1/+0
This fixes a warning when plugins are not built ("Deprecated ports pref check - module 'wimaxasncp' not found"). This warning was added in v2.9.0rc0-372-gf7296644c5 ("prefs: fix importing some old protocol preferences") which also corrected the wimaxasncp module name, but as this broken preference was never noticed before, just remove the compatibility pref to fix the warning. Change-Id: I97430fcb00ce0e489bcf0ae3ac47c9b211705518 Reviewed-on: https://code.wireshark.org/review/27632 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-18proto.c: do not dereference a NULL pointer in proto_item_get_len() on first passPascal Quantin1-1/+5
Like the proto_item_set_XXX functions, check proto_item pointer validity before using it. It can be NULL on first pass for example. Bug: 14703 Change-Id: I94957e0738d66f99793682dc0ea1c7c0a65ceecd Reviewed-on: https://code.wireshark.org/review/27629 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18BOOTP: Disentangle BSDP naming from PacketCable.Darius Davis1-9/+9
BSDP (Boot Server Discovery Protocol, layered upon BOOTP) is entirely Apple's creation, and has nothing to do with PacketCable as far as I can tell, so let's not label it as PacketCable. BSDPD is one possible name for a daemon that speaks the BSDP protocol, and it seems more reasonable to use the name of the protocol here, so let's replace "BSDPD" references with "BSDP", and use CLIENT and SERVER to better identify the Vendor Class ID prefixes. Change-Id: I6711022f16b37a2864482ba4eb544683865de274 Reviewed-on: https://code.wireshark.org/review/27628 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18travis: add regression tests to pcap builds.Dario Lombardo1-3/+4
Change-Id: Ibdd3f5bfc7ed0e6a75c83227d50d6e00dccf6814 Reviewed-on: https://code.wireshark.org/review/27619 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-18randpktdump: use boolflag instead of boolean in config.Dario Lombardo1-15/+6
Change-Id: I259382352d4c79755c095b1e23325265226acd23 Reviewed-on: https://code.wireshark.org/review/27613 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18elf: fix unintented sign extension.Dario Lombardo1-3/+3
Use cast to avoid int promotion as done in Ibca08ee3766f6c79b933c3db7ccd1f8f906cb3fe CIDs: 1111807 1111808 1111809 1111810 1111811 Change-Id: I64dfa670b93eda3023109ea105dd2d94f58d91ba Reviewed-on: https://code.wireshark.org/review/27611 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18CMake: cleanup ui/qt/CMakeLists.txtPeter Wu1-25/+11
Remove some unused variables, favor list(APPEND X Y) over set(X ${X} Y), use consistent capitalization and whitespace. Change-Id: I2a90b55d29899393019a1aee3394b87ab12dda5b Reviewed-on: https://code.wireshark.org/review/27625 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18QUIC: Append colmun info and use small "name"Alexis La Goutte1-34/+37
Bug: 13881 Change-Id: Ibf1d1315dc259726d5990e17df2d141d1cf83784 Reviewed-on: https://code.wireshark.org/review/27032 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18Qt: Make sure we destroy the Capture Information dialog.Gerald Combs2-8/+0
Change-Id: Id45da4247aa3214227a96b77cb70b06f2edf38bf Reviewed-on: https://code.wireshark.org/review/27623 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18Debian: Add a missing symbol.Gerald Combs1-0/+1
Change-Id: Id01abe37b24be701a1b531ef583c9fca2a97338d Reviewed-on: https://code.wireshark.org/review/27617 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18dot11crypt: add bounds check for TDLS elementsPeter Wu1-10/+30
Fixes a buffer overrun (read) of at most 255 bytes which could occur while processing FTE in Dot11DecryptTDLSDeriveKey. While at it, according to 802.11-2016 9.4.1.9, "A status code of SUCCESS_POWER_SAVE_MODE also indicates a successful operation.". No idea when it makes a difference, but let's implement it too. Bug: 14686 Change-Id: Ia7a41cd965704a4d51fb5a4dc4d01885fc17375c Fixes: v2.1.0rc0-1825-g6991149557 ("[airpdcap] Add support to decrypt TDLS traffic") Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8189 Reviewed-on: https://code.wireshark.org/review/27618 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18travis: add wireshark/stable ppa.Dario Lombardo1-0/+1
This is required for missing trusty packages (as nghttp2). Change-Id: Ibff9f89c3a89c7e4593650384f97a23f05f899f3 Reviewed-on: https://code.wireshark.org/review/27576 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18dpauxmon: remove precision loss in dump_packet.Dario Lombardo1-2/+2
../extcap/dpauxmon.c:129:72: warning: implicit conversion loses integer precision: 'const ssize_t' (aka 'const long') to 'guint32' (aka 'unsigned int') [-Wshorten-64-to-32] Change-Id: If835baec3c51eecd4aff9ad7dab052192de78455 Reviewed-on: https://code.wireshark.org/review/27616 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-18Asterix: Definition for ASTERIX Category 032 - Miniplan Messagesantony.bridle1-1/+462
Change-Id: I7a110014ef8089646371ec1b176d710de2e79905 Reviewed-on: https://code.wireshark.org/review/27590 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17Win32: Add a missing check.Gerald Combs1-0/+1
...otherwise we'll crash on older versions of Windows. Change-Id: If9c1b653496930fbfad4e9e663a8340990f3f295 Reviewed-on: https://code.wireshark.org/review/27626 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-17RRC: Make the U-RNTI field filterableDarien Spencer3-49/+115
U-RNTI is defined in ASN.1 as a 'SEQUENCE' of 2 numbers. this update adds the U-RNTI field to the tree as a UINT32 with the value of the numbers combined so it could be filtered. Change-Id: I31e9f39a257aaf98c36eebb2cb7c33eb156a0e9f Reviewed-on: https://code.wireshark.org/review/27566 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-17CMake: try to fix duplicate qm builds on WindowsPeter Wu1-2/+1
The Windows buildbot showed that .qm files are generated twice. This resulted in rebuilding i18n.cpp, which resulted in rebuilding qtui, which finally resulted in Wireshark.exe being built twice for no reason. Assuming it is the same issue as commit v2.3.0rc0-3078-gaa9a0b3bf8, avoid having multiple targets depend on the same output (.qm files). This patch requires CMake 3.1 or newer. Change-Id: Iffd8946701553b89c09504278afa4b16d2a0b5b4 Fixes: v2.5.0rc0-1366-gdfa893b1cf ("cmake: set CMAKE_AUTOUIC and CMAKE_AUTORCC to avoid CMP0071 warning") Reviewed-on: https://code.wireshark.org/review/27620 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-17radius: fix memleaks in dissect_attribute_value_pairsPeter Wu1-8/+16
CLEANUP_PUSH_PFX with "eap_buffer" and "vsa_buffer_table" was ineffective because these pointers are initially NULL. Bug: 14429 Change-Id: I5e6c457df714543bd384f93cdfa012f6122f9aa9 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6279 Reviewed-on: https://code.wireshark.org/review/27537 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-17test: require Libgcrypt 1.6 for TDLS testPeter Wu2-0/+7
Dot11DecryptTDLSDeriveKey in epan/crypt/dot11decrypt.c requires Libcrypt 1.6 for MIC verification. Skip the test if unavailable. Change-Id: I0b859c0ecf135182a6249a67b9b5ea9e34ad92b6 Reviewed-on: https://code.wireshark.org/review/27614 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-17GQUIC: Tag are always use LITTLE ENDIAN encodingAlexis La Goutte1-29/+29
Bug: 14462 Change-Id: I141dbc6e404256fda9a445b26f2c8204d4839842 Reviewed-on: https://code.wireshark.org/review/27591 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17GQUIC: Add support of version Q04xAlexis La Goutte1-2/+3
Change-Id: I30d87b1c38ddde1e084338c1b04819ece2f4d97d Reviewed-on: https://code.wireshark.org/review/27557 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17isobus-vt: fix issue found by PVS Studio (V523)Alexis La Goutte1-10/+2
The 'then' statement is equivalent to the 'else' statement. Change-Id: I49c50208933c00be8bc16b5b8de15ab85e8094f5 Reviewed-on: https://code.wireshark.org/review/27601 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17rsh: fix issue found by PVS Studio (V519)Alexis La Goutte1-5/+0
The 'hash_info->state' variable is assigned values twice successively Change-Id: I73fc8e1d6acaa7c68c517e345492f2193ca95ea1 Reviewed-on: https://code.wireshark.org/review/27597 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17lbmpdm: fix issue found by PVS Studio (V519)Alexis La Goutte1-3/+0
The 'msgid.msg_def_id' variable is assigned values twice successively. The 'msgid.ver_major' variable is assigned values twice successively. The 'msgid.ver_minor' variable is assigned values twice successively. Change-Id: I675d5a0870575ac358173c12920e0c0c920f17b1 Reviewed-on: https://code.wireshark.org/review/27595 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17exec: fix issue found by PVS Studio (V519)Alexis La Goutte1-6/+0
The 'hash_info->state' variable is assigned values twice successively Change-Id: I0628a9673fb19b6b0db74266e7546f9719521ef5 Reviewed-on: https://code.wireshark.org/review/27594 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17btavdtp: fix issue found by PVS Studio (V519)Alexis La Goutte1-2/+0
The 'key[2].key' variable is assigned values twice successively. Change-Id: I420bcde791eb2ebfab68a5c69bccc195e211de01 Reviewed-on: https://code.wireshark.org/review/27593 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17reasemble_test: fix issue found by PVS Studio (V519)Alexis La Goutte1-1/+1
The 'fd_head' variable is assigned values twice successively. Change-Id: Ia30f4135f35d5ece369b9648db3ebe5a13e8ccaa Reviewed-on: https://code.wireshark.org/review/27592 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17dpauxmon (extcap): fix no previous prototype for function ↵Alexis La Goutte1-1/+1
'nl_receive_timeout' [-Wmissing-prototypes] Change-Id: Iaeda0a1c677b3ec605d1a419b1230cf994ccdf4e Reviewed-on: https://code.wireshark.org/review/27609 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17dpa400: fix no previous prototype for function 'dpa400_open' ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: Ie10cd7bfffa5ef2fe888ade3250c873750eb18a9 Reviewed-on: https://code.wireshark.org/review/27608 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17authors updatenatej2-2/+2
Change-Id: I55e09e45f7460f4d74c73830917365be7383e6ba Reviewed-on: https://code.wireshark.org/review/27610 Reviewed-by: Roland Knall <rknall@gmail.com>
2018-05-17opa-mad: fix issue found by PVS Studio (V501)Alexis La Goutte1-2/+2
There are identical sub-expressions to the left and to the right of the '&&' operator: vlSelMskTmp && i < 32 && vlSelMskTmp Change-Id: I23df4ac9217fe2ddc4b6691530abc609f644511a Reviewed-on: https://code.wireshark.org/review/27509 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17vnc: fix issue found by PVS Studio (V1003)Alexis La Goutte1-45/+42
Consider inspecting the 'for' operator. No more than one iteration of the loop will be performed Change-Id: I0fe1cb83c8dca935c729a94eb7f6b94d2c0d245a Reviewed-on: https://code.wireshark.org/review/27508 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17pkcs1: recognize the ecdsa-with-SHA1 OIDРоман Донченко2-0/+6
Change-Id: I8c82086570032c862ec1ca6ea25b4e40d1bc3e78 Reviewed-on: https://code.wireshark.org/review/27589 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-05-17dcerpc-fileexp: fix issue found by PVS Studio (V523)Alexis La Goutte1-22/+4
The 'then' statement is equivalent to the subsequent code fragment. Change-Id: I2c44ef7d43468a70e7eb48326af962c908a656be Reviewed-on: https://code.wireshark.org/review/27600 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17qt_ui_utils: fix issue found by PVS Studio (V519)Alexis La Goutte1-2/+2
The 'val_qstr' variable is assigned values twice successively Change-Id: I5cc80a3e68c08330ac3bbb7c8c45db105d7fb865 Reviewed-on: https://code.wireshark.org/review/27599 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 22:35:48 +0000