aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-17autotools: Remove setuid-root.plJoão Valverde3-93/+0
It seems to be some sort of development helper, and since CMake doesn't use it presumably it is not useful anymore. Change-Id: I23e4ab24199f21310ebd09064c3ae53e48673e4d Reviewed-on: https://code.wireshark.org/review/23945 Petri-Dish: Gerald Combs <gerald@wireshark.org> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17dissector/ptp: fix typo - should be ptp.as.sig.tlv.flagsAdam Wujek1-1/+1
Change-Id: I31be23516d7fb169daa827b505bcde04426e84dc Signed-off-by: Adam Wujek <adam.wujek@cern.ch> Reviewed-on: https://code.wireshark.org/review/23961 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-17SMB2: rename QUERY_INFO buffer input fields and parse Reserved fieldAurelien Aptel1-10/+13
Since the packet has an output and input buffer, having a field just called "size" or "offset" was confusing. Change-Id: Iadb45fa50e6ea6ffaa7c3b041704837641f64ab6 Signed-off-by: Aurelien Aptel <aaptel@suse.com> Reviewed-on: https://code.wireshark.org/review/23958 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: Michael Mann <mmann78@netscape.net>
2017-10-17autotools: Fix bogus checkAPI targetsJoão Valverde2-3/+3
Change-Id: Ifc8884fc0f0e4548db79a68e3fbc35c7e5fb9be9 Reviewed-on: https://code.wireshark.org/review/23947 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17[Bluetooth] Prepare for adding a BT Mesh dissector.AndersBroman1-19/+48
Change-Id: I79140a15c93e7bfada5036fd3fbb1bb94d99a655 Reviewed-on: https://code.wireshark.org/review/23940 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>
2017-10-17CMake: increase minimum required version to 2.8.11Peter Wu1-1/+1
Due to the use of target_include_directories (when sshdump or ciscodump are enabled), the minimum required version is 2.8.11. The supported OS versions do not change, but Debian Wheezy users must enable backports. Change-Id: I883c81e5e81425ca1869f442686faf1e66a638f3 Reviewed-on: https://code.wireshark.org/review/23955 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-17CMake: fix Qt build with CMake 2.8.12 and beforePeter Wu1-28/+15
The Qt5Widgets_EXECUTABLE_COMPILE_FLAGS option is only needed for CMake before 2.8.12 and before as documented by Qt, so this ugly piece can be restricted to older CMake versions. That also helps avoiding exposing the Qt 5.5.0 in Windows since that requires a much newer CMake version. For those older versions, use COMPILE_FLAGS such that -fPIC is added after -fPIE (the latter is enabled by CMAKE_POSITION_INDEPENDENT_CODE). Tested with CMake 2.8.11, 2.8.12.2, 3.0.2 and 3.9.4 using Qt 5.9.2 and GCC 7.2.0. Change-Id: I4962f7f5a087ee5b8c79905dd3b2cce17c731bdf Fixes: v2.1.0rc0-566-gd66d379ac8 ("Try retroactively applying the Qt folks' fix for QTBUG-47942.") Reviewed-on: https://code.wireshark.org/review/23954 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-17nfs: fix nfs dissector to show correct mirror and data server countsTigran Mkrtchyan1-20/+22
nfs dissector wrongly have used proto_tree_add_item to display a counter, by assuming that last argument is a value. Replace proto_tree_add_item with proto_tree_add_uint or proto_tree_add_subtree_format when a loop counter must be displayed. Update tree item size calculation. Change-Id: I4137e42673fa33cae61494effe1195206fbf7f28 Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> Reviewed-on: https://code.wireshark.org/review/23748 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>
2017-10-17Bugfix Decode As dissector table selection.Michael Mann1-1/+1
Need to use UI name to select between different tables. Change-Id: I2f25435e6ac1a2f1a15e651cd3ef1bbc9e860d89 Reviewed-on: https://code.wireshark.org/review/23952 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>
2017-10-17CMake: fix build regression with CMake 3.0Peter Wu1-1/+8
This kind of generator expressions do not seem to work in CMake 3.0. It works fine in CMake 3.1.0 and later versions. Change-Id: I262566a5ea831ae0fbe4b6a3249b59401f9d3b15 Fixes: v2.5.0rc0-1334-gd3f636ece0 ("cmake: fix CMP0026 deprecation warning in CMake 3.9") Reviewed-on: https://code.wireshark.org/review/23949 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-17Remove GTK ige mac integration remnant from configure.acJoão Valverde1-6/+1
Follow-up to 356d6b8db04bfc15a1d0a5fabbc79aad0e81d592. Change-Id: Ibfe2e890eb2e41b962c5a045a8d84c5431c0f336 Reviewed-on: https://code.wireshark.org/review/23953 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-17ssl: regression fix for decryption with renegotiationPeter Wu1-9/+9
A renegotiated session with decrypted records has !maybe_encrypted which means that the plaintext buffer is passed to dissect_ssl3_handshake. Do not assume that this plaintext buffer might be encrypted, it is definitely not the case. Change-Id: I2ce9a5305e5cbc24b5c7e93077f7e796bf8cb406 Fixes: v2.5.0rc0-1314-g9d189c7e20 ("ssl: assume everything after CCS is encrypted") Ping-Bug: 14117 Reviewed-on: https://code.wireshark.org/review/23948 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-16checkAPI: error out on empty filelistJoão Valverde1-0/+2
This will help detect some bogus checkapi runs in the future. Change-Id: I43345e3a0a5471e9655f34e36ccf1562d6526758 Reviewed-on: https://code.wireshark.org/review/23946 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-16nfapi: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+3
Value stored to 'offset' is never read Change-Id: Ia7f651edec36a75c60816a3803e53dc86d749262 Reviewed-on: https://code.wireshark.org/review/23942 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-16nfapi: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+4
Value stored to 'item' is never read Change-Id: I964c06d1a3896e9e5c52dfcb2f17478f15350910 Reviewed-on: https://code.wireshark.org/review/23941 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-16lorawan: Fix Join Request and Join AcceptStig Bjørlykke1-5/+36
Use correct start offset for Join Request and Join Accept. Always show the MAC Header fields (and add the RFU). Add subtree for Join Request and Join Accept. Register the dissector to be able to "Decode As" and calling the dissector from Lua. Change-Id: I644530f2ae36f5a9d2ea89e4446995a5caa4eea4 Reviewed-on: https://code.wireshark.org/review/23944 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Erik de Jong <erikdejong@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-10-16GTK: Remove OSX integration library supportJoão Valverde7-319/+3
Only Wireshark Qt is officially supported on macOS. Change-Id: Id0e3429891173d4b91e99061bcf11df2e38bc0bf Reviewed-on: https://code.wireshark.org/review/23931 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>
2017-10-16protobuf: no previous prototype for ‘sint64_decode/sint32_decode’ ↵Alexis La Goutte1-2/+2
[-Wmissing-prototypes] Change-Id: I85be2eb645ab00d711f525d711ebf90f200595cc Reviewed-on: https://code.wireshark.org/review/23943 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>
2017-10-16autotools: remove some macOS specific build optionsJoão Valverde4-383/+85
This treats macOS/OSX like any other Unix-like build target, thus removing autotools support for macOS-specific build options. Anyone needing that is advised to use the fully-supported-on-macOS CMake build. Change-Id: I631464a90e16e3db89538801c741657a0a4a7451 Reviewed-on: https://code.wireshark.org/review/23911 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-16dissector/mqtt: Fix some inline commentsFlavio Santes1-17/+19
There are some issues with the inline comments. Rephrase those comments. Furthermore, use the MQTT v3.1 and v3.1.1 specification language to fix some inline comments. Change-Id: Ia3864e1b66ef1eb4bbd8cb90aed674c7d9c4b7be Signed-off-by: Flavio Santes <flavio.santes@1byt3.com> Reviewed-on: https://code.wireshark.org/review/23937 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>
2017-10-16dissector/mqtt: Add the protocol version stringFlavio Santes1-2/+12
Add the protocol version string: - 3 maps to MQTT v3.1 - 4 maps to MQTT v3.1.1 Change-Id: I8cf1ba0c1bcabd5718467946b33082e4eb5a37ed Signed-off-by: Flavio Santes <flavio.santes@1byt3.com> Reviewed-on: https://code.wireshark.org/review/23938 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>
2017-10-16dissector/mqtt: Add the MQTT protocol descriptionFlavio Santes1-2/+15
The packet-PROTOABBREV.c template recommends to provide a short description of the protocol below the license header. Currently, this information is not present in the packet-mqtt.c dissector. This patch adds the protocol description taken from the official specification. Links to the v3.1 and v3.1.1 specifications are also provided by this patch. Change-Id: I9bb85aa3b78c8804c923f77c163904a7949f6899 Signed-off-by: Flavio Santes <flavio.santes@1byt3.com> Reviewed-on: https://code.wireshark.org/review/23936 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-10-16RSVP: fix some typoAlexis La Goutte1-2/+2
Bug: 13977 Change-Id: I1caa721fe9e5c27354fbf6c07ebd2fa3c0c0d91a Reviewed-on: https://code.wireshark.org/review/23935 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-16cmake: fix CMP0026 deprecation warning in CMake 3.9Peter Wu2-30/+11
Since CMake 3.9, all policies before CMP0036 emit a warning. Fix the warning by not relying on the old behavior (existence of the LOCATION property). Tested with Ninja, the cmake output, rules.ninja and build.ninja output is identical (minus the deprecation warning). Change-Id: I058699380b01a9c02d9b98fd485ce6ded427abe3 Reviewed-on: https://code.wireshark.org/review/23915 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>
2017-10-16[RFC]androiddump: Support extcap-dlts optionMikael Kanstrup1-3/+30
According to README.extcap documentation all extcap tools must support the --extcap-dlts option. For performance reasons support for this option was removed by commit: 9328eb6 androiddump: Register interfaces when list interfaces A side effect of not implementing the option is that dumpcap is then also called to try to retrieve interface capabilities for all androiddump interfaces. As extcap interfaces are not local network interfaces errors like these are logged whenever the interface list is refreshed: Capture Dbg sync_if_capabilities_open Capture Info sync_pipe_run_command() starts Capture Dbg argv[0]: /usr/local/bin/wireshark/dumpcap Capture Dbg argv[1]: -i Capture Dbg argv[2]: android-tcpdump-wlan0... Capture Dbg argv[3]: -L Capture Dbg argv[4]: -Z Capture Dbg argv[5]: none Capture Dbg sync_pipe_open_command Capture Dbg read 25 ok indicator: E len: 333 msg: E Capture Dbg sync_pipe_wait_for_child: wait till child closed Capture Dbg sync_pipe_wait_for_child: capture child closed after 0.000s Capture Info sync_pipe_run_command() ends, taking 0.012s, result=-1 Capture Msg Capture Interface Capabilities failed. Error -1, The capabilities of the capture device "android-tcpdump-wlan0..." could not be obtained (android-tcpdump-wlan0...: SIOCETHTOOL(ETHTOOL_GET_TS_INFO) ioctl failed: No such device). Please check to make sure you have sufficient permissions, and that you have the proper interface or pipe specified. () To avoid error prints and to fulfil the documented equirements for extcap tools register a fake interface with what would be the properties of such an interface. Change-Id: If174adbb64c66132be4225f854bbf9f66d2f5ed1 Reviewed-on: https://code.wireshark.org/review/23093 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>
2017-10-16cmake: remove and reorder unused cmake policiesPeter Wu1-21/+7
Current minimum CMake version has everything up to CMP0017 enabled by default, remove older policies. CMP0011 had not effect, our link_directories are already absolute paths. Change-Id: I3af08ca75700de4a860fb4afd664824031e2c5f5 Reviewed-on: https://code.wireshark.org/review/23914 Reviewed-by: João Valverde <j@v6e.pt> 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>
2017-10-16Initial submission of the nfapi dissectorSimon Long5-0/+11740
Bug: 13726 Change-Id: I630d73c4c90b6fe6019a7ff6a38f9a3b4657eac3 Reviewed-on: https://code.wireshark.org/review/21493 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>
2017-10-15packaging: Fix RPM spec fileJoão Valverde1-1/+2
Change-Id: Ib05cfeb9ef553ebd69e388e6ba00ddf751deb686 Reviewed-on: https://code.wireshark.org/review/23934 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: refresh rpm-package targetJoão Valverde4-35/+12
There's only so much we can/should do here, so dispense with the _topdir test. Change-Id: Ibf1170ea2cbb7c536df901db42d67da668fd64b2 Reviewed-on: https://code.wireshark.org/review/23912 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15Add support for BASE_OUIMichael Mann11-124/+126
Modeled after BASE_PT_XXX, this will format a FT_UINT24 to look a OUI, in the form of: XX:XX:XX (Manufacturer Name) for display. For display filtering, it will treat the value as hexadecimal. It requires that FT_UINT24 be the field type. Change-Id: I8716ae4dfcd4e854764a2425e2ff13c50f571d52 Reviewed-on: https://code.wireshark.org/review/23869 Reviewed-by: Richard Sharpe Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-15rlc: Fix bug in 'RLC over UDP' dissectorDarien Spencer1-0/+4
Reassembly of AM/UM packets doesn't work when the URNTI tag is missing and the default value of 0 is kept. This patch makes the default value 1 for those cases. Bug: 14129 Change-Id: Id13121b5de63da4318214871b8963ceef5d28cf0 Reviewed-on: https://code.wireshark.org/review/23930 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>
2017-10-15rrc: Dissect algorithm capabilitiesDarien Spencer3-53/+222
asn2wrs created fields for several BITSTRING bits but does not actually uses them. This changeset calls them for the umts ciphering/integrity algorithms and gsm algorithms Change-Id: I88ddc2aec6805a77fcb3f3d547efda4d513ec919 Reviewed-on: https://code.wireshark.org/review/23899 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>
2017-10-15plugins: Remove COPYING and NEWSJoão Valverde16-4147/+8
We don't need to be this strict for bundled plugins about following the GNU Coding Standards. Change-Id: I18ed1b81d428eea15ea387102823f588287daf81 Reviewed-on: https://code.wireshark.org/review/23918 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>
2017-10-15ZigBee ZCL: Add additional On/Off cluster commandsBrenton Rothchild1-11/+181
Adds support for additionally defined On/Off cluster commands and attributes. Bug: 14109 Change-Id: I148722a5f36800d8778c721a6c60cab17a030b0c Reviewed-on: https://code.wireshark.org/review/23852 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-15autotools: make maintainer-clean should allow rerunning 'configure'João Valverde50-157/+10
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d Reviewed-on: https://code.wireshark.org/review/23928 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>
2017-10-15Makefile(.am/dissectors): fix indent (always use tabs)Alexis La Goutte1-1/+1
Change-Id: I652bd3657e335edd9f0c27a29fd360f0bc7d1c12 Reviewed-on: https://code.wireshark.org/review/23923 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-15plugins: Fix -Wmissing-prototype for plugin_register()João Valverde1-0/+2
Change-Id: I03d5ca01fb3bc8fdae86b44e857a4b9a3c7f48d2 Reviewed-on: https://code.wireshark.org/review/23927 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>
2017-10-15Remove superfluous null-checks before strdup/freeAhmad Fatoum89-564/+220
NULL checks were removed for following free functions: - g_free "If mem is NULL it simply returns" https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html#g-free - g_slist_free(_full)? "NULL is considered to be the empty list" https://developer.gnome.org/glib/stable/glib-Singly-Linked-Lists.html - g_strfreev "If str_array is NULL, this function simply returns." https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strfreev - g_slice_free "If mem is NULL, this macro does nothing." https://developer.gnome.org/glib/stable/glib-Memory-Slices.html#g-slice-free - g_match_info_free "not NULL... otherwise does nothing" https://developer.gnome.org/glib/stable/glib-Perl-compatible-regular-expressions.html#g-match-info-free - dfilter_free defined in Wireshark code. Returns early when passed NULL epan/dfilter/dfilter.c They were also removed around calls to g_strdup where applicable: - g_strdup "If str is NULL it returns NULL." https://developer.gnome.org/glib/stable/glib-String-Utility-Functions.html#g-strdup Change-Id: Ie80c2db89bef531edc3aed7b7c9f654e1d654d04 Reviewed-on: https://code.wireshark.org/review/23406 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>
2017-10-15Fix commentJoão Valverde1-1/+1
Change-Id: Idebca52f2dbebbfc9edb132c3e8ca8d6e1ef79f4 Reviewed-on: https://code.wireshark.org/review/23926 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: Make some installation hints more visibleJoão Valverde1-19/+6
Change-Id: I347f2983f5d8f11791d0ed0e51ba51de36b1d11f Reviewed-on: https://code.wireshark.org/review/23925 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15Revert "autotools: dispense with some installation warnings/notes"João Valverde1-0/+44
This reverts commit 79cdf3a8201ca27abf2bea29e9b9c6b3107ea5db. Change-Id: I019a037e399859b613456283e35cf81f5932b21c Reviewed-on: https://code.wireshark.org/review/23924 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: dispense with some installation warnings/notesJoão Valverde1-44/+0
These are not (easily) visible during installation and are better suited for documentation anyway, as implied in the Makefile comments. Change-Id: Id2581f6e8dfc05f1a6c0de918a0f687f025e6d12 Reviewed-on: https://code.wireshark.org/review/23910 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>
2017-10-15[Automatic update for 2017-10-15]Gerald Combs2-4/+51
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ic0da94f81172212f1688ccb8213f3ee912256600 Reviewed-on: https://code.wireshark.org/review/23919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-15ssl: assume everything after CCS is encryptedPeter Wu3-0/+16
After ChangeCipherSpec, record fragments are encrypted. Use this strong hint to fix misinterpreting the explicit nonce as a handshake message. One edge case remaing unsolved though, if an encrypted Finished message follows the CCS in the same TCP packet, then it could still be misinterpreted. Bug: 14117 Change-Id: Ie54bb5335f115d0fd8f05a13d1c826e3807cbbd3 Reviewed-on: https://code.wireshark.org/review/23900 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-10-15autotools: dispense with desktop-file-installJoão Valverde2-15/+1
Change-Id: I20717e669709bde6c7b1ff7d10f928e2ec2cc263 Reviewed-on: https://code.wireshark.org/review/23909 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: dispense if-else shellcheck testJoão Valverde2-9/+2
Change-Id: I1fd63442b27460ef21b2aaf4e3639a7d12c72c6e Reviewed-on: https://code.wireshark.org/review/23908 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15autotools: remove unused variablesJoão Valverde2-6/+0
Change-Id: I1636358f76c7c230b8b464a17dddf520b723b36b Reviewed-on: https://code.wireshark.org/review/23907 Reviewed-by: Guy Harris <guy@alum.mit.edu> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15Rename ui_util.h -> ws_ui_util.hPeter Wu36-37/+37
In preparation for possibly using AUTOUIC in CMake which treats "ui_*.h" files specially, rename ui_util.h. No other changes. Change-Id: Id026572c000b713ff0e9388dc7fff8d81d4df73e Reviewed-on: https://code.wireshark.org/review/23916 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-15Tshark: Optional packet summary for ElasticsearchChristoph Wurm4-52/+88
Currently, the Elasticsearch output exports the packet details and, if -x is specified, the raw hex data. This change adds the option of exporting the packet summary as well. The default stays the same (packet details only), but now the existing -P switch turns on printing of the packet summary. It also turns off printing packet details, which can be turned back on with -V to print both, and combined with -x to print all three: summary, details and raw hex. The packet summary is especially useful when exploring and visualizing the data in Kibana, e.g. by displaying the summary "Info" field/column in a table, as in the Wireshark GUI. Change-Id: I2030490cfdd905572397bc3d5457ba49d805a5c4 Reviewed-on: https://code.wireshark.org/review/22716 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-15FindPOD.cmake: look for pod2man.batPeter Wu1-0/+1
Strawberryperl 5.26.1.1 installs "pod2man.bat" but not "pod2man" so find_program cannot locate it. Change-Id: Iebfe2efec220085b15a4d73681da9cc7ea6a5360 Reviewed-on: https://code.wireshark.org/review/23913 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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-22 00:13:46 +0000