Added supports for provider field and error handling for invalid BIN file.

Author: ip2location

Developers_Guide.txt

@@ -69,7 +69,4 @@ Call to IP2Proxy_close will not deleted the shared memory, it will only detach t
 
 When IP2Proxy_delete_shared_memory() function is called, and if any other process(es) is attached to shared memory, it will only delete the name of the shared memory but the other process(es) will continue to use memory and memory will be freed only after last attached process is detached from it.
 
-After calling IP2Proxy_delete_shared_memory(), the next call to IP2Proxy_set_lookup_mode() with IP2PROXY_SHARED_MEMORY option will result in a new shared memory and will not reuse the old one if one exists and used by any other process. Please refer shm_open and shm_unlink man pages for more info.
-
-
-Version 3.1.0  28/09/2020
+After calling IP2Proxy_delete_shared_memory(), the next call to IP2Proxy_set_lookup_mode() with IP2PROXY_SHARED_MEMORY option will result in a new shared memory and will not reuse the old one if one exists and used by any other process. Please refer shm_open and shm_unlink man pages for more info.

README.md

@@ -63,6 +63,7 @@ Below are the methods supported in this library.
 | IP2Proxy_get_as                                      | Return autonomous system (AS) name.                          |
 | IP2Proxy_get_last_seen                               | Return proxy last seen in days.                              |
 | IP2Proxy_get_threat                                  | Return security threat reported.                             |
+| IP2Proxy_get_provider                                | Return name of VPN provider if available.                    |
 
 
 

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([IP2Proxy], [3.1.0])
+AC_INIT([IP2Proxy], [4.0.0])
 AC_CONFIG_SRCDIR([libIP2Proxy/IP2Proxy.c])
 AM_INIT_AUTOMAKE
 

libIP2Proxy/IP2Proxy.c

@@ -43,17 +43,18 @@ typedef struct ip_container {
 	struct in6_addr ipv6;
 } ip_container;
 
-uint8_t IP2PROXY_COUNTRY_POSITION[11]		= {0,   2,   3,   3,   3,   3,   3,   3,   3,   3,   3};
-uint8_t IP2PROXY_REGION_POSITION[11]		= {0,   0,   0,   4,   4,   4,   4,   4,   4,   4,   4};
-uint8_t IP2PROXY_CITY_POSITION[11]			= {0,   0,   0,   5,   5,   5,   5,   5,   5,   5,   5};
-uint8_t IP2PROXY_ISP_POSITION[11]			= {0,   0,   0,   0,   6,   6,   6,   6,   6,   6,   6};
-uint8_t IP2PROXY_PROXY_TYPE_POSITION[11]	= {0,   0,   2,   2,   2,   2,   2,   2,   2,   2,   2};
-uint8_t IP2PROXY_DOMAIN_POSITION[11]		= {0,   0,   0,   0,   0,   7,   7,   7,   7,   7,   7};
-uint8_t IP2PROXY_USAGE_TYPE_POSITION[11]	= {0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8};
-uint8_t IP2PROXY_ASN_POSITION[11]			= {0,   0,   0,   0,   0,   0,   0,   9,   9,   9,   9};
-uint8_t IP2PROXY_AS_POSITION[11]			= {0,   0,   0,   0,   0,   0,   0,  10,  10,  10,  10};
-uint8_t IP2PROXY_LAST_SEEN_POSITION[11]		= {0,   0,   0,   0,   0,   0,   0,   0,  11,  11,  11};
-uint8_t IP2PROXY_THREAT_POSITION[11]		= {0,   0,   0,   0,   0,   0,   0,   0,   0,  12,  12};
+uint8_t IP2PROXY_PROXY_TYPE_POSITION[12]	= {0,   0,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2};
+uint8_t IP2PROXY_COUNTRY_POSITION[12]		= {0,   2,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3};
+uint8_t IP2PROXY_REGION_POSITION[12]		= {0,   0,   0,   4,   4,   4,   4,   4,   4,   4,   4,   4};
+uint8_t IP2PROXY_CITY_POSITION[12]			= {0,   0,   0,   5,   5,   5,   5,   5,   5,   5,   5,   5};
+uint8_t IP2PROXY_ISP_POSITION[12]			= {0,   0,   0,   0,   6,   6,   6,   6,   6,   6,   6,   6};
+uint8_t IP2PROXY_DOMAIN_POSITION[12]		= {0,   0,   0,   0,   0,   7,   7,   7,   7,   7,   7,   7};
+uint8_t IP2PROXY_USAGE_TYPE_POSITION[12]	= {0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8};
+uint8_t IP2PROXY_ASN_POSITION[12]			= {0,   0,   0,   0,   0,   0,   0,   9,   9,   9,   9,   9};
+uint8_t IP2PROXY_AS_POSITION[12]			= {0,   0,   0,   0,   0,   0,   0,  10,  10,  10,  10,  10};
+uint8_t IP2PROXY_LAST_SEEN_POSITION[12]		= {0,   0,   0,   0,   0,   0,   0,   0,  11,  11,  11,  11};
+uint8_t IP2PROXY_THREAT_POSITION[12]		= {0,   0,   0,   0,   0,   0,   0,   0,   0,  12,  12,  12};
+uint8_t IP2PROXY_PROVIDER_POSITION[12]		= {0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  13};
 
 // Static variables
 static int32_t is_in_memory = 0;
