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 /CMakeOptions.txt | |
| 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 'CMakeOptions.txt')
| -rw-r--r-- | CMakeOptions.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeOptions.txt b/CMakeOptions.txt index c011f3e65b..e7903f5b0f 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -24,6 +24,7 @@ option(BUILD_randpktdump "Build randpktdump" ON) option(BUILD_udpdump "Build udpdump" ON) option(BUILD_sharkd "Build sharkd" ON) option(BUILD_fuzzshark "Build fuzzshark" ON) +option(BUILD_mmdbresolve "Build MaxMind DB resolver" ON) option(DISABLE_WERROR "Do not treat warnings as errors" OFF) option(DISABLE_FRAME_LARGER_THAN_WARNING "Disable warning if the size of a function frame is large" OFF) @@ -67,7 +68,6 @@ option(ENABLE_NGHTTP2 "Build with HTTP/2 header decompression support" ON) option(ENABLE_LUA "Build with Lua dissector support" ON) option(ENABLE_SMI "Build with libsmi snmp support" ON) option(ENABLE_GNUTLS "Build with GNU TLS support" ON) -option(ENABLE_GEOIP "Build with GeoIP support" ON) if(WIN32) option(ENABLE_WINSPARKLE "Enable WinSparkle support" ON) endif() |