Skip to content

Added ASN Class #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wtfuzz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added ASN Class #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e616c18
Added GeoIP::ASN
Aug 28, 2013
fa45dad
Added sample ASN usage to readme
Aug 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ Usage
# :area_code=>607,
# :region=>"NY" }

ASN Lookup Usage

```ruby
require 'geoip'
db = GeoIP::ASN.new('/path/to/GeoIPASNum.dat')
result = db.look_up('24.24.24.24')
p result
```

There are arguments to database initializer.

1. The first argument is the filename of the GeoIPCity.dat file
Expand Down
27 changes: 23 additions & 4 deletions geoip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static VALUE mGeoIP_Organization;
static VALUE mGeoIP_ISP;
static VALUE mGeoIP_NetSpeed;
static VALUE mGeoIP_Domain;
static VALUE mGeoIP_ASN;
static VALUE rb_geoip_memory;
static VALUE rb_geoip_filesystem;
static VALUE rb_geoip_index;
Expand Down Expand Up @@ -107,7 +108,7 @@ static VALUE rb_geoip_database_new(VALUE mGeoIP_Database_Class, int argc, VALUE
check_cache = Qfalse;
Check_Type(load_option, T_SYMBOL);

if(flag = check_load_option(load_option)) flag;
flag = check_load_option(load_option);

if(RTEST(check_cache)) flag |= GEOIP_CHECK_CACHE;

Expand All @@ -121,7 +122,7 @@ static VALUE rb_geoip_database_new(VALUE mGeoIP_Database_Class, int argc, VALUE
}

/* Generic, single-value look up method */
static VALUE generic_single_value_lookup_response(char *key, char *value)
static VALUE generic_single_value_lookup_response(const char *key, char *value)
{
VALUE result = rb_hash_new();
if(value) {
Expand All @@ -145,11 +146,12 @@ VALUE rb_city_record_to_hash(GeoIPRecord *record)
if(record->country_name)
rb_hash_sset(hash, "country_name", encode_to_utf8_and_return_rb_str(record->country_name));
if(record->region) {
const char *region_name;
rb_hash_sset(hash, "region", encode_to_utf8_and_return_rb_str(record->region));

char *region_name = GeoIP_region_name_by_code(record->country_code, record->region);
region_name = GeoIP_region_name_by_code(record->country_code, record->region);
if (region_name) {
rb_hash_sset(hash, "region_name", encode_to_utf8_and_return_rb_str(region_name));
rb_hash_sset(hash, "region_name", encode_to_utf8_and_return_rb_str((char *)region_name));
}
}
if(record->city)
Expand Down Expand Up @@ -348,6 +350,19 @@ VALUE rb_geoip_domain_look_up(VALUE self, VALUE addr) {
return generic_single_value_lookup_response("domain", GeoIP_name_by_addr(gi, StringValuePtr(addr)));
}

static VALUE rb_geoip_asn_new(int argc, VALUE *argv, VALUE self)
{
return rb_geoip_database_new(mGeoIP_ASN, argc, argv, self);
}

VALUE rb_geoip_asn_look_up(VALUE self, VALUE addr)
{
GeoIP *gi;
Check_Type(addr, T_STRING);
Data_Get_Struct(self, GeoIP, gi);
return generic_single_value_lookup_response("asn", GeoIP_name_by_addr(gi, StringValuePtr(addr)));
}

/* GeoIP *********************************************************************/

/* Returns the numeric form of an IP address.
Expand Down Expand Up @@ -406,6 +421,10 @@ void Init_geoip()
rb_define_singleton_method(mGeoIP_Domain, "new", rb_geoip_domain_new, -1);
rb_define_method( mGeoIP_Domain, "look_up", rb_geoip_domain_look_up, 1);

mGeoIP_ASN = rb_define_class_under(mGeoIP, "ASN", rb_cObject);
rb_define_singleton_method(mGeoIP_ASN, "new", rb_geoip_asn_new, -1);
rb_define_method(mGeoIP_ASN, "look_up", rb_geoip_asn_look_up, 1);

rb_define_singleton_method(mGeoIP, "addr_to_num", rb_geoip_addr_to_num, 1);
rb_define_singleton_method(mGeoIP, "num_to_addr", rb_geoip_num_to_addr, 1);
}