geoip-c 0.6.3 → 0.7.0

data/README.md

@@ -140,6 +140,7 @@ Many thanks to our contributors:
 
 * Charles Brian Quinn
 * Michael Sheakoski
+* Silvio Quadri
 
 License
 -------

data/Rakefile

@@ -22,9 +22,9 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name              = 'geoip-c'
-  s.version           = "0.6.3"
+  s.version           = "0.7.0"
 
-  s.authors           = ['Ryah Dahl', 'Matt Todd', 'Charles Brian Quinn', 'Michael Sheakoski']
+  s.authors           = ['Ryah Dahl', 'Matt Todd', 'Charles Brian Quinn', 'Michael Sheakoski', 'Silvio Quadri']
   s.email             = 'mtodd@highgroove.com'
 
   s.summary           = "A Binding to the GeoIP C library"

data/geoip.c

@@ -11,6 +11,7 @@
 
 static VALUE mGeoIP;
 static VALUE mGeoIP_City;
+static VALUE mGeoIP_Country;
 static VALUE mGeoIP_Organization;
 static VALUE mGeoIP_ISP;
 static VALUE mGeoIP_NetSpeed;
@@ -148,6 +149,41 @@ VALUE rb_geoip_city_look_up(VALUE self, VALUE addr) {
   return hash;
 }
 
+/* GeoIP::Country ************************************************************/
+
+/* GeoIP::Country.new('/path/to/GeoIPCountry.dat')
+ * load_option is not required for this database because it is ignored.
+ */
+static VALUE rb_geoip_country_new(int argc, VALUE *argv, VALUE self)
+{
+  return rb_geoip_database_new(mGeoIP_Country, argc, argv, self);
+}
+
+/* Pass this function an IP address as a string, it will return a hash
+ * containing all the information that the database knows about the IP
+ *    db.look_up('24.24.24.24')
+ *    => {:country_code=>"US",
+ *        :country_code3=>"USA",
+ *        :country_name=>"United States"}
+ */
+VALUE rb_geoip_country_look_up(VALUE self, VALUE addr) {
+  GeoIP *gi;
+  VALUE hash = Qnil;
+  int country_id;
+  
+  Check_Type(addr, T_STRING);
+  Data_Get_Struct(self, GeoIP, gi);
+  country_id = GeoIP_id_by_addr(gi, STR2CSTR(addr));
+  if(country_id < 1) return Qnil;
+  
+  hash = rb_hash_new();
+  rb_hash_sset(hash, "country_code", rb_str_new2(GeoIP_country_code[country_id]));
+  rb_hash_sset(hash, "country_code3", rb_str_new2(GeoIP_country_code3[country_id]));
+  rb_hash_sset(hash, "country_name", rb_str_new2(GeoIP_country_name[country_id]));
+  
+  return hash;
+}
+
 /* GeoIP::Organization *******************************************************/
 
 /* GeoIP::Organization.new('/path/to/GeoIPOrg.dat', load_option)
@@ -267,62 +303,9 @@ VALUE rb_geoip_addr_to_num(VALUE self, VALUE addr) {
   return UINT2NUM((unsigned int)_GeoIP_addr_to_num(STR2CSTR(addr)));
 }
 
-/* This returns a pointer to a character array that represents the IP string of
- * the IP Number given it.
- * 
- * This was originally a slightly patched version of the function found in the
- * GeoIP library called _GeoIP_num_to_addr with the same declaration but
- * instead a slight variation has been used here.
- * 
- * The function definition this replaces follows:
- *   char *ret_str;
- *   char *cur_str;
- *   int octet[4];
- *   int num_chars_written, i;
- *   
- *   ret_str = malloc(sizeof(char) * 16);
- *   memset(ret_str, '\0', sizeof(char) * 16); // ensure we null-terminate the string
- *   cur_str = ret_str;
- *   
- *   for (i = 0; i<4; i++) {
- *     octet[3 - i] = ipnum % 256;
- *     ipnum >>= 8;
- *   }
- *   
- *   for (i = 0; i<4; i++) {
- *     num_chars_written = sprintf(cur_str, "%d", octet[i]);
- *     cur_str += num_chars_written;
- *     
- *     if (i < 3) {
- *       cur_str[0] = '.';
- *       cur_str++;
- *     }
- *   }
- *   
- *   return ret_str;
- * 
- * I make no assertions about speed or efficiency here. There is no error
- * handling (in case of malloc failing), also.
- * 
- * However, this works on 64bit platforms, where the previous implementation
- * did not.
- */
-char *_patched_GeoIP_num_to_addr(GeoIP* gi, unsigned long ipnum) {
-  char *ip;
-  int i, octet[4];
-  
-  ip = malloc(sizeof(char) * 16);
-  memset(ip, '\0', sizeof(char) * 16);
-  
-  for(i = 0; i < 4; i++)
-  {
-    octet[i] = (ipnum >> (i*8)) & 0xFF;
-  }
-  
-  sprintf(ip, "%i.%i.%i.%i", octet[3], octet[2], octet[1], octet[0]);
-  
-  return ip;
-}
+// Fixes a bug with 64bit architectures where this delcaration doesn't exist
+// in the GeoIP library causing segmentation faults.
+char *_GeoIP_num_to_addr(GeoIP* gi, unsigned long ipnum);
 
 VALUE rb_geoip_num_to_addr(VALUE self, VALUE num) {
   VALUE num_type = TYPE(num);
@@ -331,8 +314,7 @@ VALUE rb_geoip_num_to_addr(VALUE self, VALUE num) {
     case T_BIGNUM: break;
     default: rb_raise(rb_eTypeError, "wrong argument type %s (expected Fixnum or Bignum)", rb_obj_classname(num));
   }
-  // return rb_str_new2((char*)_GeoIP_num_to_addr(NULL, (unsigned long)NUM2ULONG(num)));
-  return rb_str_new2((char*)_patched_GeoIP_num_to_addr(NULL, (unsigned long)NUM2ULONG(num)));
+  return rb_str_new2((char*)_GeoIP_num_to_addr(NULL, (unsigned long)NUM2ULONG(num)));
 }
 
 void Init_geoip()
