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 /cmakeconfig.h.in | |
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 'cmakeconfig.h.in')
-rw-r--r-- | cmakeconfig.h.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 30660c259a..c78328ae08 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -62,14 +62,8 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #cmakedefine HAVE_FCNTL_H 1 -/* Define to use GeoIP library */ -#cmakedefine HAVE_GEOIP 1 - -/* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */ -#cmakedefine HAVE_GEOIP_V6 1 - -/* Define if GeoIP has GeoIP_free */ -#cmakedefine HAVE_GEOIP_FREE 1 +/* Define to use the MaxMind DB library */ +#cmakedefine HAVE_MAXMINDDB 1 /* Define to 1 if you have the <ifaddrs.h> header file. */ #cmakedefine HAVE_IFADDRS_H 1 |