URL:
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a1da75c554881667dd92e11f098630f2d604872b
Submitter: Gerald Combs (ger...@wireshark.org)
Changed: branch: master
Repository: wireshark
Commits:
a1da75c by Gerald Combs (ger...@wireshark.org):
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 <ger...@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <ger...@wireshark.org>
Actions performed:
from b2d3680 CMake: Remove FindSH.
adds a1da75c Transition from GeoIP Legacy to MaxMindDB.
Summary of changes:
CMakeLists.txt | 34 +-
CMakeOptions.txt | 2 +-
Makefile.am | 9 +-
README.macos | 7 -
acinclude.m4 | 32 +-
cmake/modules/FindGEOIP.cmake | 74 ---
cmake/modules/FindMaxMindDB.cmake | 74 +++
cmakeconfig.h.in | 10 +-
configure.ac | 42 +-
debian/control | 4 +-
debian/libwireshark-data.install | 2 +-
debian/libwireshark0.symbols | 9 +-
debian/{geoip_db_paths => maxmind_db_paths} | 0
doc/CMakeLists.txt | 29 +-
doc/Makefile.am | 13 +-
doc/mmdbresolve.pod | 69 +++
docbook/release-notes.asciidoc | 2 +
docbook/wsdg_src/WSDG_chapter_libraries.asciidoc | 23 +-
docbook/wsug_src/WSUG_chapter_customize.asciidoc | 41 +-
docbook/wsug_src/WSUG_chapter_statistics.asciidoc | 11 +-
docbook/wsug_src/WSUG_chapter_use.asciidoc | 7 +-
epan/CMakeLists.txt | 9 +-
epan/Makefile.am | 9 +-
epan/addr_resolv.c | 10 +-
epan/addr_resolv.h | 6 +
epan/dissectors/Makefile.am | 2 +-
epan/dissectors/packet-ip.c | 271 ++++-----
epan/dissectors/packet-ipv6.c | 285 +++++-----
epan/epan.c | 10 +-
epan/geoip_db.c | 638 ----------------------
epan/geoip_db.h | 104 ----
epan/maxmind_db.c | 513 +++++++++++++++++
epan/maxmind_db.h | 93 ++++
epan/prefs.c | 8 +-
mmdbresolve.c | 169 ++++++
packaging/macosx/Scripts/cli-postinstall.sh | 1 +
packaging/nsis/CMakeLists.txt | 7 +-
packaging/nsis/uninstall.nsi | 18 +-
packaging/nsis/wireshark.nsi | 8 +
packaging/rpm/SPECS/wireshark.spec.in | 4 +-
packaging/wix/CMakeLists.txt | 13 +-
packaging/wix/ComponentGroups.wxi | 18 +
packaging/wix/Features.wxi | 3 +
tools/Get-HardenFlags.ps1 | 2 +-
tools/debian-setup.sh | 6 +-
tools/install_rpms_for_devel.sh | 6 +-
tools/macos-setup.sh | 88 ++-
tools/pre-commit-ignore.conf | 1 +
tools/rpm_setup.sh | 4 +-
tools/win-setup.ps1 | 4 +-
tshark.c | 12 +-
ui/qt/endpoint_dialog.cpp | 176 +++---
ui/qt/endpoint_dialog.h | 18 +-
ui/traffic_table_ui.c | 8 +-
ui/traffic_table_ui.h | 9 +-
55 files changed, 1524 insertions(+), 1503 deletions(-)
delete mode 100644 cmake/modules/FindGEOIP.cmake
create mode 100644 cmake/modules/FindMaxMindDB.cmake
rename debian/{geoip_db_paths => maxmind_db_paths} (100%)
create mode 100644 doc/mmdbresolve.pod
delete mode 100644 epan/geoip_db.c
delete mode 100644 epan/geoip_db.h
create mode 100644 epan/maxmind_db.c
create mode 100644 epan/maxmind_db.h
create mode 100644 mmdbresolve.c
___________________________________________________________________________
Sent via: Wireshark-commits mailing list <wireshark-commits@wireshark.org>
Archives: https://www.wireshark.org/lists/wireshark-commits
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-commits
mailto:wireshark-commits-requ...@wireshark.org?subject=unsubscribe
