Added support for PX5 to PX8 packages

Author: ip2location

LICENSE.TXT

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 IP2Location.com
+Copyright (c) 2019 IP2Location.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,9 +1,9 @@
 # IP2Proxy Java Component
 
-This component allows user to query an IP address if it was being used as open proxy, web proxy, VPN anonymizer and TOR exits. It lookup the proxy IP address from **IP2Proxy BIN Data** file. This data file can be downloaded at
+This component allows user to query an IP address if it was being used as VPN anonymizer, open proxies, web proxies, Tor exits, data center, web hosting (DCH) range and search engine robots (SES). It lookup the proxy IP address from **IP2Proxy BIN Data** file. This data file can be downloaded at
 
 * Free IP2Proxy BIN Data: https://lite.ip2location.com
-* Commercial IP2Proxy BIN Data: https://www.ip2location.com/proxy-database
+* Commercial IP2Proxy BIN Data: https://www.ip2location.com/database/ip2proxy
 
 ## Compilation
 
@@ -19,17 +19,22 @@ Below are the methods supported in this class.
 |---|---|
 |Open|Open the IP2Proxy BIN data for lookup. Please see the **Usage** section of the 2 modes supported to load the BIN data file.|
 |Close|Close and clean up the file pointer.|
-|GetPackageVersion|Get the package version (1 to 4 for PX1 to PX4 respectively).|
+|GetPackageVersion|Get the package version (1 to 8 for PX1 to PX8 respectively).|
 |GetModuleVersion|Get the module version.|
 |GetDatabaseVersion|Get the database version.|
-|IsProxy|Check whether if an IP address was a proxy. Returned value:<ul><li>-1 : errors</li><li>0 : not a proxy</li><li>1 : a proxy</li><li>2 : a data center IP address</li></ul>|
+|IsProxy|Check whether if an IP address was a proxy. Returned value:<ul><li>-1 : errors</li><li>0 : not a proxy</li><li>1 : a proxy</li><li>2 : a data center IP address or search engine robot</li></ul>|
 |GetAll|Return the proxy information in an object.|
 |GetProxyType|Return the proxy type. Please visit <a href="https://www.ip2location.com/databases/px4-ip-proxytype-country-region-city-isp" target="_blank">IP2Location</a> for the list of proxy types supported|
 |GetCountryShort|Return the ISO3166-1 country code (2-digits) of the proxy.|
 |GetCountryLong|Return the ISO3166-1 country name of the proxy.|
 |GetRegion|Return the ISO3166-2 region name of the proxy. Please visit <a href="https://www.ip2location.com/free/iso3166-2" target="_blank">ISO3166-2 Subdivision Code</a> for the information of ISO3166-2 supported|
 |GetCity|Return the city name of the proxy.|
 |GetISP|Return the ISP name of the proxy.|
+|GetDomain|Return the domain name of the proxy.|
+|GetUsageType|Return the usage type classification of the proxy. Please visit <a href="https://www.ip2location.com/database/px8-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen" target="_blank">IP2Location</a> for the list of usage types supported.|
+|GetASN|Return the autonomous system number of the proxy.|
+|GetAS|Return the autonomous system name of the proxy.|
+|GetLastSeen|Return the number of days that the proxy was last seen.|
 
 ## Usage
 
