geoip2_c 0.3.4 → 0.4.1

data/ext/geoip2/libmaxminddb/t/maxminddb_test_helper.c

@@ -1,255 +0,0 @@
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define _POSIX_C_SOURCE 200112L
-#include <assert.h>
-#include <stdarg.h>
-#include <sys/types.h>
-
-#include "maxminddb.h"
-#include "maxminddb_test_helper.h"
-
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <libgen.h>
-#include <unistd.h>
-#endif
-
-#define NO_PROTO
-
-#ifndef strndup
-/* *INDENT-OFF* */
-/* Copied from the libiberty strndup.c, which is LPGPL 2+ */
-NO_PROTO char *strndup (const char *s, size_t n)
-{
-  char *result;
-  size_t len = strlen (s);
-
-  if (n < len)
-    len = n;
-
-  result = (char *) malloc (len + 1);
-  if (!result)
-    return 0;
-
-  result[len] = '\0';
-  return (char *) memcpy (result, s, len);
-}
-/* *INDENT-ON* */
-#endif
-
-void for_all_record_sizes(const char *filename_fmt,
-                          void (*tests)(int record_size, const char *filename,
-                                        const char *description))
-{
-    int sizes[] = { 24, 28, 32 };
-    for (int i = 0; i < 3; i++) {
-        int size = sizes[i];
-
-        char filename[500];
-        snprintf(filename, 500, filename_fmt, size);
-
-        char description[14];
-        snprintf(description, 14, "%i bit record", size);
-
-        tests(size, filename, description);
-    }
-}
-
-void for_all_modes(void (*tests)(int mode, const char *description))
-{
-    tests(MMDB_MODE_MMAP, "mmap mode");
-}
-
-const char *test_database_path(const char *filename)
-{
-    char cwd[500];
-    char *UNUSED(tmp) = getcwd(cwd, 500);
-
-    char *test_db_dir;
-#ifdef _WIN32
-    test_db_dir = "./t/maxmind-db/test-data";
-#else
-    if (strcmp(basename(cwd), "t") == 0) {
-        test_db_dir = "./maxmind-db/test-data";
-    } else {
-        test_db_dir = "./t/maxmind-db/test-data";
-    }
-#endif
-
-    char *path = malloc(500);
-    assert(NULL != path);
-
-    snprintf(path, 500, "%s/%s", test_db_dir, filename);
-
-    return (const char *)path;
-}
-
-const char *dup_entry_string_or_bail(MMDB_entry_data_s entry_data)
-{
-    const char *string = strndup(entry_data.utf8_string, entry_data.data_size);
-    if (NULL == string) {
-        BAIL_OUT("strndup failed");
-    }
-
-    return string;
-}
-
-MMDB_s *open_ok(const char *db_file, int mode, const char *mode_desc)
-{
-    if (0 != access(db_file, R_OK)) {
-        BAIL_OUT(
-            "could not read the specified file - %s\nIf you are in a git checkout try running 'git submodule update --init'",
-            db_file);
-    }
-
-    MMDB_s *mmdb = (MMDB_s *)calloc(1, sizeof(MMDB_s));
-
-    if (NULL == mmdb) {
-        BAIL_OUT("could not allocate memory for our MMDB_s struct");
-    }
-
-    int status = MMDB_open(db_file, mode, mmdb);
-
-    int is_ok = ok(MMDB_SUCCESS == status, "open %s status is success - %s",
-                   db_file, mode_desc);
-
-    if (!is_ok) {
-        diag("open status code = %d (%s)", status, MMDB_strerror(status));
-        free(mmdb);
-        return NULL;
-    }
-
-    is_ok = ok(mmdb->file_size > 0,
-               "mmdb struct has been set for %s - %s",
-               db_file, mode_desc);
-
-    if (!is_ok) {
-        free(mmdb);
-        return NULL;
-    }
-
-    return mmdb;
-}
-
-MMDB_lookup_result_s lookup_string_ok(MMDB_s *mmdb, const char *ip,
-                                      const char *file, const char *mode_desc)
-{
-    int gai_error, mmdb_error;
-    MMDB_lookup_result_s result =
-        MMDB_lookup_string(mmdb, ip, &gai_error, &mmdb_error);
-
-    test_lookup_errors(gai_error, mmdb_error, "MMDB_lookup_string", ip, file,
-                       mode_desc);
-
-    return result;
-}
-
-MMDB_lookup_result_s lookup_sockaddr_ok(MMDB_s *mmdb, const char *ip,
-                                        const char *file, const char *mode_desc)
-{
-    int ai_flags = AI_NUMERICHOST;
-    struct addrinfo hints = {
-        .ai_socktype = SOCK_STREAM
-    };
-    struct addrinfo *addresses = NULL;
-
-    if (ip[0] == ':') {
-        hints.ai_flags = ai_flags;
-#if defined AI_V4MAPPED && !defined __FreeBSD__
-        hints.ai_flags |= AI_V4MAPPED;
-#endif
-        hints.ai_family = AF_INET6;
-    } else {
-        hints.ai_flags = ai_flags;
-        hints.ai_family = AF_INET;
-    }
-
-    int gai_error = getaddrinfo(ip, NULL, &hints, &addresses);
-
-    int mmdb_error = 0;
-    MMDB_lookup_result_s result = { .found_entry = false };
-    if (gai_error == 0) {
-        result = MMDB_lookup_sockaddr(mmdb, addresses->ai_addr, &mmdb_error);
-    }
-    if (NULL != addresses) {
-        freeaddrinfo(addresses);
-    }
-
-    test_lookup_errors(gai_error, mmdb_error, "MMDB_lookup_sockaddr", ip, file,
-                       mode_desc);
-
-    return result;
-}
-
-void test_lookup_errors(int gai_error, int mmdb_error,
-                        const char *function, const char *ip,
-                        const char *file, const char *mode_desc)
-{
-
-    int is_ok = ok(0 == gai_error,
-                   "no getaddrinfo error in call to %s for %s - %s - %s",
-                   function, ip, file, mode_desc);
-
-    if (!is_ok) {
-        diag("error from call to getaddrinfo for %s - %s",
-             ip, gai_strerror(gai_error));
-    }
-
-    is_ok = ok(0 == mmdb_error,
-               "no MMDB error in call to %s for %s - %s - %s",
-               function, ip, file, mode_desc);
-
-    if (!is_ok) {
-        diag("MMDB error - %s", MMDB_strerror(mmdb_error));
-    }
-}
-
-MMDB_entry_data_s data_ok(MMDB_lookup_result_s *result, uint32_t expect_type,
-                          const char *description, ...)
-{
-    va_list keys;
-    va_start(keys, description);
-
-    MMDB_entry_data_s data;
-    int status = MMDB_vget_value(&result->entry, &data, keys);
-
-    va_end(keys);
-
-    if (cmp_ok(status, "==", MMDB_SUCCESS,
-               "no error from call to MMDB_vget_value - %s", description)) {
-
-        if (!cmp_ok(data.type, "==", expect_type,
-                    "got the expected data type - %s", description)) {
-
-            diag("  data type value is %i but expected %i", data.type,
-                 expect_type);
-        }
-    } else {
-        diag("  error from MMDB_vget_value - %s", MMDB_strerror(status));
-    }
-
-    return data;
-}
-
-void compare_double(double got, double expect)
-{
-    double diff = fabs(got - expect);
-    int is_ok = ok(diff < 0.01, "double value was approximately %2.6f", expect);
-    if (!is_ok) {
-        diag("  got %2.6f but expected %2.6f (diff = %2.6f)",
-             got, expect, diff);
-    }
-}
-
-void compare_float(float got, float expect)
-{
-    float diff = fabsf(got - expect);
-    int is_ok = ok(diff < 0.01, "float value was approximately %2.1f", expect);
-    if (!is_ok) {
-        diag("  got %2.4f but expected %2.1f (diff = %2.1f)",
-             got, expect, diff);
-    }
-}

