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/CMakeLists.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 'epan/CMakeLists.txt')
| -rw-r--r-- | epan/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 5bd3d40e4e..f0196fc57f 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -105,7 +105,7 @@ set(LIBWIRESHARK_PUBLIC_HEADERS frame_data_sequence.h funnel.h garrayfix.h - geoip_db.h + #geoip_db.h golay.h guid-utils.h iana_charsets.h @@ -117,6 +117,7 @@ set(LIBWIRESHARK_PUBLIC_HEADERS ipv6.h lapd_sapi.h llcsaps.h + maxmind_db.h media_params.h next_tvb.h nlpid.h @@ -208,12 +209,13 @@ set(LIBWIRESHARK_NONGENERATED_FILES frame_data.c frame_data_sequence.c funnel.c - geoip_db.c + #geoip_db.c golay.c guid-utils.c iana_charsets.c in_cksum.c ipproto.c + maxmind_db.c media_params.c next_tvb.c oids.c @@ -278,8 +280,9 @@ set(epan_LIBS wsutil ${CARES_LIBRARIES} ${GCRYPT_LIBRARIES} - ${GEOIP_LIBRARIES} + #${GEOIP_LIBRARIES} ${GLIB2_LIBRARIES} + ${GIO2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GNUTLS_LIBRARIES} ${KERBEROS_LIBRARIES} |