geoip 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e46df24a662de22a8500c265c5eaaf2bfb0cb29
-  data.tar.gz: d90310294059804b56d80ac41554fa68826393a2
+  metadata.gz: 1308c6df3d48989479c7b279f0be0672c3519000
+  data.tar.gz: 076311dc57ceadec5ef1969f95200f330c9a230c
 SHA512:
-  metadata.gz: 5ad6a2221b51acf61c658412786484bd5e65ce2b56a4969fdb8954870be6a292360364867584844585c31fb8a04a597c7c30301d9a19d6f0ca125de9f65c00f3
-  data.tar.gz: dba6732195af06951a47b1d36eaadad3d58f5a98fbbd35bae54858fe05a2966ecb1a009c63706873b287b8983d9d5ca38bedce586c0b72ebaeae994c76ea1554
+  metadata.gz: 2f36bf2d10008d34ded5a186932337deacd52de0d6ac0d3c9846ad3e5ba60267a5ef0447eed2bb4decdb3d4de10176cc4aa077fbcb7758afe94dfe8d7f0023b2
+  data.tar.gz: e711b0dca011d1e088498f4b27a74080d42154b4e5568335d5f309b0e42045c00a6caac487e0296ae09c638572dc93fb59849aff0371ad7ccc72f14b1c524ddd

data/geoip.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: geoip 1.5.0 ruby lib
+# stub: geoip 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "geoip"
-  s.version = "1.5.0"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Clifford Heath", "Roland Moriz"]
-  s.date = "2015-03-10"
+  s.date = "2015-06-24"
   s.description = "GeoIP searches a GeoIP database for a given host or IP address, and\nreturns information about the country where the IP address is allocated,\nand the city, ISP and other information, if you have that database version."
   s.email = ["clifford.heath@gmail.com", "rmoriz@gmail.com"]
   s.executables = ["geoip"]

data/lib/geoip.rb

@@ -58,7 +58,7 @@ require 'yaml'
 class GeoIP
 
   # The GeoIP GEM version number
-  VERSION = "1.5.0"
+  VERSION = "1.6.1"
 
   # The +data/+ directory for geoip
   DATA_DIR = File.expand_path(File.join(File.dirname(__FILE__),'..','data','geoip'))
@@ -297,8 +297,8 @@ class GeoIP
     # Convert numeric IP address to an integer
     ip = lookup_ip(hostname)
     ipnum = iptonum(ip)
-    offset = (seek_record(ipnum) - @database_segments[0])
-    read_netspeed(offset)
+    pos = seek_record(ipnum)
+    read_netspeed(pos-@database_segments[0])
   end
 
   # Search the GeoIP database for the specified host, returning region info.
@@ -332,7 +332,9 @@ class GeoIP
       throw "Invalid GeoIP database type, can't look up Region by IP"
     end
 
-    unless pos == @database_segments[0]
+    if pos == @database_segments[0]
+      nil
+    else
       read_region(pos, hostname, ip)
     end
   end
@@ -373,18 +375,7 @@ class GeoIP
       throw "Invalid GeoIP database type, can't look up City by IP"
     end
 
-    # This next statement was added to MaxMind's C version after it was
-    # rewritten in Ruby. It prevents unassigned IP addresses from returning
-    # bogus data.  There was concern over whether the changes to an
-    # application's behaviour were always correct, but this has been tested
-    # using an exhaustive search of the top 16 bits of the IP address space.
-    # The records where the change takes effect contained *no* valid data. 
-    # If you're concerned, email me, and I'll send you the test program so
-    # you can test whatever IP range you think is causing problems,
-    # as I don't care to undertake an exhaustive search of the 32-bit space.
-    unless pos == @database_segments[0]
-      read_city(pos-@database_segments[0], hostname, ip)
-    end
+    read_city(pos-@database_segments[0], hostname, ip)
   end
 
   # Search a ISP GeoIP database for the specified host, returning the ISP
@@ -496,7 +487,7 @@ class GeoIP
     off1 = le_to_ui(record1.unpack('C*'))
     val = off1 - @database_segments[0]
     if val >= 0
-      yield(ipnum, read_record(ipnum.to_s, ipnum, val)) if val > 0
+      yield(ipnum, val > 0 ? read_record(ipnum.to_s, ipnum, val) : nil) 
     elsif mask != 0
       each_by_ip(off1, ipnum, mask >> 1, &callback)
     end
@@ -505,7 +496,7 @@ class GeoIP
     off2 = le_to_ui(record2.unpack('C*'))
     val = off2 - @database_segments[0]
     if val >= 0
-      yield(ipnum|mask, read_record(ipnum.to_s, ipnum, val)) if val > 0
+      yield(ipnum|mask, val > 0 ? read_record(ipnum.to_s, ipnum, val) : nil)
     elsif mask != 0
       each_by_ip(off2, ipnum|mask, mask >> 1, &callback)
     end
