geoipdb 0.3.1 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.1

data/ext/geoipdb/Makefile

@@ -4,84 +4,67 @@ 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)
+topdir = /Users/eugen/.rvm/rubies/ree-1.8.7-2011.03/lib/ruby/1.8/i686-darwin10.7.0
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
 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)
+prefix = $(DESTDIR)/Users/eugen/.rvm/rubies/ree-1.8.7-2011.03
+sharedstatedir = $(prefix)/com
 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
+localedir = $(datarootdir)/locale
+bindir = $(exec_prefix)/bin
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(libdir)/ruby/site_ruby
+htmldir = $(docdir)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
+infodir = $(datarootdir)/info
+vendorlibdir = $(vendordir)/$(ruby_version)
 sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
+libdir = $(exec_prefix)/lib
 sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-rubylibdir = $(rubylibprefix)/$(ruby_version)
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+vendordir = $(libdir)/ruby/vendor_ruby
+datarootdir = $(prefix)/share
+pdfdir = $(docdir)
 archdir = $(rubylibdir)/$(arch)
-sitelibdir = $(sitedir)/$(ruby_version)
 sitearchdir = $(sitelibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
+datadir = $(datarootdir)
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
 
 CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = 
 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)
+CFLAGS   =  -fno-common -g -O2  -pipe -fno-common $(cflags) 
+INCFLAGS = $(PREINCFLAGS) -I. -I/opt/local/include -I$(topdir) -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
+CPPFLAGS =   -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) 
+ldflags  = -L. 
+dldflags = 
+archflag = 
+DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
 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_SO_NAME = ruby
+arch = i686-darwin10.7.0
+sitearch = i686-darwin10.7.0
+ruby_version = 1.8
+ruby = /Users/eugen/.rvm/rubies/ree-1.8.7-2011.03/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
@@ -98,13 +81,12 @@ DEFFILE =
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
-DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = /geoipdb
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
+LIBS =   -L/opt/local/lib -ldl -lobjc  
 SRCS = geoipdb.c ipdb.c
 OBJS = geoipdb.o ipdb.o
 TARGET = geoipdb
@@ -116,40 +98,28 @@ 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
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean: clean distclean-so distclean-rb-default distclean-rb
+distclean:	clean
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		@-$(RMDIRS) $(DISTCLEANDIRS)
 
-realclean: distclean
+realclean:	distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_PROG) $(DLLIB) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
@@ -164,24 +134,24 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
 
 $(DLLIB): $(OBJS) Makefile
-	@-$(RM) $(@)
+	@-$(RM) $@
 	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
+$(OBJS): ruby.h defines.h

data/ext/geoipdb/geoipdb.c

@@ -1,7 +1,7 @@
+#include "ruby.h"
 #include "ipdb.h"
 
-#include "ruby.h"      
-/** 
+/**
 Ruby Wrapper
 */
 
@@ -28,8 +28,8 @@ void geoipdb_free(geoipdb *gi) {
       gi->db->ranges = NULL;
     }
     if(gi->db != NULL){
-      printf("..freeing ipdb \n");      
-      free(gi->db);      
+      printf("..freeing ipdb \n");
+      free(gi->db);
     }
   }
 }
@@ -37,20 +37,20 @@ void geoipdb_free(geoipdb *gi) {
 
 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);  
-  
+  char *cache_file =      RSTRING_PTR(cache_file_name);
+
   gi = ALLOC(geoipdb);
