Added support for AS domain, AS usage type and AS CIDR

Author: ip2location

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ip2location"
-version = "0.5.4"
+version = "0.6.0"
 authors = ["MARIRS <marirs@gmail.com>"]
 description = "Find geo information & proxy information based on the given IP using IP2Location BIN databases"
 keywords = ["ip2location", "geoip", "geolocation", "ip", "proxy"]

src/ip2location/consts.rs

@@ -70,3 +70,12 @@ pub const ASN_POSITION: [u32; 27] = [
 pub const AS_POSITION: [u32; 27] = [
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25,
 ];
+pub const ASDOMAIN_POSITION: [u32; 27] = [
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26,
+];
+pub const ASUSAGETYPE_POSITION: [u32; 27] = [
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 27,
+];
+pub const ASCIDR_POSITION: [u32; 27] = [
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28,
+];

src/ip2location/db.rs

@@ -399,6 +399,27 @@ impl LocationDB {
                 .read_u32((row_addr + 4 * (AS_POSITION[self.db_type as usize] - 1)).into())?;
             result.as_name = Some(self.source.read_str(index.into())?);
         }
+
+        if ASDOMAIN_POSITION[self.db_type as usize] > 0 {
+            let index = self
+                .source
+                .read_u32((row_addr + 4 * (ASDOMAIN_POSITION[self.db_type as usize] - 1)).into())?;
+            result.as_domain = Some(self.source.read_str(index.into())?);
+        }
+
+        if ASUSAGETYPE_POSITION[self.db_type as usize] > 0 {
+            let index = self
+                .source
+                .read_u32((row_addr + 4 * (ASUSAGETYPE_POSITION[self.db_type as usize] - 1)).into())?;
+            result.as_usage_type = Some(self.source.read_str(index.into())?);
+        }
+
+        if ASCIDR_POSITION[self.db_type as usize] > 0 {
+            let index = self
+                .source
+                .read_u32((row_addr + 4 * (ASCIDR_POSITION[self.db_type as usize] - 1)).into())?;
+            result.as_cidr = Some(self.source.read_str(index.into())?);
+        }
         Ok(result)
     }
 }

src/ip2location/record.rs

@@ -41,6 +41,9 @@ pub struct LocationRecord<'a> {
     pub district: Option<Cow<'a, str>>,
     pub asn: Option<Cow<'a, str>>,
     pub as_name: Option<Cow<'a, str>>,
+    pub as_domain: Option<Cow<'a, str>>,
+    pub as_usage_type: Option<Cow<'a, str>>,
+    pub as_cidr: Option<Cow<'a, str>>,
 }
 
 impl LocationRecord<'_> {
@@ -77,6 +80,9 @@ impl Default for LocationRecord<'_> {
             district: None,
             asn: None,
             as_name: None,
+            as_domain: None,
+            as_usage_type: None,
+            as_cidr: None,
         }
     }
 }