logswan

commit 7a823b2758544980da6794833656c0370b38b6c2
parent 7e2b713c2a608ade289da1af9e4c91abe911c7a0
Author: Frederic Cambus <fred@statdns.com>
Date:   Sun, 21 Jan 2018 16:47:48 +0100

Initial support for GeoIP2 databases

Diffstat:
M
CMakeLists.txt
 | 
11
++++++++---
M
src/logswan.c
 | 
49
+++++++++++++++++++++++++++----------------------

2 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,11 @@ find_path(GEOIP_INCLUDE_DIRS GeoIP.h)
 find_library(GEOIP_LIBRARIES NAMES GeoIP REQUIRED)
 include_directories(${GEOIP_INCLUDE_DIRS})
 
+# libmaxminddb
+find_path(GEOIP2_INCLUDE_DIRS maxminddb.h)
+find_library(GEOIP2_LIBRARIES NAMES maxminddb REQUIRED)
+include_directories(${GEOIP2_INCLUDE_DIRS})
+
 # Jansson
 find_path(JANSSON_INCLUDE_DIRS jansson.h)
 find_library(JANSSON_LIBRARIES NAMES jansson REQUIRED)
@@ -50,13 +55,13 @@ if(NOT HAVE_STRTONUM)
   set (SRC ${SRC} compat/strtonum.c)
 endif()
 
-SET(GEOIPDIR ${CMAKE_INSTALL_PREFIX}/share/GeoIP CACHE PATH "Path to GeoIP databases")
+SET(GEOIP2DIR ${CMAKE_INSTALL_PREFIX}/share/GeoIP2 CACHE PATH "Path to GeoIP2 databases")
 
 add_definitions(-Wall -Wextra -Werror -std=c99 -pedantic)
-add_definitions(-DGEOIPDIR="${GEOIPDIR}/")
+add_definitions(-DGEOIP2DIR="${GEOIP2DIR}/")
 add_executable(logswan ${SRC} ${DEPS})
 
-target_link_libraries(logswan ${GEOIP_LIBRARIES} ${JANSSON_LIBRARIES} m)
+target_link_libraries(logswan ${GEOIP_LIBRARIES} ${GEOIP2_LIBRARIES} ${JANSSON_LIBRARIES} m)
 
 install(TARGETS logswan DESTINATION bin)
 install(FILES logswan.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
diff --git a/src/logswan.c b/src/logswan.c
@@ -39,14 +39,14 @@
 
 #include "hll.h"
 
-#include <GeoIP.h>
+#include <maxminddb.h>
 
 #include "config.h"
 #include "output.h"
 #include "parse.h"
 
 bool geoip;
-GeoIP *geoipv4 = NULL, *geoipv6 = NULL;
+MMDB_s geoip2;
 
 clock_t begin, end;
 
@@ -87,6 +87,9 @@ displayUsage() {
 
 int
 main(int argc, char *argv[]) {
+	int gai_error, mmdb_error;
+	MMDB_lookup_result_s lookup;
+
 	if (pledge("stdio rpath", NULL) == -1) {
 		err(1, "pledge");
 	}
@@ -125,8 +128,12 @@ main(int argc, char *argv[]) {
 
 	/* Initializing GeoIP */
 	if (geoip) {
-		geoipv4 = GeoIP_open(GEOIPDIR "GeoIP.dat", GEOIP_MEMORY_CACHE);
-		geoipv6 = GeoIP_open(GEOIPDIR "GeoIPv6.dat", GEOIP_MEMORY_CACHE);
+		if (MMDB_open(GEOIP2DIR "GeoLite2-Country.mmdb",
+		    MMDB_MODE_MMAP, &geoip2) != MMDB_SUCCESS) {
+			perror("Can't open database");
+			return 1;
+		}
+
 	}
 
 	/* Open log file */
@@ -171,10 +178,6 @@ main(int argc, char *argv[]) {
 
 				/* Unique visitors */
 				hll_add(&uniqueIPv4, parsedLine.remoteHost, strlen(parsedLine.remoteHost));
-
-				if (geoipv4) {
-					countryId = GeoIP_id_by_addr(geoipv4, parsedLine.remoteHost);
-				}
 			}
 
 			if (isIPv6) {
@@ -183,21 +186,24 @@ main(int argc, char *argv[]) {
 
 				/* Unique visitors */
 				hll_add(&uniqueIPv6, parsedLine.remoteHost, strlen(parsedLine.remoteHost));
-
-				if (geoipv6) {
-					countryId = GeoIP_id_by_addr_v6(geoipv6, parsedLine.remoteHost);
-				}
 			}
 
-			if (geoipv4 || geoipv6) {
-				/* Increment countries array */
-				results.countries[countryId]++;
+			if (geoip) {
+				lookup = MMDB_lookup_string(&geoip2, parsedLine.remoteHost, &gai_error, &mmdb_error);
+
+				// Increment countries array 
+				//results.countries[countryId]++;
 
-				/* Increment continents array */
-				for (size_t loop = 0; loop < CONTINENTS; loop++) {
-					if (!strcmp(continentsId[loop], GeoIP_continent_by_id(countryId))) {
-						results.continents[loop]++;
-						break;
+				MMDB_entry_data_s entry_data;
+				MMDB_get_value(&lookup.entry, &entry_data, "continent", "code", NULL);
+
+				if (entry_data.has_data) {
+					// Increment continents array
+					for (size_t loop = 0; loop < CONTINENTS; loop++) {
+						if (!strncmp(continentsId[loop], entry_data.utf8_string, 2)) {
+							results.continents[loop]++;
+							break;
+						}
 					}
 				}
 			}
@@ -285,8 +291,7 @@ main(int argc, char *argv[]) {
 	/* Clean up */
 	fclose(logFile);
 
-	GeoIP_delete(geoipv4);
-	GeoIP_delete(geoipv6);
+	MMDB_close(&geoip2);
 
 	hll_destroy(&uniqueIPv4);
 	hll_destroy(&uniqueIPv6);