Transition from GeoIP Legacy to MaxMindDB.
authorGerald Combs <gerald@wireshark.org>
Fri, 9 Feb 2018 01:20:26 +0000 (17:20 -0800)
committerGerald Combs <gerald@wireshark.org>
Tue, 6 Mar 2018 18:02:21 +0000 (18:02 +0000)
commita1da75c554881667dd92e11f098630f2d604872b
treeb1d6a60a663bf93f1eede809a0c383544508d6e2
parentb2d3680558d19998c55b48e9807a26e145756eba
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>
55 files changed:
CMakeLists.txt
CMakeOptions.txt
Makefile.am
README.macos
acinclude.m4
cmake/modules/FindGEOIP.cmake [deleted file]
cmake/modules/FindMaxMindDB.cmake [new file with mode: 0644]
cmakeconfig.h.in
configure.ac
debian/control
debian/libwireshark-data.install
debian/libwireshark0.symbols
debian/maxmind_db_paths [moved from debian/geoip_db_paths with 100% similarity]
doc/CMakeLists.txt
doc/Makefile.am
doc/mmdbresolve.pod [new file with mode: 0644]
docbook/release-notes.asciidoc
docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
docbook/wsug_src/WSUG_chapter_customize.asciidoc
docbook/wsug_src/WSUG_chapter_statistics.asciidoc
docbook/wsug_src/WSUG_chapter_use.asciidoc
epan/CMakeLists.txt
epan/Makefile.am
epan/addr_resolv.c
epan/addr_resolv.h
epan/dissectors/Makefile.am
epan/dissectors/packet-ip.c
epan/dissectors/packet-ipv6.c
epan/epan.c
epan/geoip_db.c [deleted file]
epan/geoip_db.h [deleted file]
epan/maxmind_db.c [new file with mode: 0644]
epan/maxmind_db.h [new file with mode: 0644]
epan/prefs.c
mmdbresolve.c [new file with mode: 0644]
packaging/macosx/Scripts/cli-postinstall.sh
packaging/nsis/CMakeLists.txt
packaging/nsis/uninstall.nsi
packaging/nsis/wireshark.nsi
packaging/rpm/SPECS/wireshark.spec.in
packaging/wix/CMakeLists.txt
packaging/wix/ComponentGroups.wxi
packaging/wix/Features.wxi
tools/Get-HardenFlags.ps1
tools/debian-setup.sh
tools/install_rpms_for_devel.sh
tools/macos-setup.sh
tools/pre-commit-ignore.conf
tools/rpm_setup.sh
tools/win-setup.ps1
tshark.c
ui/qt/endpoint_dialog.cpp
ui/qt/endpoint_dialog.h
ui/traffic_table_ui.c
ui/traffic_table_ui.h