ipip 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140cd161487cb7a2d38647384e65490d19410f73
-  data.tar.gz: 4f04028f59e85fdbf0f961a22f5b54c9e2d21502
+  metadata.gz: 7629926327cfecda9e31fa00aa0ad2fb2b593368
+  data.tar.gz: 5aa69af8174e1463581956f1f21f0da4fb3ded2a
 SHA512:
-  metadata.gz: e6232d58c111f722f27a28a0a8d5f4a2f6293ab2dd86a8e1150aed05408931f67235e23e1c76ac308718bda2fd9308c807b20f798685d05152e66a819b0698c9
-  data.tar.gz: 9ec8501d3a62e61b0584676a9d34f2ff615e341cbe841a5ed23ad7aa8b4c3554eb1f7633bbef457893b6f387ed5b90707000f7a0fbc484247b862b01fdb92461
+  metadata.gz: 2f50de124e40661d26f1867a84709e52af259dafb73c413b84b9f7f867983eae5840c7d8342e63f534bcde422325067c0396d25ab321bd4ed4e09f696b0ae3fb
+  data.tar.gz: 715f3af052260f6785da11673219137c7847a2b9b7d967789ab6231337fcf396f9b0e977213ad105ba7b79439c0f0ce648037f7b876fdddacffbb1edfc0218fe

data/lib/ipip.rb

@@ -1,18 +1,56 @@
 require 'ipip/version'
 require 'ipip/ipv4_database'
+require 'ipip/ipv4_database_x'
+
 
 module IPIP
 
-  class << IPIP
+  class << self
 
     def find(ip)
       ipv4_database.find(ip)
     end
 
-    def ipv4_database(data_file=nil)
+    def load_data!(data_file)
+      raise 'No such file' unless File.exists?(data_file)
+
+      ipv4_database(data_file)
+    end
+
+    def ipv4_database(data_file = nil)
       @ipv4_database ||= IPv4Database.new(data_file)
     end
 
   end
 
 end
+
+
+module IPIPX
+
+  class << self
+
+    def find(ip)
+      raise 'pls call `IPIPX.load_data!` first' unless data_loaded?
+
+      ipv4_database.find(ip)
+    end
+
+    def load_data!(data_file)
+      raise 'No such file' unless File.exists?(data_file)
+
+      ipv4_database(data_file)
+      @data_was_loaded = true
+    end
+
+    def ipv4_database(data_file = nil)
+      @ipv4_database ||= IPv4DatabaseX.new(data_file)
+    end
+
+    def data_loaded?
+      @data_was_loaded ||= false
+    end
+
+  end
+
+end

data/lib/ipip/ipv4_database.rb

@@ -24,7 +24,7 @@ module IPIP
     IP_BLOCK_SIZE = 8
     DEFAULT_DATA_FILE = File.expand_path("../17monipdb.dat", __FILE__)
 
-    def initialize(data_file=nil)
+    def initialize(data_file = nil)
       @data_file = data_file || DEFAULT_DATA_FILE
     end
 

data/lib/ipip/ipv4_database_x.rb

@@ -0,0 +1,94 @@
+require 'socket'
+require 'ipaddr'
+
+module IPIPX
+
+  # Database for search IPv4 address.
+  #
+  #  The IPIP.net data file(ipip.datx) format in bytes::
+  #
+  #     ---------------------------
+  #     | 4 bytes                 |             <- offset number
+  #     ---------------------------
+  #     | 256 * 9 bytes           |             <- first ip number index
+  #     ---------------------------
+  #     | offset - 2304 - 4 bytes |             <- ip index
+  #     ---------------------------
+  #     |    data  storage        |
+  #     ---------------------------
+  #
+  class IPv4DatabaseX
+
+    OFFSET_NUMBER_SIZE = 4
+    FIRST_IP_NUMBER_INDEX_SIZE = 256 * 1024
+    IP_BLOCK_SIZE = 9
+
+    def initialize(data_file)
+      @data_file = data_file
+    end
+
+    def find(ip)
+      ip = IPSocket::getaddress(ip)
+      lookup_ipv4(ip)
+    end
+
+    private
+
+    def offset
+      @offset ||= unpack_N(binread(OFFSET_NUMBER_SIZE, 0))
+    end
+
+    def buffer
+      @buffer ||= binread(nil, OFFSET_NUMBER_SIZE)
+    end
+
+    def binread(length, offset)
+      IO.binread(@data_file, length, offset)
+    end
+
+    def lookup_ipv4(ip)
+      ip = IPAddr.new(ip)
+      return unless ip.ipv4?
+
+      nip = ip.hton
+
+      first_ip = unpack_C(nip)
+      ipdot = ip.to_s.split('.')
+      first_ip_offset = (first_ip * 256 + ipdot[1].to_i) * 4
+
+      start = unpack_V(buffer[first_ip_offset, 4])
+      start_offset = start * IP_BLOCK_SIZE + FIRST_IP_NUMBER_INDEX_SIZE
+
+      data_offset = data_length = -1
+
+      lo, hi = 0, (offset - start_offset) / IP_BLOCK_SIZE
+
+      while lo < hi
+        mid = (lo + hi) / 2
+        mid_offset = start_offset + mid * IP_BLOCK_SIZE
+        mid_val = buffer[mid_offset, 4]
+
+        if mid_val < nip
+          lo = mid + 1
+        else
+          hi = mid
+        end
+      end
+
+      start_offset += lo * IP_BLOCK_SIZE
+      return if start_offset == offset
+
+      data_offset = unpack_V(buffer[start_offset + 4, 3] + 0.chr)
+      data_length = unpack_C(buffer[start_offset + 8])
+
+      data_offset = offset + data_offset - FIRST_IP_NUMBER_INDEX_SIZE - OFFSET_NUMBER_SIZE
+      data = buffer[data_offset, data_length].encode('UTF-8', 'UTF-8')
+    end
+
+    [:C, :N, :V].each do |format|
+      define_method "unpack_#{format}" do |binary|
+        binary.unpack(format.to_s).first
+      end
+    end
+  end
+end

data/lib/ipip/version.rb

@@ -1,3 +1,3 @@
 module IPIP
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipip
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - liluo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -49,6 +49,7 @@ files:
 - lib/ipip.rb
 - lib/ipip/17monipdb.dat
 - lib/ipip/ipv4_database.rb
+- lib/ipip/ipv4_database_x.rb
 - lib/ipip/version.rb
 homepage: https://github.com/liluo/ipip
 licenses:
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: IP search based on ipip.net