Added support for 6to4 and Teredo.

Author: ip2location-com

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

@@ -85,4 +85,4 @@ Use the IPv6 BIN file if you need to query BOTH IPv4 and IPv6 addresses.
 Copyright
 =========
 
-Copyright (C) 2018 by IP2Location.com, support@ip2location.com
+Copyright (C) 2019 by IP2Location.com, support@ip2location.com

dub.json

@@ -5,7 +5,7 @@
 	],
 	"description": "IP2Location D Library",
 	"homepage": "https://www.ip2location.com/developers/d",
-	"copyright": "Copyright © 2018, IP2Location",
+	"copyright": "Copyright © 2019, IP2Location",
 	"license": "MIT",
 	"targetType": "library"
 }

source/ip2location-d/ip2location.d

@@ -72,26 +72,51 @@ const ubyte[25] MOBILEBRAND_POSITION = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 const ubyte[25] ELEVATION_POSITION = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 19, 0, 19];
 const ubyte[25] USAGETYPE_POSITION = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 20];
 
-protected const string API_VERSION = "8.0.5";
-
-protected const BigInt MAX_IPV4_RANGE = BigInt("4294967295");
+protected const string API_VERSION = "8.1.0";
 
 version(X86)
 {
-
 	// CTFE of BigInt only supported since phobos 2.079
 	static if (__VERSION__ < 2079)
 	{
+		protected const BigInt MAX_IPV4_RANGE;
 		protected const BigInt MAX_IPV6_RANGE;
+		protected const BigInt FROM_6TO4;
+		protected const BigInt TO_6TO4;
+		protected const BigInt FROM_TEREDO;
+		protected const BigInt TO_TEREDO;
+		protected const BigInt LAST_32BITS;
 
-	    static this()
-	    {
-		    MAX_IPV6_RANGE = BigInt("340282366920938463463374607431768211455");
-	    }
+		static this()
+		{
+			MAX_IPV4_RANGE = BigInt("4294967295");
+			MAX_IPV6_RANGE = BigInt("340282366920938463463374607431768211455");
+			FROM_6TO4 = BigInt("42545680458834377588178886921629466624");
+			TO_6TO4 = BigInt("42550872755692912415807417417958686719");
+			FROM_TEREDO = BigInt("42540488161975842760550356425300246528");
+			TO_TEREDO = BigInt("42540488241204005274814694018844196863");
+			LAST_32BITS = BigInt("4294967295");
+		}
+	}
+	else {
+		protected const MAX_IPV4_RANGE = BigInt("4294967295");
+		protected const MAX_IPV6_RANGE = BigInt("340282366920938463463374607431768211455");
+		protected const FROM_6TO4 = BigInt("42545680458834377588178886921629466624");
+		protected const TO_6TO4 = BigInt("42550872755692912415807417417958686719");
+		protected const FROM_TEREDO = BigInt("42540488161975842760550356425300246528");
+		protected const TO_TEREDO = BigInt("42540488241204005274814694018844196863");
+		protected const LAST_32BITS = BigInt("4294967295");
 	}
-	else protected const MAX_IPV6_RANGE = BigInt("340282366920938463463374607431768211455");
 }
-else protected const BigInt MAX_IPV6_RANGE = BigInt("340282366920938463463374607431768211455");
+else {
+	protected const BigInt MAX_IPV4_RANGE = BigInt("4294967295");
+	protected const BigInt MAX_IPV6_RANGE = BigInt("340282366920938463463374607431768211455");
+	protected const BigInt FROM_6TO4 = BigInt("42545680458834377588178886921629466624");
+	protected const BigInt TO_6TO4 = BigInt("42550872755692912415807417417958686719");
+	protected const BigInt FROM_TEREDO = BigInt("42540488161975842760550356425300246528");
+	protected const BigInt TO_TEREDO = BigInt("42540488241204005274814694018844196863");
+	protected const BigInt LAST_32BITS = BigInt("4294967295");
+}
 
 protected const uint COUNTRYSHORT = 0x00001;
 protected const uint COUNTRYLONG = 0x00002;
@@ -330,6 +355,26 @@ class ip2location {
 						ipdata.ipindex = ((ipno2 >> 16) << 3) + meta.ipv4indexbaseaddr;
 					}
 				}
+				else if (ipdata.ipnum >= FROM_6TO4 && ipdata.ipnum <= TO_6TO4) {
+					// 6to4 so need to remap to ipv4
+					ipdata.iptype = 4;
+					ipdata.ipnum = ipdata.ipnum >> 80;
+					ipdata.ipnum = ipdata.ipnum & LAST_32BITS;
+					uint ipno2 = to!uint(ipdata.ipnum);
+					if (meta.ipv4indexbaseaddr > 0) {
+						ipdata.ipindex = ((ipno2 >> 16) << 3) + meta.ipv4indexbaseaddr;
+					}
+				}
+				else if (ipdata.ipnum >= FROM_TEREDO && ipdata.ipnum <= TO_TEREDO) {
+					// Teredo so need to remap to ipv4
+					ipdata.iptype = 4;
+					ipdata.ipnum = ~ipdata.ipnum; // bitwise NOT
+					ipdata.ipnum = ipdata.ipnum & LAST_32BITS;
+					uint ipno2 = to!uint(ipdata.ipnum);
+					if (meta.ipv4indexbaseaddr > 0) {
+						ipdata.ipindex = ((ipno2 >> 16) << 3) + meta.ipv4indexbaseaddr;
+					}
+				}
 			}
 		}
 		catch (Exception e) {