geoipdb 0.1.4 → 0.3.1

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Eugen Martin
+Copyright (c) 2010 madvertise GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -2,17 +2,17 @@
 
 Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions. 
 
-  * Returns a GeoLocation to a given IP. 
+  * Returns a GeoLocation and additional information for a given IP. 
   * Reads Data from CSV-Files and uses internal binary caching.
 
 ## Usage
 
-    db = GeoIpDb.init "city_codes.csv", "ip_city.txt", "ip_city.cache"
-    location_hash = db.city_by_ip("178.0.0.1")
-    # => {"name"=>"eschborn", "country"=>"deu", "lng"=>8.55, "lat"=>50.133333} 
+    db = IpDb.init "city_codes.csv", "ip_city.txt", "ip_city.cache"
+    ip_info = db.information_for_ip("178.0.0.1")
+    ip_info.inspect
+    => #<IpInformation:0x101385c78 @city_name="eschborn", @city_code="ax5", @lng=8.55, @country_iso_code="de", @lat=50.133333, @is_mobile=true> 
 
 == Copyright
 
-Copyright (c) 2010 Eugen Martin. See LICENSE.txt for
-further details.
-
+Copyright (c) 2010 madvertise GmbH. See LICENSE.txt for
+further details.

data/Rakefile

@@ -13,14 +13,15 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "geoipdb"
-  gem.homepage = "http://github.com/olgen/geoipdb"
+  gem.homepage = "http://github.com/madvertise/geoipdb"
   gem.license = "MIT"
   gem.summary = %Q{Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.}
-  gem.description = %Q{Returns a GeoLocation to a given IP. Reads Data from CSV-Files and uses internal binary caching.}
+  gem.description = %Q{Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching.}
   gem.email = "eugeniusmartinus@googlemail.com"
-  gem.authors = ["Eugen Martin"]
-  gem.extensions   = ['ext/extconf.rb']
-  gem.require_path = "ext"  
+  gem.authors = ["Eugen Martin", "Martin Karlsch"]
+  gem.extensions   = ['ext/geoipdb/extconf.rb']
+  gem.require_paths = ["lib","ext"]
+   
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.3.1

data/ext/geoipdb/Makefile

@@ -0,0 +1,187 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /Users/eugen/.rvm/rubies/ruby-1.9.2-p180/include/ruby-1.9.1
+hdrdir = /Users/eugen/.rvm/rubies/ruby-1.9.2-p180/include/ruby-1.9.1
+arch_hdrdir = /Users/eugen/.rvm/rubies/ruby-1.9.2-p180/include/ruby-1.9.1/$(arch)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/Users/eugen/.rvm/rubies/ruby-1.9.2-p180
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
+exec_prefix = $(prefix)
+vendorhdrdir = $(rubyhdrdir)/vendor_ruby
+sitehdrdir = $(rubyhdrdir)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
+pdfdir = $(docdir)
+dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(prefix)/var
+sharedstatedir = $(prefix)/com
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
+datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
+bindir = $(exec_prefix)/bin
+rubylibdir = $(rubylibprefix)/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sitelibdir = $(sitedir)/$(ruby_version)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
+
+CC = gcc
+CXX = g++
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
+
+RUBY_EXTCONF_H = 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long
+CFLAGS   = -fno-common $(cflags)  -fno-common -pipe 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L/usr/local/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
+AR = ar
+EXEEXT = 
+
+RUBY_BASE_NAME = ruby
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby.1.9.1
+arch = x86_64-darwin10.7.0
+sitearch = $(arch)
+ruby_version = 1.9.1
+ruby = /Users/eugen/.rvm/rubies/ruby-1.9.2-p180/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+DISTCLEANDIRS = 
+
+extout = 
+extout_prefix = 
+target_prefix = /geoipdb
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
+SRCS = geoipdb.c ipdb.c
+OBJS = geoipdb.o ipdb.o
+TARGET = geoipdb
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+BINDIR        = $(bindir)
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
+
+all:    $(DLLIB)
+static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
+
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean-rb-default::
+distclean-rb::
+distclean-so::
+distclean: clean distclean-so distclean-rb-default distclean-rb
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS)
+
+realclean: distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $(@)
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/geoipdb/extconf.rb

@@ -0,0 +1,5 @@
+require "mkmf"
+
+#extension_name = "geoipdb"
+#dir_config(extension_name)
+create_makefile("geoipdb/geoipdb")

data/ext/geoipdb/geoipdb.c