@@ -94,6 +95,15 @@ IP2Proxy *IP2Proxy_open(char *bin)
 
 	IP2Proxy_initialize(handler);
 
+	if (handler->product_code == 2) {
+	} else {
+		if (handler->database_year <= 20 && handler->product_code == 0) {
+		} else {
+			printf(INVALID_BIN_DATABASE);
+			return NULL;
+		}
+	}
+
 	return handler;
 }
 
@@ -223,6 +233,9 @@ static int IP2Proxy_initialize(IP2Proxy *handler)
 	handler->ipv6_database_address = IP2Proxy_read32(handler->file, 18);
 	handler->ipv4_index_base_address = IP2Proxy_read32(handler->file, 22);
 	handler->ipv6_index_base_address = IP2Proxy_read32(handler->file, 26);
+	handler->product_code = IP2Proxy_read8(handler->file, 30);
+	handler->license_code = IP2Proxy_read8(handler->file, 31);
+	handler->database_size = IP2Proxy_read32(handler->file, 32);
 
 	return 0;
 }
@@ -366,6 +379,12 @@ IP2ProxyRecord *IP2Proxy_get_threat(IP2Proxy *handler, char *ip)
 	return IP2Proxy_get_record(handler, ip, THREAT);
 }
 
+// Get Provider
+IP2ProxyRecord *IP2Proxy_get_provider(IP2Proxy *handler, char *ip)
+{
+	return IP2Proxy_get_record(handler, ip, PROVIDER);
+}
+
 // Get all records of an IP address
 IP2ProxyRecord *IP2Proxy_get_all(IP2Proxy *handler, char *ip)
 {
@@ -389,6 +408,7 @@ static IP2ProxyRecord *IP2Proxy_bad_record(const char *message)
 	record->as_ = strdup(message);
 	record->last_seen = strdup(message);
 	record->threat = strdup(message);
+	record->provider = strdup(message);
 
 	return record;
 }
@@ -546,6 +566,16 @@ static IP2ProxyRecord *IP2Proxy_read_record(IP2Proxy *handler, uint32_t rowaddr,
 		}
 	}
 
+	if ((mode & PROVIDER) && (IP2PROXY_PROVIDER_POSITION[dbtype] != 0)) {
+		if (!record->provider) {
+			record->provider = IP2Proxy_read_string(handle, IP2Proxy_read32(handle, rowaddr + 4 * (IP2PROXY_PROVIDER_POSITION[dbtype]-1)));
+		}
+	} else {
+		if (!record->provider) {
+			record->provider = strdup(NOT_SUPPORTED);
+		}
+	}
+
 	return record;
 }
 
@@ -600,6 +630,7 @@ static IP2ProxyRecord *IP2Proxy_get_ipv4_record(IP2Proxy *handler, uint32_t mode
 		record->as_ = NOT_SUPPORTED;
 		record->last_seen = NOT_SUPPORTED;
 		record->threat = NOT_SUPPORTED;
+		record->provider = NOT_SUPPORTED;
 
 		while (fgets(line, 2048, handle) != NULL) {
 			IP2Proxy_replace(line, "\n", "");
@@ -634,6 +665,7 @@ static IP2ProxyRecord *IP2Proxy_get_ipv4_record(IP2Proxy *handler, uint32_t mode
 			record->as_ = "-";
 			record->last_seen = "-";
 			record->threat = "-";
+			record->provider = "-";
 
 			return record;
 		}
@@ -879,6 +911,10 @@ void IP2Proxy_free_record(IP2ProxyRecord *record)
 		free(record->threat);
 	}
 
+	if (record->threat != NULL) {
+		free(record->provider);
+	}
+
 	free(record);
 }
 

