diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-08 17:20:26 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-06 18:02:21 +0000 |
| commit | a1da75c554881667dd92e11f098630f2d604872b (patch) | |
| tree | b1d6a60a663bf93f1eede809a0c383544508d6e2 /tools/win-setup.ps1 | |
| parent | b2d3680558d19998c55b48e9807a26e145756eba (diff) | |
Transition from GeoIP Legacy to MaxMindDB.
MaxMind is discontinuing its legacy databases in April in favor of
GeoIP2, which use a newer database format (MaxMind DB). The reference C
library (libmaxminddb) is available under the Apache 2.0 license which
isn't quite compatible with ours.
Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin
and prints resolved information on stdout. Place it under a liberal
license (MIT) so that we can keep libmaxminddb at arm's length. Add
epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it
via stdio.
Migrate the preferences and documentation to MaxMindDB.
Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the
geographic coordinate fields to FT_DOUBLEs.
Bug: 10658
Change-Id: I24aeed637bea1b41d173270bda413af230f4425f
Reviewed-on: https://code.wireshark.org/review/26214
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'tools/win-setup.ps1')
| -rw-r--r-- | tools/win-setup.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index ccfffd13c6..6403aa42de 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -107,7 +107,7 @@ $Win64Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; "bcg729-1.0.4-win64ws.zip" = ""; "c-ares-1.13.0-win64ws.zip" = ""; - "GeoIP-1.6.10-win64ws.zip" = ""; + #"GeoIP-1.6.10-win64ws.zip" = ""; "gnutls-3.4.11-1.35-win64ws.zip" = ""; "gtk+-bundle_2.24.23-3.39-2_win64ws.zip" = "gtk2"; "kfw-3-2-2-x64-ws.zip" = ""; @@ -131,7 +131,7 @@ $Win32Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; "bcg729-1.0.4-win32ws.zip" = ""; "c-ares-1.13.0-win32ws.zip" = ""; - "GeoIP-1.6.10-win32ws.zip" = ""; + #"GeoIP-1.6.10-win32ws.zip" = ""; "gnutls-3.4.11-1.36-win32ws.zip" = ""; "gtk+-bundle_2.24.23-1.1-1_win32ws.zip" = "gtk2"; "kfw-3-2-2-i386-ws-vc6.zip" = ""; |