@@ -0,0 +1,112 @@
+#include "ipdb.h"
+
+#include "ruby.h"      
+/** 
+Ruby Wrapper
+*/
+
+typedef struct geipdb {
+  IPDB *db;
+} geoipdb;
+
+static VALUE cIpDb;
+
+// free the memory used by the db, called by the Ruby-GC
+void geoipdb_free(geoipdb *gi) {
+  printf("Freeing memory for the GeoIpDb.. \n");
+  if(gi == NULL)
+    return;
+  if (gi->db != NULL){
+    if(gi->db->cities != NULL ){
+      printf("..freeing cities \n");
+      free(gi->db->cities);
+      gi->db->cities = NULL;
+    }
+    if(gi->db->ranges != NULL ){
+      printf("..freeing ranges \n");
+      free(gi->db->ranges);
+      gi->db->ranges = NULL;
+    }
+    if(gi->db != NULL){
+      printf("..freeing ipdb \n");      
+      free(gi->db);      
+    }
+  }
+}
+
+
+VALUE ipdb_init(VALUE self, VALUE cities_file_name, VALUE ranges_file_name, VALUE cache_file_name) {
+  geoipdb *gi;
+  
+  Check_Type(cities_file_name, T_STRING);
+  Check_Type(ranges_file_name, T_STRING);
+  Check_Type(cache_file_name, T_STRING);
+  
+  char *cities_csv_file = RSTRING_PTR(cities_file_name);
+  char *ranges_csv_file = RSTRING_PTR(ranges_file_name);
+  char *cache_file =      RSTRING_PTR(cache_file_name);  
+  
+  gi = ALLOC(geoipdb);
+  
+  gi->db= init_db(cities_csv_file, ranges_csv_file, cache_file);               
+  
+  
+  if(gi->db == NULL)
+  {
+    if(DEBUG)
+      printf("Could not init DB!\n");
+    /*
+      TODO: Add geoipdb_free in this case.. though not important for production...
+    */
+    return Qnil;
+  }else{
+    if(DEBUG)
+      printf("\nDB Init completed!\n");
+    return(Data_Wrap_Struct(cIpDb, 0, geoipdb_free, gi));    
+  }
+}
+
+     
+VALUE build_ip_information_object(IpRange *range, City *city, char* isp) {
+  VALUE CIpInformation;
+  
+  CIpInformation = rb_const_get(rb_cObject, rb_intern("IpInformation"));
+  
+  VALUE ip_information = rb_funcall(CIpInformation, rb_intern("new"), 0);
+  rb_ivar_set(ip_information, rb_intern("@country_iso_code"), rb_str_new2(city->country_iso2) );
+  rb_ivar_set(ip_information, rb_intern("@city_name"), rb_str_new2(city->name) );     
+  rb_ivar_set(ip_information, rb_intern("@city_code"), INT2FIX(city->city_code) );     
+  rb_ivar_set(ip_information, rb_intern("@lng"), rb_float_new(city->lng) );
+  rb_ivar_set(ip_information, rb_intern("@lat"), rb_float_new(city->lat) );
+  rb_ivar_set(ip_information, rb_intern("@is_mobile"), range->is_mobile == 1 ? Qtrue : Qfalse );
+  rb_ivar_set(ip_information, rb_intern("@isp_name"), isp == NULL ? Qnil : ID2SYM( rb_intern(isp) ) );  
+
+  return ip_information;
+}       
+
+VALUE ipdb_information_for_ip(VALUE self, VALUE ip_string){
+  char *ip = RSTRING_PTR(ip_string);
+  geoipdb *gi;                        
+  
+  Data_Get_Struct(self, geoipdb, gi);
+  
+  IpRange* ip_range = find_range_for_ip(gi->db, ip);  
+  
+  if(!ip_range)
+    return Qnil;              
+    
+  City * city = find_city_for_ip_range(gi->db, ip_range);
+  if(!city)
+    return Qnil;                    
+  
+  char* isp = find_isp_for_ip_range(gi->db, ip_range);
+  
+  return build_ip_information_object(ip_range, city, isp);
+}
+
+void Init_geoipdb(void)
+{     
+  cIpDb = rb_define_class( "GeoIpDb", rb_cObject);
+  rb_define_singleton_method( cIpDb, "init", ipdb_init, 3); 
+  rb_define_method( cIpDb, "information_for_ip",  ipdb_information_for_ip, 1);  
+}

data/ext/{ipdb.c → geoipdb/ipdb.c}