@@ -519,7 +510,7 @@ class GeoIP
       read_city(offset, hostname, ip)
 
     when Edition::REGION_REV0, Edition::REGION_REV1
-      read_region(offset, hostname, ip)
+      read_region(offset+@database_segments[0], hostname, ip)
 
     when Edition::NETSPEED, Edition::NETSPEED_REV1
       read_netspeed(offset)
@@ -604,6 +595,7 @@ class GeoIP
         end
 
 	case @database_type
+	when Edition::COUNTRY
 	when Edition::NETSPEED_REV1
 	when Edition::ASNUM
 	when Edition::CITY_REV0
@@ -623,7 +615,6 @@ class GeoIP
 	    Edition::CITY_REV0_V6,
 	    Edition::CITY_REV1_V6,
 	    Edition::NETSPEED_REV1_V6,
-	    Edition::COUNTRY,
 	    Edition::COUNTRY_V6,
 	    Edition::PROXY
 	  @ip_bits = 128
@@ -712,8 +703,9 @@ class GeoIP
     )
   end
 
-  def read_asn off
-    record = atomic_read(MAX_ASN_RECORD_LENGTH, off+index_size)
+  def read_asn offset
+    return nil if offset == 0
+    record = atomic_read(MAX_ASN_RECORD_LENGTH, index_size+offset)
     record.slice!(record.index("\0")..-1)
 
     # AS####, Description
@@ -727,16 +719,15 @@ class GeoIP
 
   def read_netspeed(offset)
     return offset if @database_type == Edition::NETSPEED  # Numeric value
+    return nil if offset == 0
 
     record = atomic_read(20, index_size+offset)
     record.slice!(record.index("\0")..-1)
     record
   end
 
-  def read_isp pos
-    off = pos + index_size
-
-    record = atomic_read(MAX_ORG_RECORD_LENGTH, off)
+  def read_isp offset
+    record = atomic_read(MAX_ORG_RECORD_LENGTH, index_size+offset)
     record = record.sub(/\000.*/n, '')
     record.start_with?('*') ? nil : ISP.new(record)
   end
@@ -767,8 +758,9 @@ class GeoIP
   # * The dma_code and area_code, if available (REV1 City database)
   # * The timezone name, if known
   #
-  def read_city(pos, hostname = '', ip = '') #:nodoc:
-    record = atomic_read(FULL_RECORD_LENGTH, pos+index_size)
+  def read_city(offset, hostname = '', ip = '') #:nodoc:
+    return nil if offset == 0
+    record = atomic_read(FULL_RECORD_LENGTH, offset+index_size)
     return unless (record && record.size == FULL_RECORD_LENGTH)
 
     # The country code is the first byte:
@@ -910,27 +902,27 @@ class GeoIP
     be_to_ui(s.reverse)
   end
 
-  # reads +length+ bytes from +offset+ as atomically as possible
+  # reads +length+ bytes from +pos+ as atomically as possible
   # if IO.pread is available, it'll use that (making it both multithread
   # and multiprocess-safe). Otherwise we'll use a mutex to synchronize
   # access (only providing protection against multiple threads, but not
   # file descriptors shared across multiple processes).
   # If the contents of the database have been preloaded it'll work with
   # the StringIO object directly.
-  def atomic_read(length, offset) #:nodoc:
+  def atomic_read(length, pos) #:nodoc:
     if @mutex
-      @mutex.synchronize { atomic_read_unguarded(length, offset) }
+      @mutex.synchronize { atomic_read_unguarded(length, pos) }
     else
-      atomic_read_unguarded(length, offset)
+      atomic_read_unguarded(length, pos)
     end
   end
 
-  def atomic_read_unguarded(length, offset)
+  def atomic_read_unguarded(length, pos)
     if @use_pread
-      IO.pread(@file.fileno, length, offset)
+      IO.pread(@file.fileno, length, pos)
     else
       io = @contents || @file
-      io.seek(offset)
+      io.seek(pos)
       io.read(length)
     end
   end

data/test/test_file.rb

@@ -12,6 +12,6 @@ ARGV.each do |file|
       else
 	'%d.%d.%d.%d' % [ip].pack('N').unpack('C4')
       end
-    puts "#{ip_str}\t#{val.to_hash.to_a.sort.map{|n,v| "#{n}=#{v.inspect}"}*', '}"
+    puts "#{ip_str}\t#{val ? val.to_hash.to_a.sort.map{|n,v| "#{n}=#{v.inspect}"}*', ' : 'Unassigned'}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoip
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Clifford Heath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies: []
 description: |-
   GeoIP searches a GeoIP database for a given host or IP address, and