Added support for PX9 to PX10 packages

Author: ip2location

README.md

@@ -1,6 +1,6 @@
 # IP2Proxy Java Component
 
-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
+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, search engine robots (SES) and residential (RES). 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/database/ip2proxy
@@ -19,28 +19,29 @@ 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 8 for PX1 to PX8 respectively).|
+|GetPackageVersion|Get the package version (1 to 10 for PX1 to PX10 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 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/database/px8-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen" target="_blank">IP2Location</a> for the list of proxy types supported|
+|GetProxyType|Return the proxy type. Please visit <a href="https://www.ip2location.com/database/px10-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen-threat-residential" 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.|
+|GetUsageType|Return the usage type classification of the proxy. Please visit <a href="https://www.ip2location.com/database/px10-ip-proxytype-country-region-city-isp-domain-usagetype-asn-lastseen-threat-residential" 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.|
+|GetThreat|Return the threat type of the proxy.|
 
 ## Usage
 
 Open and read IP2Proxy binary database. There are 2 modes:
 
-1. **IOModes.IP2PROXY_FILE_IO** - File I/O reading. Slower look, but low resource consuming. This is the default.
+1. **IOModes.IP2PROXY_FILE_IO** - File I/O reading. Slower lookup, but low resource consuming. This is the default.
 2. **IOModes.IP2PROXY_MEMORY_MAPPED** - Stores whole IP2Proxy database into a memory-mapped file. Extremely resources consuming. Do not use this mode if your system do not have enough memory.
 
 ```java
@@ -67,10 +68,11 @@ public class Main {
 			String ASN;
 			String AS;
 			String LastSeen;
+			String Threat;
 
 			String IP = "221.121.146.0";
 
-			if (Proxy.Open("/usr/data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP-DOMAIN-USAGETYPE-ASN-LASTSEEN.BIN", IP2Proxy.IOModes.IP2PROXY_MEMORY_MAPPED) == 0) {
+			if (Proxy.Open("/usr/data/IP2PROXY-IP-PROXYTYPE-COUNTRY-REGION-CITY-ISP-DOMAIN-USAGETYPE-ASN-LASTSEEN-THREAT-RESIDENTIAL.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());
@@ -89,6 +91,7 @@ public class Main {
 				System.out.println("ASN: " + All.ASN);
 				System.out.println("AS: " + All.AS);
 				System.out.println("Last_Seen: " + All.Last_Seen);
+				System.out.println("Threat: " + All.Threat);
 
 				// reading individual fields
 				IsProxy = Proxy.IsProxy(IP);
@@ -126,6 +129,9 @@ public class Main {
 
 				LastSeen = Proxy.GetLastSeen(IP);
 				System.out.println("LastSeen: " + LastSeen);
+				
+				Threat = Proxy.GetThreat(IP);
+				System.out.println("Threat: " + Threat);
 			}
 			else {
 				System.out.println("Error reading BIN file.");

com/ip2proxy/IP2Proxy.java

@@ -53,19 +53,21 @@ private enum Modes {
 		ASN,
 		AS,
 		LAST_SEEN,
+		THREAT,
 		ALL;
 	}
 
-	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 static final int COUNTRY_POSITION[] = {0, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3};
+	private static final int REGION_POSITION[] = {0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4};
+	private static final int CITY_POSITION[] = {0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5};
+	private static final int ISP_POSITION[] = {0, 0, 0, 0, 6, 6, 6, 6, 6, 6, 6};
+	private static final int PROXYTYPE_POSITION[] = {0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2};
+	private static final int DOMAIN_POSITION[] = {0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7};
+	private static final int USAGETYPE_POSITION[] = {0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8};
+	private static final int ASN_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9};
+	private static final int AS_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10};
+	private static final int LASTSEEN_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 11};
+	private static final int THREAT_POSITION[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 12};
 
 	private MappedByteBuffer _IPv4Buffer = null;
 	private MappedByteBuffer _IPv6Buffer = null;
@@ -103,6 +105,7 @@ private enum Modes {
 	private int ASN_POSITION_OFFSET;
 	private int AS_POSITION_OFFSET;
 	private int LASTSEEN_POSITION_OFFSET;
+	private int THREAT_POSITION_OFFSET;
 
 	private boolean COUNTRY_ENABLED;
 	private boolean REGION_ENABLED;
@@ -114,8 +117,9 @@ private enum Modes {
 	private boolean ASN_ENABLED;
 	private boolean AS_ENABLED;
 	private boolean LASTSEEN_ENABLED;
+	private boolean THREAT_ENABLED;
 
-	private static final String _ModuleVersion = "2.2.0";
+	private static final String _ModuleVersion = "2.3.0";
 
 	public IP2Proxy() {
 
@@ -258,6 +262,15 @@ public String GetLastSeen(String IP) throws IOException {
 		return ProxyQuery(IP, Modes.LAST_SEEN).Last_Seen;
 	}
 
+/**
+* This function returns the threat type of the proxy.
+* @param IP IP Address you wish to query
+* @return Threat type of the proxy
+*/
+	public String GetThreat(String IP) throws IOException {
+		return ProxyQuery(IP, Modes.THREAT).Threat;
+	}
+	
 /**
 * This function returns proxy result.
 * @param IP IP Address you wish to query
@@ -383,6 +396,7 @@ private boolean LoadBIN() throws IOException {
 				// 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;
+				// THREAT_POSITION_OFFSET = (THREAT_POSITION[_DBType] != 0) ? (THREAT_POSITION[_DBType] - 1) << 2 : 0;
 
 				// slightly different offset for reading by row
 				COUNTRY_POSITION_OFFSET = (COUNTRY_POSITION[_DBType] != 0) ? (COUNTRY_POSITION[_DBType] - 2) << 2 : 0;
@@ -395,6 +409,7 @@ private boolean LoadBIN() throws IOException {
 				ASN_POSITION_OFFSET = (ASN_POSITION[_DBType] != 0) ? (ASN_POSITION[_DBType] - 2) << 2 : 0;
 				AS_POSITION_OFFSET = (AS_POSITION[_DBType] != 0) ? (AS_POSITION[_DBType] - 2) << 2 : 0;
 				LASTSEEN_POSITION_OFFSET = (LASTSEEN_POSITION[_DBType] != 0) ? (LASTSEEN_POSITION[_DBType] - 2) << 2 : 0;
+				THREAT_POSITION_OFFSET = (THREAT_POSITION[_DBType] != 0) ? (THREAT_POSITION[_DBType] - 2) << 2 : 0;
 
 
 				COUNTRY_ENABLED = (COUNTRY_POSITION[_DBType] != 0) ? true : false;
@@ -407,6 +422,7 @@ private boolean LoadBIN() throws IOException {
 				ASN_ENABLED = (ASN_POSITION[_DBType] != 0) ? true : false;
 				AS_ENABLED = (AS_POSITION[_DBType] != 0) ? true : false;
 				LASTSEEN_ENABLED = (LASTSEEN_POSITION[_DBType] != 0) ? true : false;
+				THREAT_ENABLED = (THREAT_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);
@@ -509,6 +525,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 				Result.ASN = MSG_INVALID_IP;
 				Result.AS = MSG_INVALID_IP;
 				Result.Last_Seen = MSG_INVALID_IP;
+				Result.Threat = MSG_INVALID_IP;
 				return Result;
 			}
 
@@ -551,6 +568,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 				Result.ASN = MSG_INVALID_IP;
 				Result.AS = MSG_INVALID_IP;
 				Result.Last_Seen = MSG_INVALID_IP;
+				Result.Threat = MSG_INVALID_IP;
 				return Result;
 			}
 
@@ -576,6 +594,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					Result.ASN = MSG_MISSING_FILE;
 					Result.AS = MSG_MISSING_FILE;
 					Result.Last_Seen = MSG_MISSING_FILE;
+					Result.Threat = MSG_MISSING_FILE;
 					return Result;
 				}
 			}
@@ -623,6 +642,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					Result.ASN = MSG_IPV6_UNSUPPORTED;
 					Result.AS = MSG_IPV6_UNSUPPORTED;
 					Result.Last_Seen = MSG_IPV6_UNSUPPORTED;
+					Result.Threat = MSG_IPV6_UNSUPPORTED;
 					return Result;
 				}
 				MAX_IP_RANGE = MAX_IPV6_RANGE;
@@ -673,6 +693,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					String ASN = MSG_NOT_SUPPORTED;
 					String AS = MSG_NOT_SUPPORTED;
 					String Last_Seen = MSG_NOT_SUPPORTED;
+					String Threat = MSG_NOT_SUPPORTED;
 
 					int FirstCol = 4; // IP From is 4 bytes
 					if (IPType == 6) { // IPv6
@@ -768,6 +789,13 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 						}
 					}
 
+					if (THREAT_ENABLED) {
+						if (Mode == Modes.ALL || Mode == Modes.THREAT) {
+							// Threat = ReadStr(Read32(RowOffset + THREAT_POSITION_OFFSET, Buf, RF).longValue(), RF);
+							Threat = ReadStr(Read32_Row(Row, THREAT_POSITION_OFFSET).longValue(), DataBuf, RF);
+						}
+					}
+					
 					if (Country_Short.equals("-") || Proxy_Type.equals("-")) {
 						Is_Proxy = 0;
 					}
@@ -792,6 +820,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 					Result.ASN = ASN;
 					Result.AS = AS;
 					Result.Last_Seen = Last_Seen;
+					Result.Threat = Threat;
 					return Result;
 				}
 				else {
@@ -815,6 +844,7 @@ public ProxyResult ProxyQuery(String IPAddress, Modes Mode) throws IOException {
 			Result.ASN = MSG_INVALID_IP;
 			Result.AS = MSG_INVALID_IP;
 			Result.Last_Seen = MSG_INVALID_IP;
+			Result.Threat = MSG_INVALID_IP;
 			return Result;
 		}
 		catch(IOException Ex) {

com/ip2proxy/ProxyResult.java

@@ -13,6 +13,7 @@ public class ProxyResult {
 	public String ASN;
 	public String AS;
 	public String Last_Seen;
+	public String Threat;
 
 	ProxyResult() {