geoip2_c 0.3.0 → 0.3.1

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

@@ -0,0 +1,196 @@
+#include "maxminddb_test_helper.h"
+#include <pthread.h>
+
+typedef struct thread_arg {
+    int thread_id;
+    MMDB_s *mmdb;
+    const char *ip_to_lookup;
+} thread_arg_s;
+
+typedef struct test_result {
+    const char *ip_looked_up;
+    int lookup_string_gai_error;
+    int lookup_string_mmdb_error;
+    int found_entry;
+    int get_value_status;
+    int data_type_ok;
+    char *data_value;
+} test_result_s;
+
+void test_one_ip(MMDB_s *mmdb, const char *ip, test_result_s *test_result)
+{
+
+    test_result->ip_looked_up = ip;
+
+    int gai_error = 0;
+    int mmdb_error = 0;
+    MMDB_lookup_result_s result =
+        MMDB_lookup_string(mmdb, ip, &gai_error, &mmdb_error);
+
+    test_result->lookup_string_gai_error = gai_error;
+    if (gai_error) {
+        return;
+    }
+
+    test_result->lookup_string_mmdb_error = mmdb_error;
+    if (mmdb_error) {
+        return;
+    }
+
+    test_result->found_entry = result.found_entry;
+    if (!result.found_entry) {
+        return;
+    }
+
+    MMDB_entry_data_s data;
+    int status = MMDB_get_value(&result.entry, &data, "ip", NULL);
+
+    test_result->get_value_status = status;
+    if (status) {
+        return;
+    }
+
+    test_result->data_type_ok = data.type == MMDB_DATA_TYPE_UTF8_STRING;
+    if (!test_result->data_type_ok) {
+        return;
+    }
+
+    test_result->data_value = strndup(data.utf8_string, data.data_size);
+
+    return;
+}
+
+void *run_one_thread(void *arg)
+{
+    thread_arg_s *thread_arg = (thread_arg_s *)arg;
+
+    MMDB_s *mmdb = thread_arg->mmdb;
+    const char *ip = thread_arg->ip_to_lookup;
+
+    test_result_s *result = malloc(sizeof(test_result_s));
+    test_one_ip(mmdb, ip, result);
+
+    pthread_exit((void *)result);
+}
+
+void process_result(test_result_s *result, const char *expect,
+                    const char *mode_desc)
+{
+    int is_ok;
+    is_ok =
+        ok(!result->lookup_string_gai_error, "no getaddrinfo error for %s - %s",
+           result->ip_looked_up, mode_desc);
+    if (!is_ok) {
+        return;
+    }
+
+    is_ok = ok(!result->lookup_string_mmdb_error, "no mmdb error for %s - %s",
+               result->ip_looked_up, mode_desc);
+    if (!is_ok) {
+        return;
+    }
+
+    is_ok = ok(result->found_entry, "got a result for %s in the database - %s",
+               result->ip_looked_up, mode_desc);
+    if (!is_ok) {
+        return;
+    }
+
+    is_ok =
+        ok(!result->get_value_status,
+           "no error from MMDB_get_value for %s - %s",
+           result->ip_looked_up,
+           mode_desc);
+    if (!is_ok) {
+        return;
+    }
+
+    is_ok = ok(result->data_type_ok,
+               "MMDB_get_value found a utf8_string at 'ip' key for %s - %s",
+               result->ip_looked_up, mode_desc);
+    if (!is_ok) {
+        return;
+    }
+
+    is(result->data_value, expect,
+       "found expected result for 'ip' key for %s - %s",
+       result->ip_looked_up, mode_desc);
+}
+
+void run_ipX_tests(MMDB_s *mmdb, const char *pairs[][2], int pairs_rows,
+                   int mode, const char *mode_desc)
+{
+    pthread_t threads[pairs_rows];
+    struct thread_arg thread_args[pairs_rows];
+
+    for (int i = 0; i < pairs_rows; i += 1) {
+        thread_args[i].thread_id = i;
+        thread_args[i].mmdb = mmdb;
+        thread_args[i].ip_to_lookup = pairs[i][0];
+
+        int error = pthread_create(&threads[i], NULL, run_one_thread,
+                                   &thread_args[i]);
+        if (error) {
+            BAIL_OUT("pthread_create failed");
+        }
+    }
+
+    for (int i = 0; i < pairs_rows; i += 1) {
+        void *thread_return;
+        int error = pthread_join(threads[i], &thread_return);
+        if (error) {
+            BAIL_OUT("pthread_join failed");
+        }
+
+        test_result_s *test_result = (test_result_s *)thread_return;
+        if (NULL != test_result) {
+            process_result(test_result, pairs[i][1], mode_desc);
+            if (test_result->data_type_ok) {
+                free(test_result->data_value);
+            }
+            free(test_result);
+        }
+    }
+}
+
+void run_tests(int mode, const char *mode_desc)
+{
+    const char *filename = "MaxMind-DB-test-mixed-32.mmdb";
+    const char *path = test_database_path(filename);
+    MMDB_s *mmdb = open_ok(path, mode, mode_desc);
+    free((void *)path);
+
+    const char *pairs[18][2] = {
+        { "1.1.1.1",       "::1.1.1.1"     },
+        { "1.1.1.2",       "::1.1.1.2"     },
+        { "1.1.1.3",       "::1.1.1.2"     },
+        { "1.1.1.7",       "::1.1.1.4"     },
+        { "1.1.1.9",       "::1.1.1.8"     },
+        { "1.1.1.15",      "::1.1.1.8"     },
+        { "1.1.1.17",      "::1.1.1.16"    },
+        { "1.1.1.31",      "::1.1.1.16"    },
+        { "1.1.1.32",      "::1.1.1.32"    },
+        { "::1:ffff:ffff", "::1:ffff:ffff" },
+        { "::2:0:0",       "::2:0:0"       },
+        { "::2:0:1a",      "::2:0:0"       },
+        { "::2:0:40",      "::2:0:40"      },
+        { "::2:0:4f",      "::2:0:40"      },
+        { "::2:0:50",      "::2:0:50"      },
+        { "::2:0:52",      "::2:0:50"      },
+        { "::2:0:58",      "::2:0:58"      },
+        { "::2:0:59",      "::2:0:58"      },
+    };
+
+    run_ipX_tests(mmdb, pairs, 18, mode, mode_desc);
+
+    MMDB_close(mmdb);
+    free(mmdb);
+}
+
+int main(void)
+{
+    plan(NO_PLAN);
+    for_all_modes(&run_tests);
+    done_testing();
+    pthread_exit(NULL);
+}

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