data/ext/geoip2/libmaxminddb/t/maxminddb_test_helper.h

@@ -1,69 +0,0 @@
-/* Some test files may require something newer */
-#if !defined(_GNU_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define _POSIX_C_SOURCE 200112L
-#endif
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-#include "maxminddb.h"
-#include "libtap/tap.h"
-
-#ifdef _WIN32
-#include <Winsock2.h>
-#include <ws2tcpip.h>
-
-#define R_OK 4
-
-#else
-#include <netdb.h>
-#endif
-
-#if (_MSC_VER && _MSC_VER < 1900)
-/* _snprintf has security issues, but I don't think it is worth
-   worrying about for the unit tests. */
-#define snprintf _snprintf
-#endif
-
-#ifndef MMDB_TEST_HELPER_C
-#define MMDB_TEST_HELPER_C (1)
-
-#ifdef __GNUC__
-#  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
-#else
-#  define UNUSED
-#endif
-
-#define MAX_DESCRIPTION_LENGTH 500
-
-#ifndef strndup
-extern char *strndup(const char *s, size_t n);
-#endif
-
-    /* *INDENT-OFF* */
-    /* --prototypes automatically generated by dev-bin/regen-prototypes.pl - don't remove this comment */
-    extern void for_all_record_sizes(const char *filename_fmt,
-                                     void (*tests)(int record_size, const char *filename,
-                                                   const char *description));
-    extern void for_all_modes(void (*tests)(int mode, const char *description));
-    extern const char *test_database_path(const char *filename);
-    extern const char *dup_entry_string_or_bail(MMDB_entry_data_s entry_data);
-    extern MMDB_s *open_ok(const char *db_file, int mode, const char *mode_desc);
-    extern MMDB_lookup_result_s lookup_string_ok(MMDB_s *mmdb, const char *ip,
-                                                 const char *file, const char *mode_desc);
-    extern MMDB_lookup_result_s lookup_sockaddr_ok(MMDB_s *mmdb, const char *ip,
-                                                   const char *file, const char *mode_desc);
-    extern void test_lookup_errors(int gai_error, int mmdb_error,
-                                   const char *function, const char *ip,
-                                   const char *file, const char *mode_desc);
-    extern MMDB_entry_data_s data_ok(MMDB_lookup_result_s *result, uint32_t expect_type,
-                                     const char *description, ...);
-    extern void compare_double(double got, double expect);
-    extern void compare_float(float got, float expect);
-    /* --prototypes end - don't remove this comment-- */
-    /* *INDENT-ON* */
-
-#endif