@@ -347,6 +329,10 @@ void Init_geoip()
   rb_define_singleton_method(mGeoIP_City, "new",      rb_geoip_city_new,      -1);
   rb_define_method(          mGeoIP_City, "look_up",  rb_geoip_city_look_up,  1);
 
+  mGeoIP_Country = rb_define_class_under(mGeoIP, "Country", rb_cObject);
+  rb_define_singleton_method(mGeoIP_Country, "new",      rb_geoip_country_new,      -1);
+  rb_define_method(          mGeoIP_Country, "look_up",  rb_geoip_country_look_up,  1);
+
   mGeoIP_Organization = rb_define_class_under(mGeoIP, "Organization", rb_cObject);
   rb_define_singleton_method(mGeoIP_Organization, "new",     rb_geoip_org_new,     -1);
   rb_define_method(          mGeoIP_Organization, "look_up", rb_geoip_org_look_up, 1);

data/test.rb

@@ -51,7 +51,7 @@ class GeoIPTest < Test::Unit::TestCase
   end
   
   def test_num_to_addr_converts_large_ipnums_to_an_ip_correctly
-    # assert_equal @large_ip, GeoIP.num_to_addr(@large_ipnum)
+    assert_equal @large_ip, GeoIP.num_to_addr(@large_ipnum)
   end
   
   def test_num_to_addr_expects_a_numeric_ip

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: geoip-c
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ryah Dahl
 - Matt Todd
 - Charles Brian Quinn
 - Michael Sheakoski
+- Silvio Quadri
 autorequire: 
 bindir: bin
 cert_chain: []