aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-15udpdump: add space.Dario Lombardo1-1/+1
Change-Id: I44960f64f16434ccdf033eaa2bfa96579da7cc4b Reviewed-on: https://code.wireshark.org/review/24439 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-11-15kerberos: Don't generate unused _vals tablesStig Bjørlykke2-41/+33
Put PA-FX-FAST-REPLY and PA-FX-FAST-REQUEST in .NO_EMIT ONLY_VALS Change-Id: If0476c6d2bb78a15e3b984a7edafc3a7800fa490 Reviewed-on: https://code.wireshark.org/review/24436 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-15QUIC: fix STOP_SENDING lengthAlexis La Goutte1-1/+1
Change-Id: I954425bb54f9511ba2cea50adfa8c69ea322267c Reviewed-on: https://code.wireshark.org/review/24429 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-15Qt: Update UAT clear button enablingStig Bjørlykke1-0/+1
Check for enabling the clear button when loading a UatFrame. Change-Id: Id9bbe4f99314d2798c4bccf10b57db99431a00fd Reviewed-on: https://code.wireshark.org/review/24412 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-15JXTA: Remove some assertions.Gerald Combs1-198/+213
g4d2e653901 in 2009 removed some "if (tree)" checks, which in turn exposed some DISSECTOR_ASSERTs which trigger on short packets. Add an expert info field for truncated media data and comment out the assertions. The jxta-spec.dev.java.net specification link is dead. Add what appears to be the current location. Change-Id: Ic669c6631c6058a853d69ecd38ef4d2065c7eb24 Reviewed-on: https://code.wireshark.org/review/24426 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-15JXTA: Simplify some expressions.Gerald Combs1-48/+48
The sizes of guint8, guint16, and guint32 are always 1, 2, and 4 bytes respectively. Just use 1, 2, and 4. Change-Id: I857d33873cc5831ba23544475f721e485b8bd817 Reviewed-on: https://code.wireshark.org/review/24427 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-15Handle LINKTYPE_JUNIPER_ST 200.Anders3-5/+39
Bug: 14195 Change-Id: Ic6be8e1f8169968c48376984c0d1a1a69c67f32a Reviewed-on: https://code.wireshark.org/review/24415 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-15UI: Fix seg fault of software update language initUli Heilmeier1-2/+2
Set only software update language when language is configured. Change-Id: If3f0e304b95863a30fb7bb69197addf4bad689c7 Reviewed-on: https://code.wireshark.org/review/24414 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-14Kerberos - Add support for RFC 6113Michael Mann8-84/+615
Bug: 8974 Change-Id: I43998a64fc34dfeb1c0a8d702d5bdc5aa74d57de Reviewed-on: https://code.wireshark.org/review/17879 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-14Qt: Change delete_list icon transparent valueStig Bjørlykke2-0/+0
Update the delete_list icon to have same transparent value as the other icons used in UAT handling. Change-Id: I5de7f3d6c0292e6ffde7d8cfd08a899e135fe108 Reviewed-on: https://code.wireshark.org/review/24411 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-14mqtt: Copy UAT match_criteria valueStig Bjørlykke1-0/+1
Change-Id: Ifdb743bcf1f644d412d1ac35801347b5355d1754 Reviewed-on: https://code.wireshark.org/review/24410 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-14Revert "Windows tests:"Graham Bloice1-3/+0
This reverts commit b4fc532372f0add6bf1434a54aa1a3a457ab3a88. No longer required. Change-Id: I0ec135d7b54f2aa1b8369fe8192fd2e725ffd5a8 Reviewed-on: https://code.wireshark.org/review/24409 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-14CMake: Make Qt5 packages required if building Qt versionGraham Bloice1-0/+8
This stops folks failing when they don't have Qt but are still attempting to build the Qt version. Change-Id: I31eb9433b25ca9a717cd10bc165f3820ae31687e Reviewed-on: https://code.wireshark.org/review/24406 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-14Windows tests:Graham Bloice1-0/+3
Add some debug info to the failing tests by displaying the LANG var. Change-Id: I0a7316d06a6aca035b46c3e6211ac8e93425e295 Reviewed-on: https://code.wireshark.org/review/24407 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-14CMake,editcap: avoid noise with editcap -F and -T optionsPeter Wu2-5/+13
Avoid printing a noisy "option requires an argument" error when using '-T' and '-F' as documented. Fix warning that started showing on macOS with CMake 3.9.4 about CMP0058 since v2.5.0rc0-1180-g799f4f0e14. Change-Id: Ie0cc352c6b0b2724997e7fe6b49fd5b1f02d1e07 Reviewed-on: https://code.wireshark.org/review/24404 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Ahmad Fatoum <ahmad@a3f.at> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-13MPLS: use directly proto_tree_add_item for display PW ACH Channel TypeAlexis La Goutte1-6/+3
Ping-Bug 14208 Change-Id: Idefa2611fd6725b65c1994ef1f4ff4b00fcf67c7 Reviewed-on: https://code.wireshark.org/review/24403 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13Remove circuit_id from Lua testsMichael Mann1-5/+0
It was removed from packet_info when circuit API was removed. Remove tests that call circuit_id for testing. Change-Id: I88e54b288d9d8f99b63e0828663b3025c57e0ec8 Reviewed-on: https://code.wireshark.org/review/24400 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-13RDM: Add ACK timer and ACK overflow handlingErwin Rol1-228/+296
Change-Id: I1531e84b91becba97300cf30f8bbfd12290ced61 Signed-off-by: Erwin Rol <erwin@erwinrol.com> Reviewed-on: https://code.wireshark.org/review/24396 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13[PFCP] minor correctionsJoakim Karlsson1-7/+11
Change-Id: I981c7bb9b601a38abeeb21d67ff4f7af824c234e Reviewed-on: https://code.wireshark.org/review/24398 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13Remove circuit APIMichael Mann34-651/+194
Replace with conversation API that limits the "endpoint" to a single uint32 value. The intention is to eventually have "layered" endpoints, because circuit_id was used in cases where src/dest port have already been populated (and are used for layers above). Those src/dest ports should just be treated as just another endpoint, but we currently only have support for one. Change-Id: Ic6aa7ef0241275aa4dfde9459194369b48c72960 Reviewed-on: https://code.wireshark.org/review/24369 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-13Qt: Really fix the packet list selectionRoland Knall3-5/+5
Really fix the selection of a row in the packet list Change-Id: I87ab36146bd9b2a130f443717ce73609a1c0b656 Reviewed-on: https://code.wireshark.org/review/24397 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12Qt: ToolbarMimeData and displayRoland Knall3-17/+34
Implement the mime data for the toolbar in the same fashion as it has been done for the drag-drop of the field filter. Change-Id: I2b1ac7f82b637c999f458700c9ab24a9e4dcbcb8 Reviewed-on: https://code.wireshark.org/review/24378 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-12mqtt: Use proto_tree_add_item_ret_uint()Stig Bjørlykke1-24/+14
Change-Id: Iccbbb007b4d733b812e2a2cb528477b1417bed6e Reviewed-on: https://code.wireshark.org/review/24394 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Flavio Santes <flavio.santes@1byt3.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-12Qt: Show ByteView for first packetStig Bjørlykke1-1/+1
Change-Id: Ie5b09f0ac8db0adb999633f3367339b8f50eabe9 Reviewed-on: https://code.wireshark.org/review/24395 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-12Qt: Select correct packet from listStig Bjørlykke1-2/+1
Change-Id: Id29d74506f7f009b7f14a86d8fc7c299711c4c2c Reviewed-on: https://code.wireshark.org/review/24393 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-12Link with ZLIB_LIBRARIES if you link with wiretap.Guy Harris1-1/+3
Wiretap may use zlib; if it does, ZLIB_LIBRARIES is set to refer to zlib. On UN*X, you may be able to get away with linking a dynamically-linked shared library with other dynamically-linked shared libraries and not linking programs linked *with* that shared library with those other shared libraries, but that may not work on Windows. We link most programs that use wiretap with ZLIB_LIBRARIES; do so with androiddump and randpktdump as well. Bug: 14207 Change-Id: I8e94197e06f5fd0ff8c95aa509dbcc2ff2a44cd4 Reviewed-on: https://code.wireshark.org/review/24389 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-12Fix typo.Anders1-1/+1
Change-Id: I99f122fb154aedce7c129043d55661ce4de09bbc Reviewed-on: https://code.wireshark.org/review/24388 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12[Diameter] Fix typo avp name="OC-Feature-Vector" code="622"Anders1-1/+1
Change-Id: I678d6f4aa563630db1abdfe03474166de18b2a01 Reviewed-on: https://code.wireshark.org/review/24387 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12extcap: use SPDX identifiers for licences.Dario Lombardo10-130/+10
Change-Id: Id56687f86f4c60494dad0b6d58550ee45b0b203c Reviewed-on: https://code.wireshark.org/review/24381 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12ssl-utils: Add export ssl_data_allocAlexis La Goutte2-1/+7
For reuse on QUIC dissector Change-Id: I005fc3fe7a559fdb7a62e3d40450a4a6b25bf2f5 Reviewed-on: https://code.wireshark.org/review/24383 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12Fix "might be clobbered by 'longjmp' or 'vfork' warningUli Heilmeier1-2/+2
Change-Id: I51ec17b5eabe7b0f9fc68f4cf599ca55b8e4631d Reviewed-on: https://code.wireshark.org/review/24385 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12[PFCP] Update to 3GPP TS 29.244 V14.1.0 (2017-09)Joakim Karlsson1-36/+347
Change-Id: I69ad8c9a852f400e2918c4eca7365c719df734f5 Reviewed-on: https://code.wireshark.org/review/24380 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-12Qt: Rename packetSelection to frameSelectedRoland Knall15-59/+81
In order to consolidate the interfaces between certain parts of the UI, the signal emitted after a frame change has occured, has to include the number of the frame. This led to two signals for frame change, and therefore packetSelection is to be removed. Change-Id: I24e0e0890291d2243935b0c48387beb66904bfa3 Reviewed-on: https://code.wireshark.org/review/24377 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-12Qt: Fix DragDrop on ProtoTreeRoland Knall1-0/+11
Fix two issues, first that you could not move the scrollbar as it would initiate a drag-drop operation. Second, if you start a drag-drop operation at the top of a field, it would select the field you move over as well. Change-Id: I553785b1b6c586919e025d3042a876701f36860d Reviewed-on: https://code.wireshark.org/review/24376 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-12Qt: Clear up the labelRoland Knall1-1/+1
The modifier key is a hidden option for now, with the label only showing the filter expression and the description Change-Id: I4c983ed0d4fadbd69f0836ecfc85ea8e1109478e Reviewed-on: https://code.wireshark.org/review/24379 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-12Qt: Add Modifier to drop only fieldRoland Knall4-11/+39
Add a modifier to the drag-drop operation, to only drop the field name as filter, instead of the complete filter expression Change-Id: I9da96906575397191e821e3494a42e0f10d51f45 Reviewed-on: https://code.wireshark.org/review/24375 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-12Qt: do not crash when selecting a field without tvbPeter Wu1-2/+2
If no tvb is attached to a field, crashing is not the expected result. Change-Id: Ica0e95326cfcfeb015016770d1b930a9f0447066 Fixes: v2.5.0rc0-1627-g8a6ea0e454 ("Qt: Further cleanup ByteView") Ping-Bug: 14205 Reviewed-on: https://code.wireshark.org/review/24370 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-12[Automatic update for 2017-11-12]Gerald Combs11-147/+267
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I18adb8aceae2a8962697284087d43e3b30d133f1 Reviewed-on: https://code.wireshark.org/review/24371 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-12ieee1905: Use BASE_UNIT_STRING and &units_dbm rather than appendingRichard Sharpe1-31/+16
the string 'dBm'. Change-Id: I5f4ddcf98902c53f6f014e64b51eb4c3c263e7e1 Reviewed-on: https://code.wireshark.org/review/24368 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-11mqtt: Whitespace and indent fixesStig Bjørlykke1-311/+322
Change-Id: Ie6470cd20871b0aac17d19c67aba4b7229f906e6 Reviewed-on: https://code.wireshark.org/review/24367 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-11autotools: rename libui_dirty to libui_generatedJoão Valverde2-14/+8
Change-Id: I382fbc2af5c42772e4feb65f33ea2a326b9b5c62 Reviewed-on: https://code.wireshark.org/review/24351 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11autotools: Be more consistent with variable namesJoão Valverde1-7/+7
Change-Id: I644fbe7796a83c98861a4ebb9200ee41de27c897 Reviewed-on: https://code.wireshark.org/review/24350 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11Wi-SUN Protocol dissection and IEEE 802.15.4 IE cleanup.Owen Kirby6-479/+1592
This patch adds dissection for the Wi-SUN Field Area Network standard. Wi-SUN packets are encoded as a collection of IEEE 802.15.4 information elements. This required a bit of refactoring in how the IE dissector table is handled so that external protocols could supply their own dissectors. While I was working with the IEs, I also added support for the TSCH Timeslot and Global Time IEs from the IEEE 802.15.4 standard in addition to some general cleanup. Change-Id: I2858e4ab577756568e33b86adfe282967899abd5 Reviewed-on: https://code.wireshark.org/review/24331 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11address(.h): fix commas at the end of enumerator lists are a C++11 extension ↵Alexis La Goutte1-1/+1
[-Wc++11-extensions] Change-Id: Ibfc95e085b2712f7a71f6559ae205de87aab12f6 Reviewed-on: https://code.wireshark.org/review/24365 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11WPS: no previous prototype for ‘proto_reg_handoff_wps’ ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: Icb5220af362a25f081f0b5d33f92a9013723bca9 Reviewed-on: https://code.wireshark.org/review/24364 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11RIP: no previous prototype for ‘proto_reg_handoff_rip’ ↵Alexis La Goutte1-0/+1
[-Wmissing-prototypes] Change-Id: I49e6ecec2e3998ff212069e88618bea36935c894 Reviewed-on: https://code.wireshark.org/review/24363 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-11[PFCP] OHC: fix Port number field presentJoakim Karlsson1-4/+13
Port number should only be included with UDP/IP header Change-Id: Ie2655d2b6f1b755bff47e74723f36b1ee87170f9 Reviewed-on: https://code.wireshark.org/review/24361 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-11[PFCP] display changesJoakim Karlsson1-4/+4
For readability, DEC<->HEX and "IE length" Change-Id: I753d8f6cba43a6b34fd06b49b1ffa96f13790c67 Reviewed-on: https://code.wireshark.org/review/24360 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-11[PFCP] F-TEID: add missing TEIDJoakim Karlsson1-1/+12
Change-Id: I4668208b5bf1d2cc168c7aa8f593510d55f27c23 Reviewed-on: https://code.wireshark.org/review/24359 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-11-11asciidoc.conf, sort-and-group: (trivial) fix a commentMartin Kaiser1-1/+1
sort-and-group produces a comma-separated list, the last two entries are separated by "and" Change-Id: I3e6c153c764641664453c4d091fdb84bb308e689 Reviewed-on: https://code.wireshark.org/review/24366 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>