@@ -57,10 +62,15 @@ public class Main {
 			String Region;
 			String City;
 			String ISP;
+			String Domain;
+			String UsageType;
+			String ASN;
+			String AS;
+			String LastSeen;
 
 			String IP = "221.121.146.0";
 
-			if (Proxy.Open("/usr/data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP.SAMPLE.BIN", IP2Proxy.IOModes.IP2PROXY_MEMORY_MAPPED) == 0) {
+			if (Proxy.Open("/usr/data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP-DOMAIN-USAGETYPE-ASN-LASTSEEN.BIN", IP2Proxy.IOModes.IP2PROXY_MEMORY_MAPPED) == 0) {
 				System.out.println("GetModuleVersion: " + Proxy.GetModuleVersion());
 				System.out.println("GetPackageVersion: " + Proxy.GetPackageVersion());
 				System.out.println("GetDatabaseVersion: " + Proxy.GetDatabaseVersion());
@@ -74,6 +84,11 @@ public class Main {
 				System.out.println("Region: " + All.Region);
 				System.out.println("City: " + All.City);
 				System.out.println("ISP: " + All.ISP);
+				System.out.println("Domain: " + All.Domain);
+				System.out.println("Usage_Type: " + All.Usage_Type);
+				System.out.println("ASN: " + All.ASN);
+				System.out.println("AS: " + All.AS);
+				System.out.println("Last_Seen: " + All.Last_Seen);
 
 				// reading individual fields
 				IsProxy = Proxy.IsProxy(IP);
@@ -96,6 +111,21 @@ public class Main {
 
 				ISP = Proxy.GetISP(IP);
 				System.out.println("ISP: " + ISP);
+				
+				Domain = Proxy.GetDomain(IP);
+				System.out.println("Domain: " + Domain);
+				
+				UsageType = Proxy.GetUsageType(IP);
+				System.out.println("UsageType: " + UsageType);
+				
+				ASN = Proxy.GetASN(IP);
+				System.out.println("ASN: " + ASN);
+				
+				AS = Proxy.GetAS(IP);
+				System.out.println("AS: " + AS);
+				
+				LastSeen = Proxy.GetLastSeen(IP);
+				System.out.println("LastSeen: " + LastSeen);
 			}
 			else {
 				System.out.println("Error reading BIN file.");

com/ip2proxy/IP2Proxy.java

@@ -41,14 +41,24 @@ private enum Modes {
 		ISP,
 		PROXY_TYPE,
 		IS_PROXY,
+		DOMAIN,
+		USAGE_TYPE,
+		ASN,
+		AS,
+		LAST_SEEN,
 		ALL;
 	}
 
-	private static final int COUNTRY_POSITION[] = {0, 2, 3, 3, 3};
-	private static final int REGION_POSITION[] = {0, 0, 0, 4, 4};
-	private static final int CITY_POSITION[] = {0, 0, 0, 5, 5};
-	private static final int ISP_POSITION[] = {0, 0, 0, 0, 6};
-	private static final int PROXYTYPE_POSITION[] = {0, 0, 2, 2, 2};
+	private static final int COUNTRY_POSITION[] = {0, 2, 3, 3, 3, 3, 3, 3, 3};
+	private static final int REGION_POSITION[] = {0, 0, 0, 4, 4, 4, 4, 4, 4};
+	private static final int CITY_POSITION[] = {0, 0, 0, 5, 5, 5, 5, 5, 5};
+	private static final int ISP_POSITION[] = {0, 0, 0, 0, 6, 6, 6, 6, 6};
+	private static final int PROXYTYPE_POSITION[] = {0, 0, 2, 2, 2, 2, 2, 2, 2};
+	private static final int DOMAIN_POSITION[] = {0, 0, 0, 0, 0, 7, 7, 7, 7};
+	private static final int USAGETYPE_POSITION[] = {0, 0, 0, 0, 0, 0, 8, 8, 8};
+	private static final int ASN_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 9, 9};
+	private static final int AS_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 10, 10};
+	private static final int LASTSEEN_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 0, 11};
 
 	private MappedByteBuffer _IPv4Buffer = null;
 	private MappedByteBuffer _IPv6Buffer = null;
@@ -81,13 +91,24 @@ private enum Modes {
 	private int CITY_POSITION_OFFSET;
 	private int ISP_POSITION_OFFSET;
 	private int PROXYTYPE_POSITION_OFFSET;
+	private int DOMAIN_POSITION_OFFSET;
+	private int USAGETYPE_POSITION_OFFSET;
+	private int ASN_POSITION_OFFSET;
+	private int AS_POSITION_OFFSET;
+	private int LASTSEEN_POSITION_OFFSET;
+	
 	private boolean COUNTRY_ENABLED;
 	private boolean REGION_ENABLED;
 	private boolean CITY_ENABLED;
 	private boolean ISP_ENABLED;
 	private boolean PROXYTYPE_ENABLED;
+	private boolean DOMAIN_ENABLED;
+	private boolean USAGETYPE_ENABLED;
+	private boolean ASN_ENABLED;
+	private boolean AS_ENABLED;
+	private boolean LASTSEEN_ENABLED;
 
-	private static final String _ModuleVersion = "1.0.1";
+	private static final String _ModuleVersion = "2.0.0";
 
 	public IP2Proxy() {
 
@@ -125,7 +146,7 @@ public String GetDatabaseVersion() {
 /**
 * This function returns ans integer to state if it proxy.
 * @param IP IP Address you wish to query
-* @return -1 if error, 0 if not a proxy, 1 if proxy except DCH, 2 if proxy and DCH
+* @return -1 if error, 0 if not a proxy, 1 if proxy except DCH and SES, 2 if proxy and either DCH or SES
 */
 	public int IsProxy(String IP) throws IOException {
 		return ProxyQuery(IP, Modes.IS_PROXY).Is_Proxy;
@@ -185,6 +206,51 @@ public String GetProxyType(String IP) throws IOException {
 		return ProxyQuery(IP, Modes.PROXY_TYPE).Proxy_Type;
 	}
 
+/**
+* This function returns the domain.
+* @param IP IP Address you wish to query
+* @return Domain
+*/
+	public String GetDomain(String IP) throws IOException {
+		return ProxyQuery(IP, Modes.DOMAIN).Domain;
+	}
+	
+/**
+* This function returns the usage type.
+* @param IP IP Address you wish to query
+* @return Proxy type
+*/
+	public String GetUsageType(String IP) throws IOException {
+		return ProxyQuery(IP, Modes.USAGE_TYPE).Usage_Type;
+	}
+	
+/**
+* This function returns the Autonomous System Number.
+* @param IP IP Address you wish to query
+* @return Autonomous System Number
+*/
+	public String GetASN(String IP) throws IOException {
+		return ProxyQuery(IP, Modes.ASN).ASN;
+	}
+	
+/**
+* This function returns the Autonomous System name.
+* @param IP IP Address you wish to query
+* @return Autonomous System name
+*/
+	public String GetAS(String IP) throws IOException {
+		return ProxyQuery(IP, Modes.AS).AS;
+	}
+	
+/**
+* This function returns number of days the proxy was last seen.
+* @param IP IP Address you wish to query
+* @return Number of days last seen
+*/
+	public String GetLastSeen(String IP) throws IOException {
+		return ProxyQuery(IP, Modes.LAST_SEEN).Last_Seen;
+	}
+	
 /**
 * This function returns proxy result.
 * @param IP IP Address you wish to query
@@ -305,12 +371,22 @@ private boolean LoadBIN() throws IOException {
 				CITY_POSITION_OFFSET = (CITY_POSITION[_DBType] != 0) ? (CITY_POSITION[_DBType] - 1) << 2 : 0;
 				ISP_POSITION_OFFSET = (ISP_POSITION[_DBType] != 0) ? (ISP_POSITION[_DBType] - 1) << 2 : 0;
 				PROXYTYPE_POSITION_OFFSET = (PROXYTYPE_POSITION[_DBType] != 0) ? (PROXYTYPE_POSITION[_DBType] - 1) << 2 : 0;
+				DOMAIN_POSITION_OFFSET = (DOMAIN_POSITION[_DBType] != 0) ? (DOMAIN_POSITION[_DBType] - 1) << 2 : 0;
+				USAGETYPE_POSITION_OFFSET = (USAGETYPE_POSITION[_DBType] != 0) ? (USAGETYPE_POSITION[_DBType] - 1) << 2 : 0;
+				ASN_POSITION_OFFSET = (ASN_POSITION[_DBType] != 0) ? (ASN_POSITION[_DBType] - 1) << 2 : 0;
+				AS_POSITION_OFFSET = (AS_POSITION[_DBType] != 0) ? (AS_POSITION[_DBType] - 1) << 2 : 0;
+				LASTSEEN_POSITION_OFFSET = (LASTSEEN_POSITION[_DBType] != 0) ? (LASTSEEN_POSITION[_DBType] - 1) << 2 : 0;
 
 				COUNTRY_ENABLED = (COUNTRY_POSITION[_DBType] != 0) ? true : false;
 				REGION_ENABLED = (REGION_POSITION[_DBType] != 0) ? true : false;
 				CITY_ENABLED = (CITY_POSITION[_DBType] != 0) ? true : false;
 				ISP_ENABLED = (ISP_POSITION[_DBType] != 0) ? true : false;
 				PROXYTYPE_ENABLED = (PROXYTYPE_POSITION[_DBType] != 0) ? true : false;
+				DOMAIN_ENABLED = (DOMAIN_POSITION[_DBType] != 0) ? true : false;
+				USAGETYPE_ENABLED = (USAGETYPE_POSITION[_DBType] != 0) ? true : false;
+				ASN_ENABLED = (ASN_POSITION[_DBType] != 0) ? true : false;
+				AS_ENABLED = (AS_POSITION[_DBType] != 0) ? true : false;
+				LASTSEEN_ENABLED = (LASTSEEN_POSITION[_DBType] != 0) ? true : false;
 
 				final MappedByteBuffer _IndexBuffer = InChannel.map(FileChannel.MapMode.READ_ONLY, _IndexBaseAddr - 1, _BaseAddr - _IndexBaseAddr); // reading indexes
 				_IndexBuffer.order(ByteOrder.LITTLE_ENDIAN);
@@ -406,6 +482,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 				Result.Region = MSG_INVALID_IP;
 				Result.City = MSG_INVALID_IP;
 				Result.ISP = MSG_INVALID_IP;
+				Result.Domain = MSG_INVALID_IP;
+				Result.Usage_Type = MSG_INVALID_IP;
+				Result.ASN = MSG_INVALID_IP;
+				Result.AS = MSG_INVALID_IP;
+				Result.Last_Seen = MSG_INVALID_IP;
 				return Result;
 			}
 
@@ -443,6 +524,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 				Result.Region = MSG_INVALID_IP;
 				Result.City = MSG_INVALID_IP;
 				Result.ISP = MSG_INVALID_IP;
+				Result.Domain = MSG_INVALID_IP;
+				Result.Usage_Type = MSG_INVALID_IP;
+				Result.ASN = MSG_INVALID_IP;
+				Result.AS = MSG_INVALID_IP;
+				Result.Last_Seen = MSG_INVALID_IP;
 				return Result;
 			}
 
@@ -463,6 +549,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					Result.Region = MSG_MISSING_FILE;
 					Result.City = MSG_MISSING_FILE;
 					Result.ISP = MSG_MISSING_FILE;
+					Result.Domain = MSG_MISSING_FILE;
+					Result.Usage_Type = MSG_MISSING_FILE;
+					Result.ASN = MSG_MISSING_FILE;
+					Result.AS = MSG_MISSING_FILE;
+					Result.Last_Seen = MSG_MISSING_FILE;
 					return Result;
 				}
 			}
@@ -503,6 +594,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					Result.Region = MSG_IPV6_UNSUPPORTED;
 					Result.City = MSG_IPV6_UNSUPPORTED;
 					Result.ISP = MSG_IPV6_UNSUPPORTED;
+					Result.Domain = MSG_IPV6_UNSUPPORTED;
+					Result.Usage_Type = MSG_IPV6_UNSUPPORTED;
+					Result.ASN = MSG_IPV6_UNSUPPORTED;
+					Result.AS = MSG_IPV6_UNSUPPORTED;
+					Result.Last_Seen = MSG_IPV6_UNSUPPORTED;
 					return Result;
 				}
 				MAX_IP_RANGE = MAX_IPV6_RANGE;
@@ -546,6 +642,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					String Region = MSG_NOT_SUPPORTED;
 					String City = MSG_NOT_SUPPORTED;
 					String ISP = MSG_NOT_SUPPORTED;
+					String Domain = MSG_NOT_SUPPORTED;
+					String Usage_Type = MSG_NOT_SUPPORTED;
+					String ASN = MSG_NOT_SUPPORTED;
+					String AS = MSG_NOT_SUPPORTED;
+					String Last_Seen = MSG_NOT_SUPPORTED;
 
 					if (IPType == 6) { // IPv6
 						RowOffset = RowOffset + 12; // coz below is assuming all columns are 4 bytes, so got 12 left to go to make 16 bytes total
@@ -587,11 +688,41 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 						}
 					}
 
+					if (DOMAIN_ENABLED) {
+						if (Mode == Modes.ALL || Mode == Modes.DOMAIN) {
+							Domain = ReadStr(Read32(RowOffset + DOMAIN_POSITION_OFFSET, Buf, RF).longValue(), RF);
+						}
+					}
+					
+					if (USAGETYPE_ENABLED) {
+						if (Mode == Modes.ALL || Mode == Modes.USAGE_TYPE) {
+							Usage_Type = ReadStr(Read32(RowOffset + USAGETYPE_POSITION_OFFSET, Buf, RF).longValue(), RF);
+						}
+					}
+					
+					if (ASN_ENABLED) {
+						if (Mode == Modes.ALL || Mode == Modes.ASN) {
+							ASN = ReadStr(Read32(RowOffset + ASN_POSITION_OFFSET, Buf, RF).longValue(), RF);
+						}
+					}
+					
+					if (AS_ENABLED) {
+						if (Mode == Modes.ALL || Mode == Modes.AS) {
+							AS = ReadStr(Read32(RowOffset + AS_POSITION_OFFSET, Buf, RF).longValue(), RF);
+						}
+					}
+					
+					if (LASTSEEN_ENABLED) {
+						if (Mode == Modes.ALL || Mode == Modes.LAST_SEEN) {
+							Last_Seen = ReadStr(Read32(RowOffset + LASTSEEN_POSITION_OFFSET, Buf, RF).longValue(), RF);
+						}
+					}
+					
 					if (Country_Short.equals("-") || Proxy_Type.equals("-")) {
 						Is_Proxy = 0;
 					}
 					else {
-						if (Proxy_Type.equals("DCH")) {
+						if (Proxy_Type.equals("DCH") || Proxy_Type.equals("SES")) {
 							Is_Proxy = 2;
 						}
 						else {
@@ -606,6 +737,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					Result.Region = Region;
 					Result.City = City;
 					Result.ISP = ISP;
+					Result.Domain = Domain;
+					Result.Usage_Type = Usage_Type;
+					Result.ASN = ASN;
+					Result.AS = AS;
+					Result.Last_Seen = Last_Seen;
 					return Result;
 				}
 				else {
@@ -624,6 +760,11 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 			Result.Region = MSG_INVALID_IP;
 			Result.City = MSG_INVALID_IP;
 			Result.ISP = MSG_INVALID_IP;
+			Result.Domain = MSG_INVALID_IP;
+			Result.Usage_Type = MSG_INVALID_IP;
+			Result.ASN = MSG_INVALID_IP;
+			Result.AS = MSG_INVALID_IP;
+			Result.Last_Seen = MSG_INVALID_IP;
 			return Result;
 		}
 		catch(IOException Ex) {

com/ip2proxy/ProxyResult.java

@@ -8,6 +8,11 @@ public class ProxyResult {
 	public String Region;
 	public String City;
 	public String ISP;
+	public String Domain;
+	public String Usage_Type;
+	public String ASN;
+	public String AS;
+	public String Last_Seen;
 
 	ProxyResult() {