@@ -6,9 +6,6 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-
-
-
 const char country_iso2_codes[253][3] = { "--","ap","eu","ad","ae","af","ag","ai","al","am","an",
 	"ao","aq","ar","as","at","au","aw","az","ba","bb",
 	"bd","be","bf","bg","bh","bi","bj","bm","bn","bo",
@@ -144,7 +141,26 @@ ip_to_int(const char *addr){
 	ipnum <<= 8;
 	return ipnum + octet;
 }
-
+      
+
+unsigned char con_type_to_int(char* con_type) {
+  // possible values
+  // ?
+  // dialup
+  // broadband
+  // cable
+  // xdsl
+  // mobile
+  // t1
+  // t3
+  // oc3
+  // oc12
+  // satellite
+  // wireless                
+  if(strlen(con_type) > 0 && (con_type[0] == 'm'))
+    return 1;
+  return 0;
+}
 
 // Function to compare 
 // - either two ip-ranges: i.e.: a(from...to) <=> b(from...to)
@@ -250,13 +266,10 @@ city_index_by_code(IPDB * db, uint16 city_code){
 }
 
 
-City * 
-city_by_ip(IPDB *db, char *ip){
-  IpRange * search, *result;
+IpRange* find_range_for_ip(IPDB *db, char *ip) {
+  IpRange* search;
+  IpRange* result;
   search = (IpRange *)malloc(sizeof(IpRange));
-  void * res;
-
-  // print_stats(db);
   
   if(db == NULL)
   {
@@ -275,24 +288,29 @@ city_by_ip(IPDB *db, char *ip){
   search->city_index = 0;
   if(DEBUG)
     printf("Searching for: ip=%s, ipnum=%lu \n", ip, search->from);
-  // result = (IpRange*) bsearch(search, db->ranges, db->ranges_count-2, sizeof(IpRange), compare_ranges);    
-  res = bsearch(search, db->ranges, db->ranges_count, sizeof(IpRange), compare_ranges);
+  result = (IpRange*)bsearch(search, db->ranges, db->ranges_count, sizeof(IpRange), compare_ranges);
   if(search != NULL)
     free(search);
     
-  if(res == NULL)
+  if(result == NULL)
   { 
     if(DEBUG)
-    printf("ERROR: Could not find the IP: %s! THIS SHOULD NOT HAPPEN!\n", ip);
+      printf("ERROR: Could not find the IP: %s! THIS SHOULD NOT HAPPEN!\n", ip);
     return NULL;
-  }else{
-    result = (IpRange*) res;
-    if(DEBUG){
+  } else {
+    if(DEBUG) {
       printf("Found Range: \t");    
       print_range(result);  
-    }
+    }                       
+    return (IpRange*)result; 
   }
-  
+}
+
+City * find_city_for_ip_range(IPDB * db, IpRange* range) 
+{
+  if(!db || !range)
+    return NULL;  
+                                                                 
   if(db->cities_count == 0)
   {
     if(DEBUG)
@@ -300,21 +318,55 @@ city_by_ip(IPDB *db, char *ip){
     return NULL;
   }
   
-  
-  if(result->city_index >0 && result->city_index < db->cities_count)
+  if( range->city_index <= 0 || range->city_index >= db->cities_count ) 
   {
-    // address the city directly via the array-idx
-    return &(db->cities[result->city_index]);
-  } else {
     if(DEBUG)
-      printf("ERROR: Could not find city with index: %i - THIS SHOULD NOT HAPPEN!\n", result->city_index);
-    return NULL; 
+      printf("ERROR: Could not find city with index: %i - THIS SHOULD NOT HAPPEN!\n", range->city_index);
+  }                                                                                                      
+  
+  return &(db->cities[range->city_index]);
+}
+
+char* find_isp_for_ip_range(IPDB * db, IpRange* range)
+{
+  if( range == NULL || range->isp_index < 0 || range->isp_index > MAX_ISPS_COUNT){
+    printf("Could not find isp for isp_index=%i", range->isp_index);
+    return NULL;
+  }
+  return db->isps[range->isp_index];
+}
+
+int16
+isp_index_by_name(IPDB * db, char* isp_name){
+  if(isp_name == NULL || isp_name == "")
+    return -1;
+  if( db->isps_count > 0){
+    int16 i = 0;
+    for( i = 0; i < db->isps_count; i++)
+    {
+      if( strcmp(db->isps[i], isp_name)==0)
+      {
+        return i;
+      }
+    }
+  }
+  // TODO: malloc more space if needed
+  // add new isp
+  if(db->isps_count < MAX_ISPS_COUNT){
+    int16 new_index = db->isps_count;
+    strncpy(db->isps[new_index], isp_name, MAX_ISP_NAME_LENGTH);
+    db->isps_count++;
+    return new_index;
+  }else{
+    printf("ERROR: MAX_ISPS_COUNT = %i limit reached - this should not happen!", MAX_ISPS_COUNT);
+    return -1;
   }
 }
 
 
+
 // read ip-ranges from csv file, of format:
-// from_ip|to_ip|city_code
+// from_ip|to_ip|contype|city_code
 void 
 read_ranges_csv(IPDB * db){  
   struct timeval tim;
@@ -332,39 +384,56 @@ read_ranges_csv(IPDB * db){
     return;
   }
   char line[256];
-  char* from = NULL;
-  char* to = NULL;
-  char* city_code = NULL;
-  int invalid_cities_count = 0;
+  char* from;
+  char* to;
+  char* city_code;         
   int city_index;
+
+  char* con_type;
+	char* isp_name;
+  uint16 isp_index;
+
+  int invalid_cities_count = 0;
   
   IpRange* entry;
   db->ranges_count = 0;
-  while (fgets(line,sizeof(line),f) && db->ranges_count < db->max_ranges_count){
+  while (fgets(line, sizeof(line) ,f) && db->ranges_count < db->max_ranges_count){
+    from = NULL;
+    to = NULL;
+    city_code = NULL;
+    city_index = 0;
+
+    con_type = NULL;
+  	isp_name = NULL;
+    int16 isp_index = -1;
+
     if(DEBUG && db->ranges_count % 1000000 == 0)
       printf("Worked lines: %i\n", db->ranges_count);
 
     from =      strtok(line, RANGES_DELIM);
     to =        strtok(NULL, RANGES_DELIM);
+    con_type =  strtok(NULL, RANGES_DELIM);
     city_code = strtok(NULL, RANGES_DELIM);
+    isp_name =  strtok(NULL, RANGES_DELIM);
+
     city_index = city_index_by_code(db, atoi(city_code));
+    isp_index = isp_index_by_name(db, isp_name);
+
     if(city_index < 0)
-    { 
+    {
       if(DEBUG)
         printf("Could not find city for code: %i", atoi(city_code));
       invalid_cities_count ++;
       continue;
     }else{
       entry = &(db->ranges[db->ranges_count]);
-    
       entry->from = ip_to_int(from);
-      entry->to = ip_to_int(to);
-      // entry->city_code = atoi(city_code);
-    
+      entry->to = ip_to_int(to);           
+      entry->is_mobile = con_type_to_int(con_type);
       entry->city_index = city_index;
-      // printf("Line: %s", line);
-      // printf("from: %u,to: %u, city_code:%i \n",entry->from,entry->to,entry->city_code);
-      // db->ranges[i] = *entry;
+      entry->isp_index = isp_index;
+      
+      // printf("from: %u,to: %u, city_code:%s, city_index: %i\n",entry->from,entry->to,city_code, entry->city_index);
       // printf("working record nr: %li\n", db->ranges_count);
       db->ranges_count++;
     }
@@ -488,13 +557,20 @@ write_cache_file(IPDB * db){
     printf("FieldLength: %li\n",sizeof(db->ranges[0].from));    
   }
   //write the header: i.e.: numbers of records
-  fwrite(&(db->cities_count), sizeof(db->cities_count),1,f);  
+  fwrite(&(db->cities_count), sizeof(db->cities_count),1,f);
+  fwrite(&(db->isps_count), sizeof(db->isps_count),1,f);  
   fwrite(&(db->ranges_count), sizeof(db->ranges_count),1,f);
   
   if(DEBUG)
     printf("Writing Contents with %i cities, a %li bytes each, should = %li \n", db->cities_count, sizeof(City), db->cities_count * sizeof(City));  
   //write the actual data: all the ranges-array-buffer:
   objects_written = fwrite(db->cities, sizeof(City), db->cities_count, f);
+  
+  if(DEBUG)
+    printf("Writing Contents with %i isps, a %li bytes each, should = %li \n", db->isps_count, MAX_ISP_NAME_LENGTH, db->isps_count * MAX_ISP_NAME_LENGTH);  
+  //write the actual data: all the ranges-array-buffer:
+  objects_written += fwrite(db->isps, MAX_ISP_NAME_LENGTH, db->isps_count, f);
+  
   if(DEBUG)
     printf("Writing Contents with %i ranges, a %li bytes each, should = %li \n", db->ranges_count, sizeof(IpRange), db->ranges_count * sizeof(IpRange));  
   //write the actual data: all the ranges-array-buffer:
@@ -518,22 +594,28 @@ read_cache_file(IPDB * db){
     return 0;
   }
   int cities_header_read = fread(&(db->cities_count), sizeof(db->cities_count),1,f);
+  int isps_header_read = fread(&(db->isps_count), sizeof(db->isps_count),1,f);  
   int ranges_header_read = fread(&(db->ranges_count), sizeof(db->ranges_count),1,f);
 
   
-  if(cities_header_read == 0 || ranges_header_read == 0 || db->cities_count == 0 || db->ranges_count ==0 )
+  if(cities_header_read == 0 || isps_header_read == 0 || ranges_header_read == 0 || db->cities_count == 0 || db->isps_count ==0 || db->ranges_count ==0)
   {
     printf("Could not read Cities-Header from Cache-File: %s", db->cache_file_name);
     return 0;
   }
   if(DEBUG)  
-    printf("Reading DB-Header from Cache-File: %s, with %i cities and %i ranges\n",db->cache_file_name, db->cities_count, db->ranges_count);  
+    printf("Reading DB-Header from Cache-File: %s, with %i cities, %iisps and %i ranges\n",db->cache_file_name, db->cities_count, db->isps_count, db->ranges_count);  
 
   int objects_read = 0;
   if(DEBUG)
     printf("Allocating: %lu for cities-array \n", sizeof(City)*(db->cities_count));
   db->cities = malloc(sizeof(City) * db->cities_count);
   objects_read += fread(db->cities, sizeof(City),db->cities_count,f);
+
+  if(DEBUG)
+    printf("Reading in the isps into preallocated buffer of size: ", sizeof(db->isps));
+  objects_read += fread(db->isps, MAX_ISP_NAME_LENGTH, db->isps_count,f);
+
   if(DEBUG)
     printf("Allocating: %lu for ranges-array \n", sizeof(IpRange)*(db->ranges_count));
   db->ranges = malloc(sizeof(IpRange) * db->ranges_count);
@@ -554,8 +636,9 @@ benchmark_search(IPDB * db,int count){
   int i;
   City * city;
 
-  for(i=0;i<count; i++){
-     city = city_by_ip(db, "278.50.47.0");
+  for(i=0;i<count; i++){             
+    IpRange* range = find_range_for_ip(db,"278.50.47.0");
+    City* city = find_city_for_ip_range(db,range);
   }
   double delta = get_time(&tim)-t1;
   
@@ -563,6 +646,8 @@ benchmark_search(IPDB * db,int count){
 }
 
 IPDB * init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file_name){
+  if(DEBUG)
+    printf("Initializing db");
   IPDB *db;
   db = (IPDB*)malloc(sizeof(IPDB));
   if (db == NULL) //no memory left
@@ -575,6 +660,10 @@ IPDB * init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file
   db->max_cities_count = MAX_CITIES_COUNT;
   db->ranges_csv_file = ranges_csv_file;
   db->max_ranges_count = MAX_RANGES_COUNT;
+  
+  // db->isps = NULL;
+  // db->isps = malloc(MAX_ISP_NAME_LENGTH * MAX_ISPS_COUNT);  
+  db->isps_count = 0;
     
 
   if(USE_CACHE && read_cache_file(db) > 0){

data/ext/{ipdb.h → geoipdb/ipdb.h}

@@ -11,21 +11,31 @@ typedef unsigned short uint16;
 typedef int int32;
 #endif
 
+#ifdef RSTRING_PTR
+#else
+# define RSTRING_LEN(x) (RSTRING(x)->len) 
+# define RSTRING_PTR(x) (RSTRING(x)->ptr) 
+#endif
+
+
+#define RANGES_DELIM ",\n"
+#define CITIES_DELIM ",\n"
 
-#define RANGES_DELIM "|"
-#define CITIES_DELIM ","
 #define MAX_CITIES_COUNT 100000 //Usually we have about 50 000 Cities
-#define MAX_RANGES_COUNT 10000000 //Usually we have about 6 Mio IP-Ranges
+#define MAX_RANGES_COUNT 10000000 //Usually we have about 6 Mio IP-Ranges       
 
+#define MAX_ISPS_COUNT 100000
+#define MAX_ISP_NAME_LENGTH 100
 
 #define USE_CACHE 1
 #define DEBUG 0
 
 typedef struct{
   unsigned long from;
-  unsigned long to;
-  // uint16 city_code; //city codes are not larger than 2**16 = 65536
+  unsigned long to;     
+  unsigned char is_mobile;
   uint16 city_index; //index of the city in the cities-array
+  int16 isp_index; //index of the isp in the isps-array  
 } IpRange;
 
 typedef struct{
@@ -47,11 +57,14 @@ typedef struct{
   unsigned int cities_count;  
   unsigned int max_cities_count;
 
-  
   char *cache_file_name; // a binary file to store the whole db.....
   IpRange * ranges;
   City * cities;
 
+  char isps[MAX_ISPS_COUNT][MAX_ISP_NAME_LENGTH]; // a fixed size array of strings should be enough here...do not expect the isps to grow dramatically..
+  uint16 isps_count; 
+
+
 } IPDB;
 
 
@@ -59,11 +72,18 @@ typedef struct{
 IPDB * 
 init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file_name);
 
-City * 
-city_by_ip(IPDB *db, char *ip);
 
 void 
 print_city(const City * e);
 
 void 
-benchmark_search(IPDB * db,int count);
+benchmark_search(IPDB * db,int count);        
+
+IpRange*
+find_range_for_ip(IPDB *db, char *ip);
+
+City* 
+find_city_for_ip_range(IPDB * db, IpRange* range);
+
+char*
+find_isp_for_ip_range(IPDB * db, IpRange* range);

data/geoipdb.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geoipdb}
-  s.version = "0.1.4"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eugen Martin"]
-  s.date = %q{2011-01-13}
-  s.description = %q{Returns a GeoLocation to a given IP. Reads Data from CSV-Files and uses internal binary caching.}
+  s.authors = ["Eugen Martin", "Martin Karlsch"]
+  s.date = %q{2011-06-14}
+  s.description = %q{Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching.}
   s.email = %q{eugeniusmartinus@googlemail.com}
-  s.extensions = ["ext/extconf.rb"]
+  s.extensions = ["ext/geoipdb/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -25,21 +25,26 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
-    "ext/build.sh",
-    "ext/extconf.rb",
-    "ext/geoipdb.c",
-    "ext/ipdb.c",
-    "ext/ipdb.h",
-    "ext/test.c",
+    "ext/geoipdb/Makefile",
+    "ext/geoipdb/build.sh",
+    "ext/geoipdb/extconf.rb",
+    "ext/geoipdb/geoipdb.c",
+    "ext/geoipdb/ipdb.c",
+    "ext/geoipdb/ipdb.h",
     "geoipdb.gemspec",
     "lib/geoipdb.rb",
+    "sample_data/cities.csv",
+    "sample_data/citiess_corrupt.csv",
+    "sample_data/ip_ranges.csv",
+    "sample_data/ip_ranges_corrupt.csv",
     "spec/geoipdb_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "test.rb"
   ]
-  s.homepage = %q{http://github.com/olgen/geoipdb}
+  s.homepage = %q{http://github.com/madvertise/geoipdb}
   s.licenses = ["MIT"]
-  s.require_paths = ["ext"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = ["lib", "ext"]
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.}
   s.test_files = [
     "spec/geoipdb_spec.rb",
@@ -47,7 +52,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/geoipdb.rb

@@ -0,0 +1,17 @@
+require 'rbconfig'
+
+require 'geoipdb/geoipdb'
+
+class IpInformation
+  attr_accessor :country_iso_code
+  attr_accessor :city_code
+  attr_accessor :city_name
+  attr_accessor :lat
+  attr_accessor :lng
+  attr_accessor :is_mobile
+  attr_accessor :isp_name
+  
+  def mobile?
+    @is_mobile
+  end
+end

data/sample_data/ip_ranges.csv

@@ -1,11 +1,11 @@
-start_ip|end_ip|field 13|
-0.0.0.0|0.0.0.255|0|
-0.0.1.0|0.255.255.255|1|
-1.0.0.0|1.0.0.255|2|
-1.0.1.0|1.1.0.255|3|
-1.1.1.0|1.1.1.255|4|
-1.1.2.0|1.2.2.255|5|
-1.2.3.0|1.2.3.255|5|
-1.2.4.0|1.3.255.255|2|
-1.4.0.0|1.4.0.255|5|
-1.4.1.0|1.8.255.255|3|
+start_ip,end_ip,field 4,field 13,
+0.0.0.0,0.0.0.255,mobile,0
+0.0.1.0,0.255.255.255,mobile,1,asdf,
+1.0.0.0,1.0.0.255,xdsl,2,vodafone
+1.0.1.0,1.1.0.255,wireless,3,
+1.1.1.0,1.1.1.255,mobile,4,1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone
+1.1.2.0,1.2.2.255,mobile,5,
+1.2.3.0,1.2.3.255,mobile,5,
+1.2.4.0,1.3.255.255,mobile,2,
+1.4.0.0,1.4.0.255,mobile,5,
+1.4.1.0,1.8.255.255,mobile,3,

data/sample_data/ip_ranges_corrupt.csv

@@ -1,20 +1,20 @@
 
 
 
-start_ip|end_ip|field 13|
-0.0.0.0|0.0.0.255|0|
+start_ip,end_ip,field 13,
+0.0.0.0,0.0.0.255,0,
 
-0.0.1.0|0.255.255.255|1|
+0.0.1.0,0.255.255.255,1,
 
-1.0.0.0|1.0.0.255|2|
+1.0.0.0,1.0.0.255,2,
 
-1.0.1.0|1.1.0.255|3|
+1.0.1.0,1.1.0.255,3,
 
 asfdasdf asdf asfasdfasdf§$%&/
 
-1, | | 7 |.1.1.0|1.1.1.255|4|
-1.1.2.0|1.2.2.255|5|
-1.2.3.0|1.2.3.255|5|
-1.2.4.0|1.3.255.255|2|
-1.4.0.0|1.4.0.255|5|
-1.4.1.0|1.8.255.255|3|
+1, , , 7 ,.1.1.0,1.1.1.255,4,
+1.1.2.0,1.2.2.255,5,
+1.2.3.0,1.2.3.255,5,
+1.2.4.0,1.3.255.255,2,
+1.4.0.0,1.4.0.255,5,
+1.4.1.0,1.8.255.255,3,

data/spec/geoipdb_spec.rb

@@ -1,37 +1,57 @@
 require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
 
 
-describe "Geoipdb" do
+describe GeoIpDb do                                                               
+  
+  CACHE_FILE = 'sample_data/ipdb.cache'
+  
   def init_db
-    @db = GeoIpDb.init './sample_data/cities.csv', './sample_data/ip_ranges.csv', @cache_file
-  end
+    @db = GeoIpDb.init './sample_data/cities.csv', './sample_data/ip_ranges.csv', CACHE_FILE 
+  end       
   
-  before :each do
-    @cache_file = 'sample_data/ipdb.cache'
+  it "should not throw an exception fault if data is corrupt" do
+    @db = GeoIpDb.init './sample_data/cities_corrupt.csv', './sample_data/ip_ranges_corrupt.csv', CACHE_FILE
+  end
+
+  it "should not init a db object if data files are missing" do
+    GeoIpDb.init( './sample_data/bla.csv', './sample_data/blubb.csv', CACHE_FILE ).should be_nil
   end
   
   it "should init correctly with sample data and create the cache-file" do
     init_db
     @db.should_not be_nil
-    File.exist?(@cache_file).should be_true
+    File.exist?(CACHE_FILE).should be_true
   end
   
   it "sould find the sample cities correcty" do 
     init_db
     #afg,no region,kabul,-1,3,34.5167,69.1833
-    @db.city_by_ip("1.1.0.254").should == {'city_code'=>3, 'name'=>'kabul', 'country'=>'af', 'lat'=>34.5167, 'lng'=>69.1833}
+    info = @db.information_for_ip "1.1.0.254"         
+    info.city_code.should == 3
+    info.city_name.should == 'kabul'             
+    info.country_iso_code.should == 'af'
+    info.lat.should == 34.5167
+    info.lng.should == 69.1833
+    info.should_not be_mobile
   end
   
-  it "should not throw an exception fault if data is corrupt" do
-    @db = GeoIpDb.init './sample_data/cities_corrupt.csv', './sample_data/ip_ranges_corrupt.csv', @cache_file    
-  end
-
-  it "should not init a db object if data files are missing" do
-    GeoIpDb.init( './sample_data/bla.csv', './sample_data/blubb.csv', @cache_file    ).should be_nil
+  it 'should return correct is_mobile information' do
+    init_db           
+    @db.information_for_ip("1.0.0.1").should_not be_mobile             
+    @db.information_for_ip("1.1.1.1").should be_mobile
+  end 
+  
+  it 'should return correct isp_name in ip_information' do
+    init_db           
+    @db.information_for_ip("1.0.0.1").isp_name.should == :vodafone
+    @db.information_for_ip("1.1.1.1").isp_name.should == "1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone"[0..99].to_sym
+    @db.information_for_ip("1.2.1.1").isp_name.should == nil
   end
 
+  it "should write and read the cachefile correctly"
   
   after :each do
-    File.unlink @cache_file if File.exist? @cache_file
+    File.unlink CACHE_FILE if File.exist? CACHE_FILE
   end
+
 end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rspec'
-require 'geoipdb'
+require 'lib/geoipdb'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/test.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'ext'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'lib/geoipdb'
+
+
+db = GeoIpDb.init 'ext/data/cities.csv', 'ext/data/ip_ranges.csv', 'ext/data/ipdb.cache'
+
+puts db.information_for_ip("165.193.245.54").inspect

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: geoipdb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
+  - 3
   - 1
-  - 4
-  version: 0.1.4
+  version: 0.3.1
 platform: ruby
 authors: 
 - Eugen Martin
+- Martin Karlsch
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +01:00
+date: 2011-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +32,11 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id001
   prerelease: false
-  name: rspec
-- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +48,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
   prerelease: false
-  name: bundler
-- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +64,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id003
   prerelease: false
-  name: jeweler
-- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,15 +78,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   prerelease: false
-  name: rcov
-description: Returns a GeoLocation to a given IP. Reads Data from CSV-Files and uses internal binary caching.
+  type: :development
+  requirement: *id004
+description: Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching.
 email: eugeniusmartinus@googlemail.com
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- ext/geoipdb/extconf.rb
 extra_rdoc_files: 
 - LICENSE.txt
 - README.markdown
@@ -97,12 +98,12 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
-- ext/build.sh
-- ext/extconf.rb
-- ext/geoipdb.c
-- ext/ipdb.c
-- ext/ipdb.h
-- ext/test.c
+- ext/geoipdb/Makefile
+- ext/geoipdb/build.sh
+- ext/geoipdb/extconf.rb
+- ext/geoipdb/geoipdb.c
+- ext/geoipdb/ipdb.c
+- ext/geoipdb/ipdb.h
 - geoipdb.gemspec
 - lib/geoipdb.rb
 - sample_data/cities.csv
@@ -111,14 +112,16 @@ files:
 - sample_data/ip_ranges_corrupt.csv
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
+- test.rb
 has_rdoc: true
-homepage: http://github.com/olgen/geoipdb
+homepage: http://github.com/madvertise/geoipdb
 licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
+- lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
@@ -141,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.

data/ext/extconf.rb

@@ -1,5 +0,0 @@
-require "mkmf"
-
-extension_name = "geoipdb"
-dir_config(extension_name)
-create_makefile(extension_name)

data/ext/geoipdb.c

@@ -1,109 +0,0 @@
-#include "ipdb.h"
-
-#include "ruby.h"
-
-/** 
-Ruby Wrapper
-*/
-
-typedef struct geipdb {
-  IPDB *db;
-} geoipdb;
-
-static VALUE cGeoIpDb;
-
-VALUE method_hello_world(VALUE self);
-
-// free the memory used by the db, called by the Ruby-GC
-void geoipdb_free(geoipdb *gi) {
-  printf("Freeing memory for the GeoIpDb.. \n");
-  if(gi == NULL)
-    return;
-  if (gi->db != NULL){
-    if(gi->db->cities != NULL ){
-      printf("..freeing cities \n");
-      free(gi->db->cities);
-      gi->db->cities = NULL;
-    }
-    if(gi->db->ranges != NULL ){
-      printf("..freeing ranges \n");
-      free(gi->db->ranges);
-      gi->db->ranges = NULL;
-    }
-    if(gi->db != NULL){
-      printf("..freeing ipdb \n");      
-      free(gi->db);      
-    }
-  }
-}
-
-
-VALUE ipdb_init(VALUE self, VALUE cities_file_name, VALUE ranges_file_name, VALUE cache_file_name) {
-  geoipdb *gi;
-  
-  Check_Type(cities_file_name, T_STRING);
-  Check_Type(ranges_file_name, T_STRING);
-  Check_Type(cache_file_name, T_STRING);
-  
-  char *cities_csv_file = RSTRING(cities_file_name)->ptr;
-  char *ranges_csv_file = RSTRING(ranges_file_name)->ptr;
-  char *cache_file =      RSTRING(cache_file_name)->ptr;  
-  
-  gi = malloc(sizeof(geoipdb));
-  
-  gi->db= init_db(cities_csv_file, ranges_csv_file, cache_file);
-  
-  if(gi->db == NULL)
-  {
-    if(DEBUG)
-      printf("Could not init DB!\n");
-    /*
-      TODO: Add geoipdb_free in this case.. though not important for production...
-    */
-    return Qnil;
-  }else{
-    if(DEBUG)
-      printf("\nDB Init completed!\n");
-    return(Data_Wrap_Struct(cGeoIpDb, 0, geoipdb_free, gi));    
-  }
-}
-
-
-VALUE city_to_hash(City * city){
-  VALUE hash = rb_hash_new();       
-  // return a ruby-hash with the needed data
-  rb_hash_aset(hash, rb_str_new2("name"), rb_str_new2(city->name));  
-  rb_hash_aset(hash, rb_str_new2("country"), rb_str_new2(city->country_iso2));      
-  rb_hash_aset(hash, rb_str_new2("lat"), rb_float_new(city->lat));  
-  rb_hash_aset(hash, rb_str_new2("lng"), rb_float_new(city->lng));      
-  rb_hash_aset(hash, rb_str_new2("city_code"), INT2FIX(city->city_code));        
-  return hash;
-}
-
-VALUE ipdb_city_by_ip(VALUE self, VALUE ip_string){
-  char *ip = RSTRING(ip_string)->ptr;
-  geoipdb *gi;
-  
-  Data_Get_Struct(self, geoipdb, gi);
-  City * city = city_by_ip(gi->db, ip);  
-  if(city == NULL)
-  {
-    // printf("Could not find city for ip: %s\n", ip);
-    return Qnil;
-  }else{
-    // printf("Found city for ip: %s\n", ip);
-    // print_city(city);
-    return city_to_hash(city);
-    // create a hash to return to ruby:
-  }
-}
-
-
-
-void Init_geoipdb(void)
-{
-  //Erstelle die Klasse cGeoIpDb als Subklasse von Object
-  cGeoIpDb = rb_define_class( "GeoIpDb", rb_cObject);
-  rb_define_singleton_method( cGeoIpDb, "init",        ipdb_init, 3); 
-  rb_define_method(           cGeoIpDb, "city_by_ip",  ipdb_city_by_ip, 1);  
-}

data/ext/test.c

@@ -1,42 +0,0 @@
-#include "ipdb.h"
-
-#include <search.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/time.h>
-
-
-
-int main() {
-  IPDB * db = init_db("data/cities.csv", "data/ip_ranges.csv", "data/ipdb.cache");
-  // IPDB * db = init_db(NULL, NULL, NULL);  
-  
-
-  // City * city;
-  // 
-  // // city = city_by_ip(db, "1.16.0.0");  
-  // int i;
-  int count = 10000000;
-  
-  benchmark_search(db, count);
-  
-  // for(i = 0; i < count; ++i)
-  // {
-  //   if(i % 100000 == 0)
-  //     printf("Working: i= %i \n", i);
-  //     
-  //   city = city_by_ip(db, "91.44.93.35");
-  // }
-  
-
-
-
-  
- //  
-  int * response;
-  scanf("%i",response);
-
-  return 0;
-
-}