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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 3f381f8a0e..f90fda4c32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ bin_PROGRAMS = \ @randpkt_bin@ \ @dumpcap_bin@ \ @reordercap_bin@ \ - @rawshark_bin@ \ + @mmdbresolve_bin@ \ @sharkd_bin@ noinst_PROGRAMS = \ @@ -52,7 +52,7 @@ noinst_PROGRAMS = \ EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype \ editcap mergecap dftest randpkt text2pcap dumpcap reordercap \ - rawshark sharkd fuzzshark + mmdbresolve rawshark sharkd fuzzshark # # Wireshark configuration files are put in $(pkgdatadir). @@ -531,6 +531,11 @@ rawshark_LDADD = \ @PCAP_LIBS@ \ ${EPAN_EXTRA_LIBS} +mmdbresolve_SOURCES = mmdbresolve.c +mmdbresolve_CPPFLAGS = $(AM_CPPFLAGS) +mmdbresolve_LDFLAGS = $(AM_LDFLAGS) +mmdbresolve_LDADD = @MAXMINDDB_LIBS@ + sharkd_SOURCES = \ $(SHARK_COMMON_SRC) \ sharkd.c \ |