data/ext/geoip2/libmaxminddb/t/metadata_pointers_t.c

@@ -1,32 +0,0 @@
-#include "maxminddb_test_helper.h"
-
-void run_tests(int mode, const char *mode_desc)
-{
-    const char *filename = "MaxMind-DB-test-metadata-pointers.mmdb";
-    const char *path = test_database_path(filename);
-    MMDB_s *mmdb = open_ok(path, mode, mode_desc);
-    free((void *)path);
-
-    char *repeated_string = "Lots of pointers in metadata";
-
-    is(mmdb->metadata.database_type, repeated_string,
-       "decoded pointer database_type");
-
-    for (uint16_t i = 0; i < mmdb->metadata.description.count; i++) {
-        const char *language =
-            mmdb->metadata.description.descriptions[i]->language;
-        const char *description =
-            mmdb->metadata.description.descriptions[i]->description;
-        is(description, repeated_string, "%s description", language);
-    }
-
-    MMDB_close(mmdb);
-    free(mmdb);
-}
-
-int main(void)
-{
-    plan(NO_PLAN);
-    for_all_modes(&run_tests);
-    done_testing();
-}

data/ext/geoip2/libmaxminddb/t/metadata_t.c

@@ -1,226 +0,0 @@
-#include "maxminddb_test_helper.h"
-
-void test_metadata(MMDB_s *mmdb, const char *mode_desc)
-{
-    cmp_ok(mmdb->metadata.node_count, "==", 37, "node_count is 37 - %s",
-           mode_desc);
-    cmp_ok(mmdb->metadata.record_size, "==", 24, "record_size is 24 - %s",
-           mode_desc);
-    cmp_ok(mmdb->metadata.ip_version, "==", 4, "ip_version is 4 - %s",
-           mode_desc);
-    is(mmdb->metadata.database_type, "Test", "database_type is Test - %s",
-       mode_desc);
-    // 2013-07-01T00:00:00Z
-    uint64_t expect_epoch = 1372636800;
-    int is_ok =
-        cmp_ok(mmdb->metadata.build_epoch, ">=", expect_epoch,
-               "build_epoch > %lli", expect_epoch);
-    if (!is_ok) {
-        diag("  epoch is %lli", mmdb->metadata.build_epoch);
-    }
-
-    cmp_ok(mmdb->metadata.binary_format_major_version, "==", 2,
-           "binary_format_major_version is 2 - %s", mode_desc);
-    cmp_ok(mmdb->metadata.binary_format_minor_version, "==", 0,
-           "binary_format_minor_version is 0 - %s", mode_desc);
-
-    cmp_ok(mmdb->metadata.languages.count, "==", 2, "found 2 languages - %s",
-           mode_desc);
-    is(mmdb->metadata.languages.names[0], "en", "first language is en - %s",
-       mode_desc);
-    is(mmdb->metadata.languages.names[1], "zh", "second language is zh - %s",
-       mode_desc);
-
-    cmp_ok(mmdb->metadata.description.count, "==", 2,
-           "found 2 descriptions - %s", mode_desc);
-    for (uint16_t i = 0; i < mmdb->metadata.description.count; i++) {
-        const char *language =
-            mmdb->metadata.description.descriptions[i]->language;
-        const char *description =
-            mmdb->metadata.description.descriptions[i]->description;
-        if (strncmp(language, "en", 2) == 0) {
-            ok(1, "found en description");
-            is(description, "Test Database", "en description");
-        } else if (strncmp(language, "zh", 2) == 0) {
-            ok(1, "found zh description");
-            is(description, "Test Database Chinese", "zh description");
-        } else {
-            ok(0, "found unknown description in unexpected language - %s",
-               language);
-        }
-    }
-
-    cmp_ok(mmdb->full_record_byte_size, "==", 6,
-           "full_record_byte_size is 6 - %s", mode_desc);
-}
-
-MMDB_entry_data_list_s *test_languages_value(MMDB_entry_data_list_s
-                                             *entry_data_list)
-{
-    MMDB_entry_data_list_s *languages = entry_data_list = entry_data_list->next;
-
-    cmp_ok(languages->entry_data.type, "==", MMDB_DATA_TYPE_ARRAY,
-           "'languages' key's value is an array");
-    cmp_ok(languages->entry_data.data_size, "==", 2,
-           "'languages' key's value has 2 elements");
-
-    MMDB_entry_data_list_s *idx0 = entry_data_list = entry_data_list->next;
-    cmp_ok(idx0->entry_data.type, "==", MMDB_DATA_TYPE_UTF8_STRING,
-           "first array entry is a UTF8_STRING");
-    const char *lang0 = dup_entry_string_or_bail(idx0->entry_data);
-    is(lang0, "en", "first language is en");
-    free((void *)lang0);
-
-    MMDB_entry_data_list_s *idx1 = entry_data_list = entry_data_list->next;
-    cmp_ok(idx1->entry_data.type, "==", MMDB_DATA_TYPE_UTF8_STRING,
-           "second array entry is a UTF8_STRING");
-    const char *lang1 = dup_entry_string_or_bail(idx1->entry_data);
-    is(lang1, "zh", "second language is zh");
-    free((void *)lang1);
-
-    return entry_data_list;
-}
-
-MMDB_entry_data_list_s *test_description_value(
-    MMDB_entry_data_list_s *entry_data_list)
-{
-    MMDB_entry_data_list_s *description = entry_data_list =
-                                              entry_data_list->next;
-    cmp_ok(description->entry_data.type, "==", MMDB_DATA_TYPE_MAP,
-           "'description' key's value is a map");
-    cmp_ok(description->entry_data.data_size, "==", 2,
-           "'description' key's value has 2 key/value pairs");
-
-    for (int i = 0; i < 2; i++) {
-        MMDB_entry_data_list_s *key = entry_data_list =
-                                          entry_data_list->next;
-        cmp_ok(key->entry_data.type, "==",
-               MMDB_DATA_TYPE_UTF8_STRING,
-               "found a map key in 'map'");
-        const char *key_name = dup_entry_string_or_bail(key->entry_data);
-
-        MMDB_entry_data_list_s *value = entry_data_list =
-                                            entry_data_list->next;
-        cmp_ok(value->entry_data.type, "==", MMDB_DATA_TYPE_UTF8_STRING,
-               "map value is a UTF8_STRING");
-        const char *description =
-            dup_entry_string_or_bail(value->entry_data);
-
-        if (strcmp(key_name, "en") == 0) {
-            is(description, "Test Database",
-               "en description == 'Test Database'");
-        } else if (strcmp(key_name, "zh") == 0) {
-            is(description, "Test Database Chinese",
-               "zh description == 'Test Database Chinese'");
-        } else {
-            ok(0, "unknown key found in description map - %s", key_name);
-        }
-
-        free((void *)key_name);
-        free((void *)description);
-    }
-
-    return entry_data_list;
-}
-
-void test_metadata_as_data_entry_list(MMDB_s * mmdb,
-                                      const char *mode_desc)
-{
-    MMDB_entry_data_list_s *entry_data_list, *first;
-    int status =
-        MMDB_get_metadata_as_entry_data_list(mmdb, &entry_data_list);
-
-    first = entry_data_list;
-
-    cmp_ok(status, "==", MMDB_SUCCESS, "get metadata as data_entry_list - %s",
-           mode_desc);
-
-    cmp_ok(first->entry_data.data_size, "==", 9,
-           "metadata map has 9 key/value pairs");
-
-    while (1) {
-        MMDB_entry_data_list_s *key = entry_data_list =
-                                          entry_data_list->next;
-
-        if (!key) {
-            break;
-        }
-
-        cmp_ok(key->entry_data.type, "==", MMDB_DATA_TYPE_UTF8_STRING,
-               "found a map key");
-
-        const char *key_name = dup_entry_string_or_bail(key->entry_data);
-        if (strcmp(key_name, "node_count") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            cmp_ok(value->entry_data.uint32, "==", 37, "node_count == 37");
-        } else if (strcmp(key_name, "record_size") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            cmp_ok(value->entry_data.uint16, "==", 24, "record_size == 24");
-        } else if (strcmp(key_name, "ip_version") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            cmp_ok(value->entry_data.uint16, "==", 4, "ip_version == 4");
-        } else if (strcmp(key_name, "binary_format_major_version") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            cmp_ok(value->entry_data.uint16, "==", 2,
-                   "binary_format_major_version == 2");
-        } else if (strcmp(key_name, "binary_format_minor_version") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            cmp_ok(value->entry_data.uint16, "==", 0,
-                   "binary_format_minor_version == 0");
-        } else if (strcmp(key_name, "build_epoch") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            ok(value->entry_data.uint64 > 1373571901,
-               "build_epoch > 1373571901");
-        } else if (strcmp(key_name, "database_type") == 0) {
-            MMDB_entry_data_list_s *value
-                = entry_data_list = entry_data_list->next;
-            const char *type = dup_entry_string_or_bail(value->entry_data);
-            is(type, "Test", "type == Test");
-            free((void *)type);
-        } else if (strcmp(key_name, "languages") == 0) {
-            entry_data_list = test_languages_value(entry_data_list);
-        } else if (strcmp(key_name, "description") == 0) {
-            entry_data_list = test_description_value(entry_data_list);
-        } else {
-            ok(0, "unknown key found in metadata map - %s",
-               key_name);
-        }
-
-        free((void *)key_name);
-    }
-
-    MMDB_free_entry_data_list(first);
-}
-
-void run_tests(int mode, const char *mode_desc)
-{
-    const char *file = "MaxMind-DB-test-ipv4-24.mmdb";
-    const char *path = test_database_path(file);
-    MMDB_s *mmdb = open_ok(path, mode, mode_desc);
-
-    // All of the remaining tests require an open mmdb
-    if (NULL == mmdb) {
-        diag("could not open %s - skipping remaining tests", path);
-        return;
-    }
-    free((void *)path);
-
-    test_metadata(mmdb, mode_desc);
-    test_metadata_as_data_entry_list(mmdb, mode_desc);
-
-    MMDB_close(mmdb);
-    free(mmdb);
-}
-
-int main(void)
-{
-    plan(NO_PLAN);
-    for_all_modes(&run_tests);
-    done_testing();
-}