Commit Graph

687 Commits

Author SHA1 Message Date
Pascal Quantin 5dabd51742 Windows: upgrade Npcap to 0.9991
Change-Id: I5c664a26ede1a5904d4f02a38c43af6c15dce5f9
Reviewed-on: https://code.wireshark.org/review/37152
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-05-05 19:35:29 +00:00
Pascal Quantin 0d12aaf0d1 Windows: upgrade Npcap to 0.9990
Change-Id: I41fb7e78b688f6be0c3f93dafe3a651a41728288
Reviewed-on: https://code.wireshark.org/review/36727
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-04-06 19:18:01 +00:00
Pascal Quantin 42010a64a4 Windows: upgrade Npcap to 0.9989
Change-Id: I33b58029d2017cda090a55960089b048de7f9224
Reviewed-on: https://code.wireshark.org/review/36508
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-03-19 21:14:00 +00:00
Pascal Quantin fd6490fa8e Windows: upgrade Npcap to 0.9988
Bug: 16329
Change-Id: I3348049369c55bf84380d90fc699c8d1d8604c58
Reviewed-on: https://code.wireshark.org/review/36323
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-03-07 12:57:40 +00:00
Pascal Quantin a6614f995c Windows: upgrade Npcap to 0.9987
Change-Id: I6f1fcbb49b0002a4273fea449cd7346f4f0f1f58
Reviewed-on: https://code.wireshark.org/review/36031
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-02-04 21:05:27 +00:00
Jirka Novak 12a13a6926 RTP: decode iLBC payload
It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc).

Bug: 16314
Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e
Reviewed-on: https://code.wireshark.org/review/35686
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-20 07:50:08 +00:00
Gerald Combs f9c2b3aa79 NSIS: Fix a dangling output path.
The updates to windeployqt-to-nsis.ps1 g7a09c78f12 added SetOutPath
calls to qt-dll-manifest.nsh. This means we need to reset the output
path before adding our translation files.

Change-Id: I4b4ede72efa67cc4617aaae5baf8d38df6952df7
Reviewed-on: https://code.wireshark.org/review/35705
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-09 00:35:53 +00:00
Gerald Combs 200124d420 NSIS: Make the licensing page match reality.
The NSIS licensing page is centered around making the user agree to
a EULA. We don't have one of those. Replace the "you must accept" and
"I agree" text with something more neutral.

We could alternatively omit with the licensing page altogether, but
the GPL is an important aspect of the project and deserves some sort
of mention.

Bug: 1115
Change-Id: I5fd5beac2188b61a90c2842de7d7547aa815ff4f
Reviewed-on: https://code.wireshark.org/review/35624
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-08 04:55:50 +00:00
Gerald Combs 8b7e251bac NSIS: Build Unicode installers / uninstallers.
Recent versions of NSIS have deprecated ANSI installers, so enable
Unicode.

Change-Id: I263568f83b7f96871e056ba590db300b23dbdc80
Reviewed-on: https://code.wireshark.org/review/35681
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-07 19:43:42 +00:00
Gerald Combs 7a09c78f12 NSIS: Don't package .pdb files.
We run `windeployqt ... --pdbs` at build time, which means that we need
to be careful not to include them in the NSIS package. Switch from using
wildcards ("File ...\*") to using separate "File" commands for each file.

Simplify the PDB Zip package command while we're here.

Bug: 16307
Change-Id: Ibd9bcbdfdc216f1f6a067baf711bbc184845143f
Reviewed-on: https://code.wireshark.org/review/35670
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-06 19:50:50 +00:00
Pascal Quantin 5d342b01e3 Windows: upgrade Npcap to 0.9986
Change-Id: I9ee3144416eb5564aa8974aeec0e33774edc7ed7
Reviewed-on: https://code.wireshark.org/review/35498
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-12-19 04:57:57 +00:00
Gerald Combs 6f9efa7583 More Qt minimum version updates.
Update the minimum version in various documents. Remove some
no-longer-needed code from scripts that call windeployqt.

Change-Id: I16da4bced9780c9f1b1969aae7c52e2fce1968aa
Reviewed-on: https://code.wireshark.org/review/35391
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-12-10 19:52:58 +00:00
Gerald Combs 63945535ac NSIS: The "Sshdump" option installs Ciscodump as well.
Use consistent capitalization while we're here.