@@ -0,0 +1,10 @@
+#include "maxminddb_test_helper.h"
+
+int main(void)
+{
+    const char *version = MMDB_lib_version();
+    if (ok((version != NULL), "MMDB_lib_version exists")) {
+        is(version, PACKAGE_VERSION, "version is " PACKAGE_VERSION);
+    }
+    done_testing();
+}

data/geoip2_c.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "Apache-2.0"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files         = `git ls-files -z --recurse-submodules`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features|benchmark)/})
   end
   spec.bindir        = "bin"

data/lib/geoip2/version.rb

@@ -1,3 +1,3 @@
 module GeoIP2
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip2_c
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - okkez
@@ -104,6 +104,87 @@ files:
 - dockerfiles/Dockerfile-ruby2.4
 - ext/geoip2/extconf.rb
 - ext/geoip2/geoip2.c
+- ext/geoip2/libmaxminddb/.gitignore
+- ext/geoip2/libmaxminddb/.gitmodules
+- ext/geoip2/libmaxminddb/.perltidyrc
+- ext/geoip2/libmaxminddb/.travis.yml
+- ext/geoip2/libmaxminddb/.uncrustify.cfg
+- ext/geoip2/libmaxminddb/AUTHORS
+- ext/geoip2/libmaxminddb/Changes.md
+- ext/geoip2/libmaxminddb/LICENSE
+- ext/geoip2/libmaxminddb/Makefile.am
+- ext/geoip2/libmaxminddb/NOTICE
+- ext/geoip2/libmaxminddb/README.dev.md
+- ext/geoip2/libmaxminddb/README.md
+- ext/geoip2/libmaxminddb/appveyor.yml
+- ext/geoip2/libmaxminddb/bin/Makefile.am
+- ext/geoip2/libmaxminddb/bin/mmdblookup.c
+- ext/geoip2/libmaxminddb/bootstrap
+- ext/geoip2/libmaxminddb/common.mk
+- ext/geoip2/libmaxminddb/configure.ac
+- ext/geoip2/libmaxminddb/dev-bin/make-man-pages.pl
+- ext/geoip2/libmaxminddb/dev-bin/ppa-release.sh
+- ext/geoip2/libmaxminddb/dev-bin/regen-prototypes.pl
+- ext/geoip2/libmaxminddb/dev-bin/regen-win32-test-projs.pl
+- ext/geoip2/libmaxminddb/dev-bin/release.sh
+- ext/geoip2/libmaxminddb/dev-bin/uncrustify-all.sh
+- ext/geoip2/libmaxminddb/dev-bin/valgrind-all.pl
+- ext/geoip2/libmaxminddb/doc/libmaxminddb.md
+- ext/geoip2/libmaxminddb/doc/mmdblookup.md
+- ext/geoip2/libmaxminddb/include/maxminddb.h
+- ext/geoip2/libmaxminddb/include/maxminddb_config.h.in
+- ext/geoip2/libmaxminddb/projects/VS12-tests/bad_pointers.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/basic_lookup.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/data_entry_list.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/data_types.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/dump.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/get_value.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/get_value_pointer_bug.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/ipv4_start_cache.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/ipv6_lookup_in_ipv4.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/libtap.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/maxminddb_test_helper.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/metadata.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/metadata_pointers.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/no_map_get_value.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/read_node.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/shared.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/threads.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12-tests/version.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12/README.md
+- ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb-release.props
+- ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb-x64.props
+- ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb.props
+- ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb.sln
+- ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb.vcxproj
+- ext/geoip2/libmaxminddb/projects/VS12/libmaxminddb.vcxproj.filters
+- ext/geoip2/libmaxminddb/projects/VS12/maxminddb_config.h
+- ext/geoip2/libmaxminddb/projects/test.vcxproj.template
+- ext/geoip2/libmaxminddb/src/Makefile.am
+- ext/geoip2/libmaxminddb/src/libmaxminddb.pc.in
+- ext/geoip2/libmaxminddb/src/maxminddb-compat-util.h
+- ext/geoip2/libmaxminddb/src/maxminddb.c
+- ext/geoip2/libmaxminddb/t/Makefile.am
+- ext/geoip2/libmaxminddb/t/bad_databases_t.c
+- ext/geoip2/libmaxminddb/t/bad_pointers_t.c
+- ext/geoip2/libmaxminddb/t/basic_lookup_t.c
+- ext/geoip2/libmaxminddb/t/compile_c++_t.pl
+- ext/geoip2/libmaxminddb/t/data_entry_list_t.c
+- ext/geoip2/libmaxminddb/t/data_types_t.c
+- ext/geoip2/libmaxminddb/t/dump_t.c
+- ext/geoip2/libmaxminddb/t/get_value_pointer_bug_t.c
+- ext/geoip2/libmaxminddb/t/get_value_t.c
+- ext/geoip2/libmaxminddb/t/ipv4_start_cache_t.c
+- ext/geoip2/libmaxminddb/t/ipv6_lookup_in_ipv4_t.c
+- ext/geoip2/libmaxminddb/t/maxminddb_test_helper.c
+- ext/geoip2/libmaxminddb/t/maxminddb_test_helper.h
+- ext/geoip2/libmaxminddb/t/metadata_pointers_t.c
+- ext/geoip2/libmaxminddb/t/metadata_t.c
+- ext/geoip2/libmaxminddb/t/mmdblookup_t.pl
+- ext/geoip2/libmaxminddb/t/no_map_get_value_t.c
+- ext/geoip2/libmaxminddb/t/read_node_t.c
+- ext/geoip2/libmaxminddb/t/threads_t.c
+- ext/geoip2/libmaxminddb/t/version_t.c
 - ext/geoip2/rb_compat.h
 - gemfiles/ruby_2.1.gemfile
 - gemfiles/ruby_2.2.gemfile