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 /tshark.c | |
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 'tshark.c')
-rw-r--r-- | tshark.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -85,9 +85,7 @@ #if defined(HAVE_LIBSMI) #include "epan/oids.h" #endif -#if defined(HAVE_GEOIP) -#include "epan/geoip_db.h" -#endif +#include "epan/maxmind_db.h" #include "epan/register.h" #include <epan/epan_dissect.h> #include <epan/tap.h> @@ -618,18 +616,16 @@ about_folders(void) g_strfreev(resultArray); -#ifdef HAVE_GEOIP - /* GeoIP */ - path = geoip_db_get_paths(); + /* MaxMindDB */ + path = maxmind_db_get_paths(); resultArray = g_strsplit(path, G_SEARCHPATH_SEPARATOR_S, 10); for(i = 0; resultArray[i]; i++) - printf("%-21s\t%s\n", "GeoIP path:", g_strstrip(resultArray[i])); + printf("%-21s\t%s\n", "MaxMind database path:", g_strstrip(resultArray[i])); g_strfreev(resultArray); g_free(path); -#endif #ifdef HAVE_LIBSMI /* SMI MIBs/PIBs */ |