Change-Id: I0591654b0e73d33528f9cfe990a1491ce6cccc8b
Reviewed-on: https://code.wireshark.org/review/35278
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-02 01:30:32 +00:00
Gerald Combs 11be78a61f NSIS: Don't run Wireshark from the installer.
Remove the option to run Wireshark from the NSIS installer. As noted in
bug 16195, this runs Wireshark as Administrator which is something we
recommend against.

Bug: 16195
Change-Id: I0692262a611d72d9e9f9c2131ce71cc62b4737b1
Reviewed-on: https://code.wireshark.org/review/35143
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-20 04:39:53 +00:00
Pascal Quantin 99effcada2 Windows: upgrade Npcap to 0.9984
While we are at it, let's deactivate by default the legacy loopback adapter installation

Change-Id: I4950e9dc6de8a2faeda272c03165a9f305862f6b
Reviewed-on: https://code.wireshark.org/review/35004
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-06 16:37:57 +00:00
João Valverde 97cb389a35 Revert "CMake: Don't install HTML manuals twice"
This reverts commit f1285fcf06.

NSIS package is broken with this commit.

Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
Reviewed-on: https://code.wireshark.org/review/34758
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:58:41 +00:00
João Valverde f1285fcf06 CMake: Don't install HTML manuals twice
HTML docs are installed to both $docdir and $pkgdatadir. Fix that
to install to $docdir only.

Change-Id: I115158585b6df9170d9a01249adbc8548df91f14
Reviewed-on: https://code.wireshark.org/review/34640
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2019-10-09 13:24:58 +00:00
Tomasz Moń a758e31b90 CMake: Include glib dlls in Windows installer
In debug builds different glib .dll files are being used than in release
builds. List all .dll files in (generated) nsis all-manifest.nsh and WiX
DependentComponents.wxs guarding the debug files under BUNDLE_DEBUG_DLLS
ifdef. CMake generator expression is used to include /DBUNDLE_DEBUG_DLLS
parameter to MakeNSIS in debug builds. Similarly, -dBUNDLE_DEBUG_DLLS is
added to WiX candle in debug builds.

Change-Id: Ibfe7a640d25ba25f14bb910708ab83d0634d48db
Reviewed-on: https://code.wireshark.org/review/34703
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-04 18:16:35 +00:00
Marcus Sundberg 1f01322dc0 Add RADIUS dictionary for Aptilo Access Controllers
Change-Id: I058aacf1bdb2a6151ad370ed09febe79b1886701
Reviewed-on: https://code.wireshark.org/review/34594
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-23 14:53:38 +00:00
Pascal Quantin 31abf81250 Windows: upgrade Npcap to 0.9983
Change-Id: I05a0eb274d8890711d47c95db1b925682baa63cd
Reviewed-on: https://code.wireshark.org/review/34457
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-05 22:03:15 +00:00
Piotr Smolinski ad94c4d459 Kafka: include zstd compression in Kafka message batches
Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777
Reviewed-on: https://code.wireshark.org/review/34222
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-20 13:50:45 +00:00
Pascal Quantin 3eea735cc1 Windows: upgrade Npcap to 0.9982, USBPcap to 1.5.3.0 and nghttp2 to 1.39.2
Change-Id: I9dcff1c6714c6bbe211997195ff78537c334fdbd
Reviewed-on: https://code.wireshark.org/review/34303
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-16 17:39:49 +00:00
Peter Wu a537edfdff Diameter: Add MS-CHAP/MS-CHAPv2 AVP support for EAP-TLS
Created the Microsoft Diameter file based on MS-CHAP-* AVPs listed at
https://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-10
Many values are displayed as bytes for simplicit. The MS-CHAP2-Success
attribute could for example be dissected further as 1 byte followed by a
string, but that requires more effort.

Allow padding to be missing since the eap-ttls-mschapv2.pcapng capture
would throw a Malformed Packet exception otherwise.

Bug: 15603
Change-Id: I9efc322a86802e78bb6cd4bc3df1c1282a45fe9e
Reviewed-on: https://code.wireshark.org/review/34291
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-15 04:10:16 +00:00
Guy Harris 5cf3fd03f1 HTTPS In More Places, update some URLs.
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:55:36 +00:00
Guy Harris 20800366dd HTTPS (almost) everywhere.
Change all wireshark.org URLs to use https.

Fix some broken links while we're at it.

Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:44:40 +00:00
Gerald Combs 5fd0f06bc7 Windows+CMake: Updates for Visual Studio 2019.
Update our redistributable search logic for VS 2019.

