geoipdb 0.5.8 → 1.0.0

data/ext/geoipdb/ipdb.h

@@ -1,84 +0,0 @@
-#ifdef INT_2_BYTES
-typedef char int8;
-typedef int int16;
-typedef unsigned int uint16;
-typedef long int32;
-#else
-typedef char int8;
-typedef short int16;
-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 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 65535
-#define MAX_ISP_NAME_LENGTH 100
-
-#define USE_CACHE 1
-#define DEBUG 0
-
-typedef struct{
-  unsigned long from;
-  unsigned long to;
-  unsigned char is_mobile;
-  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{
-  int city_code;
-  char name[32];
-  double lat;
-  double lng;
-
-  char country_iso3[4];
-  char country_iso2[3];
-} City;
-
-typedef struct{
-  char *ranges_csv_file; //the CSV-file with ip-ranges-to-city-code-mappings
-  unsigned int max_ranges_count;
-  unsigned int ranges_count;
-
-  char *cities_csv_file;
-  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;
-
-IPDB *
-init_db(char * cities_csv_file, char * ranges_csv_file, char * cache_file_name);
-
-void
-print_city(const City * e);
-
-void
-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/ext/geoipdb/src/GeoIpDb.java

@@ -1,101 +0,0 @@
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-
-public class GeoIpDb
-{
-    private static final int MAX_CITY_COUNT = 1000000;
-    private static final int MAX_RANGE_COUNT = 10000000;
-
-    HashMap<Integer, City> cities;
-    ArrayList<String> isps;
-    ArrayList<IpRange> ranges;
-
-    public GeoIpDb(String citiesFileName, String rangesFileName) throws FileNotFoundException
-    {
-        cities = new HashMap<Integer, City>();
-        isps = new ArrayList<String>();
-        ranges = new ArrayList<IpRange>();
-
-        readCitiesCSV(citiesFileName);
-        readRangesCSV(rangesFileName);
-    }
-
-    public IpRange findRangeForIp(String ip)
-    {
-        if (ranges.isEmpty()) {
-            System.out.println("ERROR: DB has no ranges data. Can not search!");
-            return null;
-        }
-
-        int index = 0;
-        IpRange search = new IpRange(ip, "0");
-        index = Collections.binarySearch(ranges, search);
-        if (index < 0)
-            return null;
-
-        return ranges.get(index);
-    }
-
-    public City findCityForIpRange(IpRange range)
-    {
-        if (range == null) {
-            System.out.println("Cannot find city for no given range, right?");
-            return null;
-        }
-        if (cities.isEmpty()) {
-            System.out.println("ERROR: DB has no city data. Can not search!");
-            return null;
-        }
-
-        if (range.cityCode == 0) {
-            System.out.format("ERROR: Could not find city with index: %d\n", range.cityCode);
-        }
-
-        return cities.get(range.cityCode);
-    }
-
-    public ArrayList<IpRange> get_ranges()
-    {
-        return ranges;
-    }
-
-    private void readCitiesCSV(String file_name) throws FileNotFoundException
-    {
-        CsvReader reader = new CsvReader(file_name);
-        String[] line = null;
-        City city = null;
-
-        reader.readLine(); // skip first line
-
-        while ((line = reader.readLine()) != null) {
-            if (cities.size() >= MAX_CITY_COUNT){
-                System.out.format("ERROR: MAX_CITY_COUNT = %d limit reached - mek it bigger  :-(\n", MAX_CITY_COUNT);
-                return;
-            }
-            city = new City(line);
-            cities.put(city.cityCode, city);
-        }
-    }
-
-    private void readRangesCSV(String file_name) throws FileNotFoundException
-    {
-        CsvReader reader = new CsvReader(file_name);
-        String[] line = null;
-
-        reader.readLine(); // skip first line
-
-        while ((line = reader.readLine()) != null) {
-            if (line.length < 5)
-                continue;
-
-            if (ranges.size() >= MAX_RANGE_COUNT){
-                System.out.format("ERROR: MAX_RANGE_COUNT = %d limit reached - mek it bigger  :-(\n", MAX_RANGE_COUNT);
-                return;
-            }
-
-            ranges.add(new IpRange(line));
-        }
-    }
-}

data/lib/cgeoipdb.rb

@@ -1 +0,0 @@
-require File.expand_path('../geoipdb.so', __FILE__)

data/lib/ip_information.rb

@@ -1,27 +0,0 @@
-class IpInformation
-
-  ATTRIBS = [
-    :country_iso_code,
-    :city_code,
-    :city_name,
-    :lat,
-    :lng,
-    :is_mobile,
-    :isp_name,
-  ]
-
-  ATTRIBS.each do |attrib|
-    attr_accessor attrib
-  end
-
-  def mobile?
-    @is_mobile
-  end
-
-  def to_h
-    Hash[ATTRIBS.map do |attrib|
-      [attrib, send(attrib)]
-    end]
-  end
-
-end

data/lib/jgeoipdb.rb

@@ -1,41 +0,0 @@
-require 'java'
-require File.expand_path('../geoipdb.jar', __FILE__)
-
-class GeoIpDb
-
-  def self.init(cities_file, ranges_file, cache_file)
-    self.new(cities_file, ranges_file, cache_file)
-  rescue java.io.FileNotFoundException
-    return nil
-  end
-
-  def initialize(cities_file, ranges_file, cache_file)
-    # the Java implementation does not support cache files,
-    # since the java serialisation is slower than the actual csv parsing
-    @jdb = Java::GeoIpDb.new(cities_file, ranges_file)
-  end
-
-  def information_for_ip(ip)
-    range = @jdb.find_range_for_ip(ip)
-    return nil unless range
-
-    city = @jdb.find_city_for_ip_range(range)
-    return nil unless city
-
-    isp = range.isp_name
-    build_ip_information_object(range, city, isp)
-  end
-
-  def build_ip_information_object(range, city, isp)
-    info = IpInformation.new
-    info.country_iso_code = city.country_iso2
-    info.city_name = city.name
-    info.city_code = city.city_code
-    info.lng = city.lng
-    info.lat = city.lat
-    info.is_mobile  = range.is_mobile
-    info.isp_name = isp && isp.to_sym
-    info
-  end
-
-end

data/sample_data/citiess_corrupt.csv

@@ -1,8 +0,0 @@
-COUNTRY,REGION,CITY-NAME,METRO-CODE,CITY-CODE,LATITUDE,LONGITUDE
-***,***,?,0,7,0,0
-afg,?,?,0,1,33,1
-afg,no region,herat,-1,2,34.3452,62.
-
-afg,no , , , , region,kabul,-1,3,34.5167,69.1833
-afg,no region,, , kandahar,-1,4,31.6111,65.702
-afg,no region,maza , ,r-e sharif,-1,5,36.7041,67.1096

data/sample_data/ip_ranges_corrupt.csv

@@ -1,20 +0,0 @@
-asdf,as,dsa,g,asdf,g,as,d,ga,sd,f,as,dg,
-
-
-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,
-
-asfdasdf asdf asfasdfasdf§$%&/
-
-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,
-1.4.0.0,1.4.0.255,5,
-1.4.1.0,1.8.255.255,3,