Merge pull request #70 from mlsecproject/i67_as

Fixes #67 by indexing per range, not per org name

winnower.py

@@ -15,16 +15,17 @@ def load_gi_org(filename):
     with open(filename, 'rb') as f:
         org_reader = csv.DictReader(f, fieldnames=['start', 'end', 'org'])
         for row in org_reader:
-            gi_org[row['org']] = IPRange(row['start'], row['end'])
+            gi_org[IPRange(row['start'], row['end'])] = row['org']
     return gi_org
 
 
 def org_by_addr(address, org_data):
     as_num = None
     as_name = None
-    for org in org_data:
-        if address in org_data[org]:
-            as_num, sep, as_name = org.partition(' ')
+    for iprange in org_data:
+        if address in iprange:
+            as_num, sep, as_name = org_data[iprange].partition(' ')
+            as_num = as_num.replace("AS", "") # Making sure the variable only has the number
             break
     return as_num, as_name