libIP2Proxy/IP2Proxy.h

@@ -1,6 +1,6 @@
 /*
  * IP2Proxy C library is distributed under MIT license
- * Copyright (c) 2013-2020 IP2Location.com. support at ip2location dot com
+ * Copyright (c) 2013-2021 IP2Location.com. support at ip2location dot com
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the MIT license
@@ -54,9 +54,9 @@ extern "C" {
 #endif
 #endif
 
-#define API_VERSION			3.2.0
-#define API_VERSION_MAJOR	3
-#define API_VERSION_MINOR	2
+#define API_VERSION			4.0.0
+#define API_VERSION_MAJOR	4
+#define API_VERSION_MINOR	0
 #define API_VERSION_RELEASE	0
 #define API_VERSION_NUMERIC (((API_VERSION_MAJOR * 100) + API_VERSION_MINOR) * 100 + API_VERSION_RELEASE)
 
@@ -78,12 +78,14 @@ extern "C" {
 #define AS				0x00400
 #define LASTSEEN		0x00800
 #define THREAT			0x01000
+#define PROVIDER		0x01200
 
 #define ALL	COUNTRYSHORT | COUNTRYLONG | REGION | CITY | ISP | ISPROXY | PROXYTYPE | DOMAINNAME | USAGETYPE | ASN | AS | LASTSEEN | THREAT
 
 #define INVALID_IP_ADDRESS					"INVALID IP ADDRESS"
 #define IPV6_ADDRESS_MISSING_IN_IPV4_BIN	"IPV6 ADDRESS MISSING IN IPV4 BIN"
 #define NOT_SUPPORTED						"NOT SUPPORTED"
+#define INVALID_BIN_DATABASE				"Incorrect IP2Proxy BIN file format. Please make sure that you are using the latest IP2Proxy BIN file."
 #define IP2PROXY_SHM						"/IP2Proxy_Shm"
 #define MAP_ADDR							4194500608
 
@@ -101,12 +103,15 @@ typedef struct {
 	uint8_t database_day;
 	uint8_t database_month;
 	uint8_t database_year;
+	uint8_t product_code;
+	uint8_t license_code;
 	uint32_t ipv4_database_count;
 	uint32_t ipv4_database_address;
 	uint32_t ipv4_index_base_address;
 	uint32_t ipv6_database_count;
 	uint32_t ipv6_database_address;
 	uint32_t ipv6_index_base_address;
+	uint32_t database_size;
 } IP2Proxy;
 
 typedef struct {
@@ -123,6 +128,7 @@ typedef struct {
 	char *as_;
 	char *last_seen;
 	char *threat;
+	char *provider;
 } IP2ProxyRecord;
 
 /* Public functions */
@@ -153,6 +159,7 @@ IP2ProxyRecord *IP2Proxy_get_region(IP2Proxy *handler, char *ip);
 IP2ProxyRecord *IP2Proxy_get_threat(IP2Proxy *handler, char *ip);
 IP2ProxyRecord *IP2Proxy_get_usage_type(IP2Proxy *handler, char *ip);
 IP2ProxyRecord *IP2Proxy_is_proxy(IP2Proxy *handler, char *ip);
+IP2ProxyRecord *IP2Proxy_get_provider(IP2Proxy *handler, char *ip);
 
 uint32_t IP2Proxy_close(IP2Proxy *handler);
 void IP2Proxy_free_record(IP2ProxyRecord *record);

test/test-IP2Proxy.c

@@ -53,6 +53,7 @@ int main ()
 	fprintf(stdout, "AS: %s\n", record->as_);
 	fprintf(stdout, "Last Seen: %s\n", record->last_seen);
 	fprintf(stdout, "Threat: %s\n", record->threat);
+	fprintf(stdout, "Provider: %s\n", record->provider);
 
 	IP2Proxy_close(IP2ProxyObj);
 	IP2Proxy_free_record(record);