-  
-  gi->db= init_db(cities_csv_file, ranges_csv_file, cache_file);               
-  
-  
+
+  gi->db= init_db(cities_csv_file, ranges_csv_file, cache_file);
+
+
   if(gi->db == NULL)
   {
     if(DEBUG)
@@ -62,51 +62,51 @@ VALUE ipdb_init(VALUE self, VALUE cities_file_name, VALUE ranges_file_name, VALU
   }else{
     if(DEBUG)
       printf("\nDB Init completed!\n");
-    return(Data_Wrap_Struct(cIpDb, 0, geoipdb_free, gi));    
+    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("@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) ) );  
+  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;                        
-  
+  geoipdb *gi;
+
   Data_Get_Struct(self, geoipdb, gi);
-  
-  IpRange* ip_range = find_range_for_ip(gi->db, ip);  
-  
+
+  IpRange* ip_range = find_range_for_ip(gi->db, ip);
+
   if(!ip_range)
-    return Qnil;              
-    
+    return Qnil;
+
   City * city = find_city_for_ip_range(gi->db, ip_range);
   if(!city)
-    return Qnil;                    
-  
+    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);  
+  rb_define_singleton_method( cIpDb, "init", ipdb_init, 3);
+  rb_define_method( cIpDb, "information_for_ip",  ipdb_information_for_ip, 1);
 }

data/ext/geoipdb/ipdb.c

@@ -63,12 +63,12 @@ const char country_iso3_codes[253][4] = { "--","ap","eu","and","are","afg","atg"
   "blm","maf"};
 
 
-void 
+void
 print_range(const IpRange* e){
-  printf( "from: %lu, to:%lu ->City-idx: %i \n",e->from, e->to,e->city_index );    
+  printf( "from: %lu, to:%lu ->City-idx: %i \n",e->from, e->to,e->city_index );
 }
 
-void 
+void
 print_ranges(IPDB * db){
   int i;
   for(i = 0; i < db->ranges_count; ++i)
@@ -77,16 +77,16 @@ print_ranges(IPDB * db){
   }
 }
 
-void 
+void
 print_city(const City * e){
   if(e == NULL)
   {
     return;
   }
-  printf( "City: code:%i, name:%s, country: %s, lat: %10.7f, lng: %10.7f  \n",e->city_code, e->name, e->country_iso3, e->lat, e->lng );    
+  printf( "City: code:%i, name:%s, country: %s, lat: %10.7f, lng: %10.7f  \n",e->city_code, e->name, e->country_iso3, e->lat, e->lng );
 }
 
-void 
+void
 print_cities(IPDB * db){
   int i;
   for(i = 0; i < db->cities_count; ++i)
@@ -100,10 +100,10 @@ print_cities(IPDB * db){
 void print_stats(IPDB * db){
   printf("DB STATS: \n");
   printf("\tCities: %i\n", db->cities_count);
-  printf("\tRanges: %i\n", db->ranges_count);  
+  printf("\tRanges: %i\n", db->ranges_count);
 }
 
-double 
+double
 get_time(struct timeval *tim){
   gettimeofday(tim, NULL);
   return tim->tv_sec+(tim->tv_usec/1000000.0);
@@ -141,7 +141,7 @@ ip_to_int(const char *addr){
 	ipnum <<= 8;
 	return ipnum + octet;
 }
-      
+
 
 unsigned char con_type_to_int(char* con_type) {
   // possible values
@@ -156,13 +156,13 @@ unsigned char con_type_to_int(char* con_type) {
   // oc3
   // oc12
   // satellite
-  // wireless                
+  // wireless
   if(strlen(con_type) > 0 && (con_type[0] == 'm'))
     return 1;
   return 0;
 }
 
-// Function to compare 
+// Function to compare
 // - either two ip-ranges: i.e.: a(from...to) <=> b(from...to)
 // - or a ip(i.e. range without to) and an ip-range: i.e. a(from...NULL) <=> b(from...to); a(from...to) <=> b(from ... NULL)
 int compare_ranges(const void *fa, const void *fb) {
@@ -179,7 +179,7 @@ int compare_ranges(const void *fa, const void *fb) {
 
 
   const IpRange *a = (IpRange *) fa;
-  const IpRange *b = (IpRange *) fb;  
+  const IpRange *b = (IpRange *) fb;
 
   // printf("\tComparing: a:");
   // print_range(a);
@@ -218,7 +218,7 @@ int compare_ranges(const void *fa, const void *fb) {
 }
 
 
-int 
+int
 compare_cities(const void *a, const void *b){
   const City city_a = *(City*)a;
   const City city_b = * (City*) b;
@@ -230,26 +230,26 @@ void
 sort_cities(IPDB * db){
   if(DEBUG)
     printf("Sorting %i Cities in db...\n", db->cities_count);
-  
+
   struct timeval tim;
-  double t1 = get_time(&tim);  
-  
-  qsort(db->cities,db->cities_count,sizeof(City), compare_cities);  
+  double t1 = get_time(&tim);
+
+  qsort(db->cities,db->cities_count,sizeof(City), compare_cities);
   if(DEBUG)
-    printf("\n Sorting cities needed %.6lf seconds\n", get_time(&tim)-t1);  
+    printf("\n Sorting cities needed %.6lf seconds\n", get_time(&tim)-t1);
 }
 
 
-int // returns a city-inde
-city_index_by_code(IPDB * db, uint16 city_code){
+int // returns a city-index
+city_index_by_code(IPDB * db, int city_code){
   City *search, *result;
   search = malloc(sizeof(City));
   search->city_code = city_code;
   result = (City*) bsearch(search, db->cities, db->cities_count, sizeof(City), compare_cities);
-  
+
   if(search != NULL)
     free(search);
-  
+
   if(result == NULL)
   {
     if(DEBUG)
@@ -270,19 +270,19 @@ IpRange* find_range_for_ip(IPDB *db, char *ip) {
   IpRange* search;
   IpRange* result;
   search = (IpRange *)malloc(sizeof(IpRange));
-  
+
   if(db == NULL)
   {
     printf("ERROR: DB ist NULL! ");
     return NULL;
   }
-  
+
   if(db->ranges_count == 0)
   {
     printf("ERROR: DB has no Ranges Data. Can not search!\n");
     return NULL;
   }
-    
+
   search->from = ip_to_int(ip);
   search->to=0;
   search->city_index = 0;
@@ -291,45 +291,45 @@ IpRange* find_range_for_ip(IPDB *db, char *ip) {
   result = (IpRange*)bsearch(search, db->ranges, db->ranges_count, sizeof(IpRange), compare_ranges);
   if(search != NULL)
     free(search);
-    
+
   if(result == NULL)
-  { 
+  {
     if(DEBUG)
       printf("ERROR: Could not find the IP: %s! THIS SHOULD NOT HAPPEN!\n", ip);
     return NULL;
   } else {
     if(DEBUG) {
-      printf("Found Range: \t");    
-      print_range(result);  
-    }                       
-    return (IpRange*)result; 
+      printf("Found Range: \t");
+      print_range(result);
+    }
+    return (IpRange*)result;
   }
 }
 
-City * find_city_for_ip_range(IPDB * db, IpRange* range) 
+City * find_city_for_ip_range(IPDB * db, IpRange* range)
 {
   if(!db || !range)
-    return NULL;  
-                                                                 
+    return NULL;
+
   if(db->cities_count == 0)
   {
     if(DEBUG)
       printf("ERROR: DB has no City Data. Can not search!\n");
     return NULL;
   }
-  
-  if( range->city_index <= 0 || range->city_index >= db->cities_count ) 
+
+  if( range->city_index <= 0 || range->city_index >= db->cities_count )
   {
     if(DEBUG)
       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){
+  if( range == NULL || range->isp_index < 0){
     printf("Could not find isp for isp_index=%i", range->isp_index);
     return NULL;
   }
@@ -367,13 +367,13 @@ isp_index_by_name(IPDB * db, char* isp_name){
 
 // read ip-ranges from csv file, of format:
 // from_ip|to_ip|contype|city_code
-void 
-read_ranges_csv(IPDB * db){  
+void
+read_ranges_csv(IPDB * db){
   struct timeval tim;
   double t1 = get_time(&tim);
 
   db->ranges = malloc(sizeof(IpRange) * db->max_ranges_count);
-  
+
   if(DEBUG)
     printf("Parsing RANGES-CSV-file: %s\n", db->ranges_csv_file);
   FILE * f = fopen(db->ranges_csv_file, "rt");
@@ -386,7 +386,7 @@ read_ranges_csv(IPDB * db){
   char line[256];
   char* from;
   char* to;
-  char* city_code;         
+  char* city_code;
   int city_index;
 
   char* con_type;
@@ -394,7 +394,7 @@ read_ranges_csv(IPDB * db){
   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){
@@ -428,27 +428,27 @@ read_ranges_csv(IPDB * db){
     }else{
       entry = &(db->ranges[db->ranges_count]);
       entry->from = ip_to_int(from);
-      entry->to = ip_to_int(to);           
+      entry->to = ip_to_int(to);
       entry->is_mobile = con_type_to_int(con_type);
       entry->city_index = city_index;
       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++;
     }
-  } 
+  }
   if(invalid_cities_count)
   {
     printf("Found invalid cities: %i", invalid_cities_count);
   }
-  printf("\n Parsing of %i records needed %.6lf seconds\n", db->ranges_count, get_time(&tim)-t1);  
+  printf("\n Parsing of %i records needed %.6lf seconds\n", db->ranges_count, get_time(&tim)-t1);
 }
 
 
 
 //translate country iso3 to iso2
-char * 
+char *
 iso2_code(char* iso3){
   int i = 0;
   for( i = 0; i < num_countries; i++)
@@ -472,7 +472,7 @@ read_cities_csv(IPDB * db){
 
   db->cities_count = 0;
   db->cities = malloc(sizeof(City) * db->max_cities_count);
-  
+
   if(DEBUG)
     printf("Parsing Cities-CSV-file: %s\n", db->cities_csv_file);
   FILE * f = fopen(db->cities_csv_file, "rt");
@@ -497,23 +497,23 @@ read_cities_csv(IPDB * db){
       printf("Worked lines: %i\n", i);
     }
    // printf("Line: %s", line);
-   // COUNTRY,REGION,CITY-NAME,METRO-CODE,CITY-CODE,LATITUDE,LONGITUDE    
+   // COUNTRY,REGION,CITY-NAME,METRO-CODE,CITY-CODE,LATITUDE,LONGITUDE
     country =    strtok(line, CITIES_DELIM);
     region =     strtok(NULL, CITIES_DELIM);
     name =       strtok(NULL, CITIES_DELIM);
-    metro_code = strtok(NULL, CITIES_DELIM);    
+    metro_code = strtok(NULL, CITIES_DELIM);
     city_code =  strtok(NULL, CITIES_DELIM);
     lat =        strtok(NULL, CITIES_DELIM);
-    lng =        strtok(NULL, CITIES_DELIM);    
-    
+    lng =        strtok(NULL, CITIES_DELIM);
+
     entry = &(db->cities[db->cities_count]);
-    
+
     strncpy(entry->country_iso3, country, strlen(country));
 
-    // entry->country_iso2 = iso2_code(entry->country_iso3);    
+    // entry->country_iso2 = iso2_code(entry->country_iso3);
     strncpy(entry->country_iso2, iso2_code(country), 2);
     strncpy(entry->name, name, strlen(name));
-        
+
     entry->city_code =    atoi(city_code);
     entry->lat =          atof(lat);
     entry->lng =          atof(lng);
@@ -534,12 +534,12 @@ the layout goes like this:
   db->cities [sizeof(City)=24 x db->ranges_count Bytes]
   db->ranges [sizeof(IpRange)=24 x db->ranges_count Bytes]
 */
-void  
+void
 write_cache_file(IPDB * db){
   struct timeval tim;
   double t1 = get_time(&tim);
   int objects_written;
-  
+
   FILE * f;
   f = fopen(db->cache_file_name, "w");
   if(f==NULL){
@@ -549,43 +549,43 @@ write_cache_file(IPDB * db){
   }
   if(DEBUG){
     printf("Dumping %i records to cache-file: %s\n\n", db->ranges_count, db->cache_file_name);
-  
+
     //write the record length at file header
     printf("Writing DB-Header of length: %li\n",sizeof(db->ranges_count));
-  
-    printf("RecordLength: %li\n",sizeof(IpRange));  
-    printf("FieldLength: %li\n",sizeof(db->ranges[0].from));    
+
+    printf("RecordLength: %li\n",sizeof(IpRange));
+    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->isps_count), sizeof(db->isps_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));  
+    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);  
+    printf("Writing Contents with %i isps, a %i bytes each, should = %i \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));  
+    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:
   objects_written += fwrite(db->ranges, sizeof(IpRange), db->ranges_count, f);
-  
+
 
   fclose(f);
-  if(DEBUG)  
-    printf("\n Writing CacheFile of %i objects needed %.6lf seconds\n", objects_written, get_time(&tim)-t1);  
+  if(DEBUG)
+    printf("\n Writing CacheFile of %i objects needed %.6lf seconds\n", objects_written, get_time(&tim)-t1);
 }
 
-int 
-read_cache_file(IPDB * db){ 
+int
+read_cache_file(IPDB * db){
   struct timeval tim;
-  double t1 = get_time(&tim);  
+  double t1 = get_time(&tim);
   FILE * f;
   f = fopen(db->cache_file_name, "r");
   if(f==NULL){
@@ -594,17 +594,17 @@ 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 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 || 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, %iisps and %i ranges\n",db->cache_file_name, db->cities_count, db->isps_count, db->ranges_count);  
+  if(DEBUG)
+    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)
@@ -620,29 +620,29 @@ read_cache_file(IPDB * db){
     printf("Allocating: %lu for ranges-array \n", sizeof(IpRange)*(db->ranges_count));
   db->ranges = malloc(sizeof(IpRange) * db->ranges_count);
   objects_read += fread(db->ranges, sizeof(IpRange),db->ranges_count,f);
-  
+
 
   fclose(f);
-  if(DEBUG)  
-    printf("Reading cacheFile of %i objects needed %.6lf seconds\n", objects_read, get_time(&tim)-t1);    
+  if(DEBUG)
+    printf("Reading cacheFile of %i objects needed %.6lf seconds\n", objects_read, get_time(&tim)-t1);
   return objects_read;
 }
 
-void 
+void
 benchmark_search(IPDB * db,int count){
   printf("(Naiv) benchmark of the City-Search-Function with %i counts \n", count);
-  struct timeval tim;  
+  struct timeval tim;
   double t1 = get_time(&tim);
   int i;
   City * city;
 
-  for(i=0;i<count; i++){             
+  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;
-  
-  printf("\n\nSearch: %.6lf seconds elapsed, i.e. %.6lf Ops/Second \n", delta, count / delta);  
+
+  printf("\n\nSearch: %.6lf seconds elapsed, i.e. %.6lf Ops/Second \n", delta, count / delta);
 }
 
 IPDB * init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file_name){
@@ -660,18 +660,18 @@ 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 = malloc(MAX_ISP_NAME_LENGTH * MAX_ISPS_COUNT);
   db->isps_count = 0;
-    
+
 
   if(USE_CACHE && read_cache_file(db) > 0){
     if(DEBUG)
       printf("Loaded DB from Cache-File with %i records \n", db->ranges_count);
   }else{
     if(DEBUG)
-      printf("Initializing IPDB from CSV-file: %s \n", db->ranges_csv_file);    
+      printf("Initializing IPDB from CSV-file: %s \n", db->ranges_csv_file);
     read_cities_csv(db);
     // print_cities(db);
     if(db->cities_count == 0)
@@ -684,10 +684,10 @@ IPDB * init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file
     if(db!=NULL && db->ranges_count > 0 && USE_CACHE)
     {
       if(DEBUG)
-        printf("Got %i records from CSV-file, writing to cache...\n", db->ranges_count);    
+        printf("Got %i records from CSV-file, writing to cache...\n", db->ranges_count);
       write_cache_file(db);
     }
   }
-  return db;  
+  return db;
 }
 

data/ext/geoipdb/ipdb.h

@@ -13,18 +13,18 @@ typedef int int32;
 
 #ifdef RSTRING_PTR
 #else
-# define RSTRING_LEN(x) (RSTRING(x)->len) 
-# define RSTRING_PTR(x) (RSTRING(x)->ptr) 
+# define RSTRING_LEN(x) (RSTRING(x)->len)
+# define RSTRING_PTR(x) (RSTRING(x)->ptr)
 #endif
 
 
 #define RANGES_DELIM ",\n"
 #define CITIES_DELIM ",\n"
 
-#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_CITIES_COUNT 1000000 //Usually we have about 120 000 Cities
+#define MAX_RANGES_COUNT 10000000 //Usually we have about 6 Mio IP-Ranges
 
-#define MAX_ISPS_COUNT 100000
+#define MAX_ISPS_COUNT 65535
 #define MAX_ISP_NAME_LENGTH 100
 
 #define USE_CACHE 1
@@ -32,20 +32,20 @@ typedef int int32;
 
 typedef struct{
   unsigned long from;
-  unsigned long to;     
+  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  
+  int city_index; //index of the city in the cities-array
+  int16 isp_index; //index of the isp in the isps-array
 } IpRange;
 
 typedef struct{
-  uint16 city_code; //city codes are not larger than 2**16 = 65536
+  int city_code;
   char name[32];
   double lat;
   double lng;
-  
+
   char country_iso3[4];
-  char country_iso2[3];  
+  char country_iso2[3];
 } City;
 
 typedef struct{
@@ -54,7 +54,7 @@ typedef struct{
   unsigned int ranges_count;
 
   char *cities_csv_file;
-  unsigned int cities_count;  
+  unsigned int cities_count;
   unsigned int max_cities_count;
 
   char *cache_file_name; // a binary file to store the whole db.....
@@ -62,27 +62,27 @@ typedef struct{
   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; 
+  uint16 isps_count;
 
 
 } IPDB;
 
 
 // "publicly" visible functions
-IPDB * 
+IPDB *
 init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file_name);
 
 
-void 
+void
 print_city(const City * e);
 
-void 
-benchmark_search(IPDB * db,int count);        
+void
+benchmark_search(IPDB * db,int count);
 
 IpRange*
 find_range_for_ip(IPDB *db, char *ip);
 
-City* 
+City*
 find_city_for_ip_range(IPDB * db, IpRange* range);
 
 char*

data/geoipdb.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{geoipdb}
-  s.version = "0.3.1"
+  s.name = "geoipdb"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   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.date = "2011-11-25"
+  s.description = "Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching."
+  s.email = "eugeniusmartinus@googlemail.com"
   s.extensions = ["ext/geoipdb/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -41,11 +41,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "test.rb"
   ]
-  s.homepage = %q{http://github.com/madvertise/geoipdb}
+  s.homepage = "http://github.com/madvertise/geoipdb"
   s.licenses = ["MIT"]
   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.rubygems_version = "1.8.10"
+  s.summary = "Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions."
   s.test_files = [
     "spec/geoipdb_spec.rb",
     "spec/spec_helper.rb"

data/sample_data/ip_ranges_corrupt.csv

@@ -1,4 +1,4 @@
-
+asdf,as,dsa,g,asdf,g,as,d,ga,sd,f,as,dg,
 
 
 start_ip,end_ip,field 13,
@@ -12,7 +12,7 @@ start_ip,end_ip,field 13,
 
 asfdasdf asdf asfasdfasdf§$%&/
 
-1, , , 7 ,.1.1.0,1.1.1.255,4,
+1, , , 7 ,.1.1.0,1.1.1.255,4,,asdf,f,as,df,ag,as,df,asd,
 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,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoipdb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 1
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Eugen Martin
@@ -16,11 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 +02:00
-default_executable: 
+date: 2011-11-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +30,11 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
+  requirement: *id001
   prerelease: false
+  name: rspec
   type: :development
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +46,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id002
   prerelease: false
+  name: bundler
   type: :development
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +62,11 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
+  requirement: *id003
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,9 +76,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   prerelease: false
+  name: rcov
   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: []
@@ -113,7 +112,6 @@ files:
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
 - test.rb
-has_rdoc: true
 homepage: http://github.com/madvertise/geoipdb
 licenses: 
 - MIT
@@ -144,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.