Change-Id: Icccc550bbe062a91206d4ffddeef7bbfbdb8829b
Reviewed-on: https://code.wireshark.org/review/34064
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>
2019-07-24 06:13:17 +00:00
Pascal Quantin 97d47139bc Windows: upgrade USBPcap to 1.5.2.0
Change-Id: I06b7e507277af2c8cdf76dfeaf0b5347a56a0eae
Reviewed-on: https://code.wireshark.org/review/33833
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-07-03 20:56:30 +00:00
Pascal Quantin ddfb6e3901 Windows: upgrade USBPcap to 1.5.1.0
Change-Id: Id376763c07ba97dc7105f7265a6ebb3d30a9adbf
Reviewed-on: https://code.wireshark.org/review/33824
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-03 03:49:08 +00:00
Pascal Quantin 6b20a4f2d6 Windows: upgrade Npcap to 0.996 and USBPcap to 1.5.0.0
Change-Id: Ie6590e1a31a5aaa6e96f6f718991cc42a1e40d8a
Reviewed-on: https://code.wireshark.org/review/33639
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-18 06:20:10 +00:00
Pascal Quantin 8a1a63d7c9 Windows: package codec plugins
Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24
Reviewed-on: https://code.wireshark.org/review/33562
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11 22:06:19 +00:00
João Valverde 63af1da7e7 Kill libwscodecs plugin library, just use plugins
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5
Reviewed-on: https://code.wireshark.org/review/33068
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11 20:59:39 +00:00
akuchekar bcfe022d22 New Diameter AVPS
Change-Id: Ic7fca037cdf041988bc93f6b4066eb190e3028d0
Reviewed-on: https://code.wireshark.org/review/33461
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-08 14:32:28 +00:00
Pascal Quantin c603fac072 Windows: upgrade USBPcap to 1.4.1.0
Change-Id: I1a9d97a58201dadc6c50a15d1518053c980bd62f
Reviewed-on: https://code.wireshark.org/review/33514
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-07 05:33:46 +00:00
Pascal Quantin 76785a12b3 Windows: upgrade USBPcap to 1.4.0.0
Change-Id: I79b8ece52e89e4e646954e965649b0cf5ae69a6a
Reviewed-on: https://code.wireshark.org/review/33379
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-26 21:19:52 +00:00
Pascal Quantin 3586da308f Windows: upgrade Npcap to 0.995
Change-Id: I9e1bea5daf8aa49e4de4efa070819da8d3844fc1
Reviewed-on: https://code.wireshark.org/review/33156
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-11 13:17:00 +00:00
Pascal Quantin fd2f439e33 Revert "Windows: upgrade Npcap to 0.994"
This reverts commit 2f82518f72.

Npcap 0.994 introduced a crash that will be fixed in next version:
https://github.com/nmap/nmap/issues/1591

Change-Id: Iff9a29e6d28c57774844d25f2990e0f8c214bf75
Reviewed-on: https://code.wireshark.org/review/33143
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10 05:38:32 +00:00
Pascal Quantin 2f82518f72 Windows: upgrade Npcap to 0.994
Change-Id: I3b64041723a72600a9ef5a6fb9d22b0b30578cfc
Reviewed-on: https://code.wireshark.org/review/33114
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08 16:04:38 +00:00
Pascal Quantin 48d7cecedd Windows: upgrade Npcap to 0.993
Change-Id: Ibe19a77b5ced8be4f1008450fb6df92c841a43c5
Reviewed-on: https://code.wireshark.org/review/33092
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-07 05:12:08 +00:00
Alexis La Goutte c3cd3abc82 NSIS/WIX: fix BROTLI packaging (missing DLL)
Change-Id: Iaacee6f2f91f66b2ca044f4d4082c6993f16a1dc
Reviewed-on: https://code.wireshark.org/review/32957
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-04-23 11:55:03 +00:00
Ethan Everett 4591286d3a radius: add Meraki dictionary
Change-Id: Ibba2254bd9711b9cbac2d8f3ef2e209ccdc45bc0
Reviewed-on: https://code.wireshark.org/review/32621
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-10 21:11:00 +00:00
Pascal Quantin 711ac47896 Windows: upgrade USBPcap to 1.3.0.0 and Npcap to 0.992
Change-Id: Ie27c2cb36dc90a20851f1e2c53c1af2220465a39
Reviewed-on: https://code.wireshark.org/review/32678
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-02 03:27:41 +00:00
João Valverde c7c3e31772 NSIS: Add logic to package Qt debug DLLs
Bug: 15623
Change-Id: I4898fe2797d987e35bc334211ece8f2f58c562c7
Reviewed-on: https://code.wireshark.org/review/32493
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-21 05:06:34 +00:00
Pascal Quantin 9d44b75999 Windows: fix addition of Libxml2 DLLs in installers
Follow-up of gacc96e5206

