aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-18.mailmap: update (of November)Alexis La Goutte2-1/+2
Change-Id: Ia42fe05bbc250944441576a3b7894839f4fe6ed2 Reviewed-on: https://code.wireshark.org/review/24452 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18ieee1905: Fix the incorrect dissection of radio operation restrictionRichard Sharpe1-4/+11
The dissection was really wrong. Fixed now I have seen captures. Change-Id: I038fbf8786306fad9c65c87aa5d58c155113c442 Reviewed-on: https://code.wireshark.org/review/24476 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18Qt: Use QThreadPool instead of QThread.Gerald Combs1-4/+4
I'm not sure how many Qt worker threads we're going to create at startup, but using a thread pool is simple enough. Change-Id: I66c3e1e628f8c38c8e3322e0c01ee5fccda2a98e Reviewed-on: https://code.wireshark.org/review/24473 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>
2017-11-18ieee80211: Complete fixed size fields for SAE authenticationCedric Izoard1-2/+200
SAE authentication (used for mesh-point) introduced new non IE fields (aka fixed size fields) that require explicit parsing. The tricky part is that some of those fields don't have a fixed size... - 'scalar' and 'finite field element' size depend of the group used. Retrieve size of all groups supported by wpa_supplicant. - 'anti-clogging token' size is not specified. Bug: 14222 Change-Id: Id0aa8790c55b21b2797ba131de9e46c32519e2cc Reviewed-on: https://code.wireshark.org/review/24446 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-18Qt: Properly reset the byteviewRoland Knall4-1/+24
Reset the byteview on every load of a capture file, and on every start/reset of a capture Change-Id: I0edd30ffddc64484bc6f009d99dfc6fc1a3ceb59 Reviewed-on: https://code.wireshark.org/review/24468 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-18IEEE 802.11: fix an infinite loopPascal Quantin1-1/+1
Presumably the element length is unsigned, otherwise it can be negative and reincrement tag length. Bug: 14231 Change-Id: I26d339aea7588a489b4252b67c212810029bff0e Reviewed-on: https://code.wireshark.org/review/24472 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-17Qt: Initialize QMimeDatabase in a worker thread.Gerald Combs3-11/+53
As part of its initialization, QMimeDatabase parses the freedesktop.org shared-mime-info database, which is a large-ish (2 - 4 MB) XML file. This takes about 85 - 90 ms here. We first access QMimeDatabase in our startup sequence when we load the normal and capture application icons. Create a worker thread that initializes QMimeDatabase as early as possible and load load the normal and capture icons as late as possible. Change-Id: I27e3d65d8ee1308a62d12d3ff7e1b95f82c2e75a Reviewed-on: https://code.wireshark.org/review/24471 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-17Qt: Fix selection of elementsRoland Knall2-9/+76
If two elements existed with the same filter expression, the first element got selected allways. This is much more secure, as it only takes the label into account. If the user by accident created two buttons with the same filter expression, but different label and wants to remove the second button, the first one no longer will be removed instead of the second one. Change-Id: I16130aa69cb853aedb9a5c9b0bbbb3eb64b467d1 Reviewed-on: https://code.wireshark.org/review/24399 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-17fp: Fix mac TVB for edch t1Darien Spencer1-2/+2
Using the '_caplen' function with length of -1 leads to a "truncated RLC" error. Change-Id: I5a5f650b244de1167ff7110558ad0559d0422103 Reviewed-on: https://code.wireshark.org/review/24462 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-173GPP NAS: fix dissection of PCO MSISDN container IDPascal Quantin1-3/+2
3GPP 24.008 is not very explicit regarding the encoding, but after rereading 3GPP 23.003 and 3GPP 29.272, it is most likely the E.164 number in TBCD encoding (so without TON/NPI byte). Change-Id: Iae58ccc2919d28cb802015205b3b5fb97a1c4abe Reviewed-on: https://code.wireshark.org/review/24463 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-11-17WSDG: Improve VS2015 chocolatey installGraham Bloice2-4/+95
Created an AdminDeployment.xml file for use with the chocolatey package for VS2015 Community Edition and updated the WSDG to include it. Bug: 14147 Change-Id: Id2a701067bf38874cf0bf534cca55dba9cfd30d4 Reviewed-on: https://code.wireshark.org/review/24464 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2017-11-17[Juniper ST] Dissect the "known" parts of the Juniper header.AndersBroman1-9/+83
Ping Bug: 14195 Change-Id: I7ab05857c054a0d914db9373d182008215d67367 Reviewed-on: https://code.wireshark.org/review/24461 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17rrc: fixed incorrect constantsDarien Spencer2-4/+4
The macinf->content field should be compared to MAC_CONTENT_* and not MAC_* Change-Id: I0dee7855938095c5d1c53f4db13003b90cf7ba91 Reviewed-on: https://code.wireshark.org/review/24460 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17ieee80211: Add dissection of BSS Transition QueryAlexis La Goutte1-0/+66
Bug: 14220 Change-Id: Iec155a6fbb179bd0e0aaf8b10fd7d420dc1a69bb Reviewed-on: https://code.wireshark.org/review/24453 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17register(.h): fix parameter 'register_cb' not found in the function ↵Alexis La Goutte1-2/+2
declaration [-Wdocumentation] Change-Id: I78afc76dcef56e46e296988299cab58c93eaeb03 Reviewed-on: https://code.wireshark.org/review/24459 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-17No need for a read/write descriptor for the output file.Guy Harris1-1/+1
Change-Id: I66539b27f09d3a5acaae2c0ee080bca984c17468 Reviewed-on: https://code.wireshark.org/review/24457 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-17Allow dumpcap to write to a named pipe.Guy Harris1-0/+5
We didn't actually bother *opening* the named pipe if it wasn't named "-" (meaning "use standard output"). Hilarity^WRandom failure behavior ensued. Change-Id: If73cea232b13de664630d587167167ef53a95cba Reviewed-on: https://code.wireshark.org/review/24454 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-16[PFCP] add port 8805Joakim Karlsson1-2/+3
Port assigned by IANA Change-Id: Ic04bc41878561239c83025ff2d5573daf7947b5b Reviewed-on: https://code.wireshark.org/review/24451 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>
2017-11-16gitlab-ci: add clang builds.Dario Lombardo1-24/+38
From clang 3.5 to 4.0, using official ubuntu docker image. Change-Id: I60f41f2eb83990e4298ece27027413994d4f6440 Reviewed-on: https://code.wireshark.org/review/24405 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-16Register protocols and handoffs in separate threads.Gerald Combs3-32/+116
Instead of interleaving protocol registrations and status callbacks in the main thread, move protocol registrations to a worker thread. Do the same with protocol handoffs. This *should* be safe since the status callbacks only update the UI. This reduces startup time by about 200ms on my laptop: Run OS Thread? Time 1 macOS N 340 ms 2 macOS N 260 ms 3 macOS N 252 ms 4 macOS Y 147 ms 5 macOS Y 146 ms 6 macOS Y 142 ms 7 Win 7 N 80 samples 8 Win 7 N 56 samples 9 Win 7 N 75 samples 10 Win 7 Y 31 samples 11 Win 7 Y 2 samples 12 Win 7 Y 0 samples macOS was sampled using Instruments. Windows 7 was sampled using the Visual Studio 2015 profiler. We should do the same thing with our capture and tap event loops, but that will likely require quite a bit more work. Change-Id: Iac9a81d8f71668f5979b524744a03f6d80aee893 Reviewed-on: https://code.wireshark.org/review/24447 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>
2017-11-16Qt: Add UAT move up and down buttonsStig Bjørlykke13-0/+184
Add two new buttons for moving entries up and down in the list. Change-Id: I90e5c5812754391651885e2a622148cecc124099 Reviewed-on: https://code.wireshark.org/review/24413 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-16Registering CMP PKIMessage as BER dissectorMartin Peylo2-31/+25
Decoding ASN.1 BER as PKIMessage enables to examine a CMP (RFC 4210) message which was saved as file. Along the way, improving dissect_cmp_pdu function parameters to match required API for register_ber_syntax_dissector(), factoring in creation of asn1_ctx. Change-Id: I3284e6de9255e2b3cbf142c2904226b7e45b31f8 Reviewed-on: https://code.wireshark.org/review/24445 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-15Explain where GeoIP_free comes fromJoão Valverde3-2/+6
Change-Id: I0a354cde4587a041bdb1fa4147bd88eed24ceb76 Reviewed-on: https://code.wireshark.org/review/24356 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-15Qt: Show as much as possible of UAT pathLabelStig Bjørlykke2-26/+0
Remove the horizontal spacer between buttons an path label in UAT views to show as much as possible of the path label. Change-Id: I99d21ff6a1d151c9fcf83200a88b34b2e0c8eb5d Reviewed-on: https://code.wireshark.org/review/24444 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
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>