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 /epan/epan.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 'epan/epan.c')
-rw-r--r-- | epan/epan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/epan.c b/epan/epan.c index 076b557b5a..a1a9240a81 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -727,13 +727,13 @@ epan_get_compiled_version_info(GString *str) g_string_append(str, "without Kerberos"); #endif /* HAVE_KERBEROS */ - /* GeoIP */ + /* MaxMindDB */ g_string_append(str, ", "); -#ifdef HAVE_GEOIP - g_string_append(str, "with GeoIP"); +#ifdef HAVE_MAXMINDDB + g_string_append(str, "with MaxMind DB resolver"); #else - g_string_append(str, "without GeoIP"); -#endif /* HAVE_GEOIP */ + g_string_append(str, "without MaxMind DB resolver"); +#endif /* HAVE_MAXMINDDB */ /* nghttp2 */ g_string_append(str, ", "); |