Change-Id: Ibf49c4812b46ed282dccddb4fe6869154f6f9fed
Reviewed-on: https://code.wireshark.org/review/32487
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-03-20 08:07:54 +00:00
Gerald Combs a6da14982b NSIS: Fix our extra installer location.
We know the native Windows library path early on in the configure
process. Use it to set the location of the Npcap and USBPcap installers
instead of trying to derive it from the GLib DLL path.

Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
Reviewed-on: https://code.wireshark.org/review/32475
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18 23:47:38 +00:00
Gerald Combs 36ba6b87c1 Windows: Switch to Npcap 0.991.
Change-Id: I4f5d82bf0d205b9410db2098abe64dde1a33b21d
Reviewed-on: https://code.wireshark.org/review/32473
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18 22:46:46 +00:00
Gerald Combs a0c93f426b CMake: Don't build Windows package targets by default.
Explicitly exclude our various Windows package targets from the Visual
Studio default build. This will hopefully keep the 32-bit Windows builder
from trying to build the portableapps_runtime target when it shouldn't.

Change-Id: Id8481e92abda9b1a4784b8c8e8b5a1b3f1b4647e
Reviewed-on: https://code.wireshark.org/review/32256
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-28 16:37:07 +00:00
Guy Harris 29ac5a9e61 Don't fail in CMake on Windows if you've disabled building Wireshark.
It's possible to do a *build* on Windows without the Wireshark app being
built; however, the *installers* can't currently be built.

If we have NSIS or WiX, and Wireshark isn't being built, report a
warning, and don't have targets for building the installers.

Change-Id: I2cc9c1f6ba375dbcb6d5b7520d2fa33ad97ba9fe
Reviewed-on: https://code.wireshark.org/review/32061
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-16 22:18:48 +00:00
Peter Wu ba1ef0ec3d Re-implement "Map" feature for Endpoints
This feature was removed in v2.5.1rc0-427-gf529ab5d0a, anticipating that
MaxMind would remove support for it in 2019. They have however changed
their mind and maintained latitude and longitude information.

They recommend displaying an accuracy radius, but the reported values
are 50, 100, 200 and 1000km. When implemented literally, a marker in
Ireland would cover the whole island plus mainland, so I have instead
opted to use a fixed radius of 1km at deeper zoom levels.

The old ipmap.html file was outdated and had broken tiles, I rewrote a
new one from scratch using the light-weight Leaflet library combined
with tiles from OpenStreetMap. This is more mobile-friendly and secure
(https, SRI). To improve handling of nearby or overlapping nodes,
clustering is used (individual nodes can still be inspected).

Browser compatibility results: IE8 is unusable, IE9 partially works
(tooltips sometimes disappear and the cluster radius control is gone),
IE11 works. Of course Firefox 65 and Chromium 72 have no issues.

The map popup description in the generated GeoJSON structure is now
split in several properties, allowing presentation to be handled by the
HTML page instead of the C code.

Bug: 14693
Change-Id: If2ec9c518f7723ac0ab27b6272463356875a0ff2
Reviewed-on: https://code.wireshark.org/review/31952
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-16 21:11:12 +00:00
Guy Harris 7770ad93e2 Don't allow NSIS or WiX installers if we aren't building Wireshark.
In both cases, a file used in the process of building the installer is
generated from the Wireshark binary, so, unless we also arrange not to
put that file in the installer if Wireshark isn't being built, we can't
build the installer.

Have ADD_NSIS_PACKAGE_TARGET and ADD_WIX_PACKAGE_TARGET check whether
we're building Wireshark and fail if we aren't.  That way, *if* we're
including the NSIS or WiX packages in the build files, we fail if we
aren't building Wireshark.

Change-Id: Icfe4d2491bd721cdd5fef424e9a7565c4990defa
Reviewed-on: https://code.wireshark.org/review/32053
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-16 02:31:14 +00:00
Gerald Combs 4bcad12279 NSIS: Add ERROR_PRODUCT_VERSION to the vcredist checks.
If the Visual C++ Redistributable installer returns 1638
(ERROR_PRODUCT_VERSION) treat it as a success.

Bug: 15509
Change-Id: I136704ddc3266abc1a79f0fdcdd0b6cb7e33266e
Reviewed-on: https://code.wireshark.org/review/32041
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>
2019-02-15 05:15:55 +00:00