merge upstream v4.19-9605-beta

41 files changed, 229 insertions, 129 deletions

diff --git a/src/Mayaqua/Cfg.c b/src/Mayaqua/Cfg.c
index 4f3181f2..66a0f744 100644
--- a/src/Mayaqua/Cfg.c
+++ b/src/Mayaqua/Cfg.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Cfg.h b/src/Mayaqua/Cfg.h
index ffaac0fb..793f1113 100644
--- a/src/Mayaqua/Cfg.h
+++ b/src/Mayaqua/Cfg.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c
index c4a83ad9..91331b2a 100644
--- a/src/Mayaqua/Encrypt.c
+++ b/src/Mayaqua/Encrypt.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

@@ -2236,6 +2236,7 @@ bool AddX509Name(void *xn, int nid, wchar_t *str)
 	X509_NAME *x509_name;

 	UINT utf8_size;

 	BYTE *utf8;

+	int encoding_type = MBSTRING_ASC;

 	// Validate arguments

 	if (xn == NULL || str == NULL)

 	{

@@ -2252,11 +2253,16 @@ bool AddX509Name(void *xn, int nid, wchar_t *str)
 	UniToUtf8(utf8, utf8_size, str);

 	utf8[utf8_size] = 0;

 

+	if (StrLen(utf8) != UniStrLen(str))

+	{

+		encoding_type = MBSTRING_UTF8;

+	}

+

 	// Adding

 	x509_name = (X509_NAME *)xn;

 	Lock(openssl_lock);

 	{

-		X509_NAME_add_entry_by_NID(x509_name, nid, MBSTRING_ASC, utf8, utf8_size, -1, 0);

+		X509_NAME_add_entry_by_NID(x509_name, nid, encoding_type, utf8, utf8_size, -1, 0);

 	}

 	Unlock(openssl_lock);

 	Free(utf8);

diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h
index e53c56f1..8458399e 100644
--- a/src/Mayaqua/Encrypt.h
+++ b/src/Mayaqua/Encrypt.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/FileIO.c b/src/Mayaqua/FileIO.c
index 2b53fe1f..49fbec95 100644
--- a/src/Mayaqua/FileIO.c
+++ b/src/Mayaqua/FileIO.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/FileIO.h b/src/Mayaqua/FileIO.h
index 2bcf927d..0ad0bf84 100644
--- a/src/Mayaqua/FileIO.h
+++ b/src/Mayaqua/FileIO.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Internat.c b/src/Mayaqua/Internat.c
index 178e1a5a..fa7bad92 100644
--- a/src/Mayaqua/Internat.c
+++ b/src/Mayaqua/Internat.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Internat.h b/src/Mayaqua/Internat.h
index 98236843..4f2383e6 100644
--- a/src/Mayaqua/Internat.h
+++ b/src/Mayaqua/Internat.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Kernel.c b/src/Mayaqua/Kernel.c
index cb2b22e8..94c2a621 100644
--- a/src/Mayaqua/Kernel.c
+++ b/src/Mayaqua/Kernel.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Kernel.h b/src/Mayaqua/Kernel.h
index 56f241f5..a9b737f1 100644
--- a/src/Mayaqua/Kernel.h
+++ b/src/Mayaqua/Kernel.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
index 4ca4d90e..941c976a 100644
--- a/src/Mayaqua/MayaType.h
+++ b/src/Mayaqua/MayaType.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Mayaqua.c b/src/Mayaqua/Mayaqua.c
index f998138a..220d4f85 100644
--- a/src/Mayaqua/Mayaqua.c
+++ b/src/Mayaqua/Mayaqua.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
index cbda4683..17e64950 100644
--- a/src/Mayaqua/Mayaqua.h
+++ b/src/Mayaqua/Mayaqua.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Memory.c b/src/Mayaqua/Memory.c
index 2d9bd9f5..3f86ef47 100644
--- a/src/Mayaqua/Memory.c
+++ b/src/Mayaqua/Memory.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

@@ -2478,9 +2478,12 @@ UINT ReadFifo(FIFO *f, void *p, UINT size)
 

 	f->total_read_size += (UINT64)read_size;

 

-	if (f->size == 0)

+	if (f->fixed == false)

 	{

-		f->pos = 0;

+		if (f->size == 0)

+		{

+			f->pos = 0;

+		}

 	}

 

 	ShrinkFifoMemory(f);

@@ -2500,6 +2503,11 @@ void ShrinkFifoMemory(FIFO *f)
 		return;

 	}

 

+	if (f->fixed)

+	{

+		return;

+	}

+

 	// Rearrange the memory

 	if (f->pos >= FIFO_INIT_MEM_SIZE && 

 		f->memsize >= fifo_current_realloc_mem_size &&

@@ -2520,6 +2528,25 @@ void ShrinkFifoMemory(FIFO *f)
 	}

 }

 

+// Write data to the front of FIFO

+void WriteFifoFront(FIFO *f, void *p, UINT size)

+{

+	// Validate arguments

+	if (f == NULL || size == 0)

+	{

+		return;

+	}

+

+	if (f->pos < size)

+	{

+		PadFifoFront(f, size - f->pos);

+	}

+

+	Copy(((UCHAR *)f->p) + (f->pos - size), p, size);

+	f->pos -= size;

+	f->size += size;

+}

+

 // Write to the FIFO

 void WriteFifo(FIFO *f, void *p, UINT size)

 {

@@ -2560,6 +2587,20 @@ void WriteFifo(FIFO *f, void *p, UINT size)
 	KS_INC(KS_WRITE_FIFO_COUNT);

 }

 

+// Add a padding before the head of fifo

+void PadFifoFront(FIFO *f, UINT size)

+{

+	// Validate arguments

+	if (f == NULL || size == 0)

+	{

+		return;

+	}

+

+	f->memsize += size;

+

+	f->p = ReAlloc(f->p, f->memsize);

+}

+

 // Clear the FIFO

 void ClearFifo(FIFO *f)

 {

@@ -2679,6 +2720,10 @@ FIFO *NewFifoFast()
 }

 FIFO *NewFifoEx(bool fast)

 {

+	return NewFifoEx2(fast, false);

+}

+FIFO *NewFifoEx2(bool fast, bool fixed)

+{

 	FIFO *f;

 

 	// Memory allocation

@@ -2698,6 +2743,7 @@ FIFO *NewFifoEx(bool fast)
 	f->size = f->pos = 0;

 	f->memsize = FIFO_INIT_MEM_SIZE;

 	f->p = Malloc(FIFO_INIT_MEM_SIZE);

+	f->fixed = false;

 

 #ifndef	DONT_USE_KERNEL_STATUS

 //	TrackNewObj(POINTER_TO_UINT64(f), "FIFO", 0);

diff --git a/src/Mayaqua/Memory.h b/src/Mayaqua/Memory.h
index 35066027..d59eae15 100644
--- a/src/Mayaqua/Memory.h
+++ b/src/Mayaqua/Memory.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

@@ -160,6 +160,7 @@ struct FIFO
 	UINT pos, size, memsize;

 	UINT64 total_read_size;

 	UINT64 total_write_size;

+	bool fixed;

 };

 

 // List

@@ -356,6 +357,8 @@ void ShrinkFifoMemory(FIFO *f);
 UCHAR *GetFifoPointer(FIFO *f);

 UCHAR *FifoPtr(FIFO *f);

 void WriteFifo(FIFO *f, void *p, UINT size);

+void WriteFifoFront(FIFO *f, void *p, UINT size);

+void PadFifoFront(FIFO *f, UINT size);

 void ClearFifo(FIFO *f);

 UINT FifoSize(FIFO *f);

 void LockFifo(FIFO *f);

@@ -365,6 +368,7 @@ void CleanupFifo(FIFO *f);
 FIFO *NewFifo();

 FIFO *NewFifoFast();

 FIFO *NewFifoEx(bool fast);

+FIFO *NewFifoEx2(bool fast, bool fixed);

 void InitFifo();

 UINT GetFifoCurrentReallocMemSize();

 void SetFifoCurrentReallocMemSize(UINT size);

diff --git a/src/Mayaqua/Microsoft.c b/src/Mayaqua/Microsoft.c
index d78bc623..cc623add 100644
--- a/src/Mayaqua/Microsoft.c
+++ b/src/Mayaqua/Microsoft.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Microsoft.h b/src/Mayaqua/Microsoft.h
index eba15cfa..822c0a5b 100644
--- a/src/Mayaqua/Microsoft.h
+++ b/src/Mayaqua/Microsoft.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index def2f45e..d0df9010 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

@@ -15170,6 +15170,11 @@ SOCK *ConnectEx2(char *hostname, UINT port, UINT timeout, bool *cancel_flag)
 }

 SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, char *nat_t_svc_name, UINT *nat_t_error_code, bool try_start_ssl, bool ssl_no_tls, bool no_get_hostname)

 {

+	return ConnectEx4(hostname, port, timeout, cancel_flag, nat_t_svc_name, nat_t_error_code, try_start_ssl, ssl_no_tls,

+		no_get_hostname, NULL);

+}

+SOCK *ConnectEx4(char *hostname, UINT port, UINT timeout, bool *cancel_flag, char *nat_t_svc_name, UINT *nat_t_error_code, bool try_start_ssl, bool ssl_no_tls, bool no_get_hostname, IP *ret_ip)

+{

 	SOCK *sock;

 	SOCKET s;

 	struct linger ling;

@@ -15186,6 +15191,7 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 	char hint_str[MAX_SIZE];

 	bool force_use_natt = false;

 	UINT dummy_int = 0;

+	IP dummy_ret_ip;

 	// Validate arguments

 	if (hostname == NULL || port == 0 || port >= 65536 || IsEmptyStr(hostname))

 	{

@@ -15204,6 +15210,12 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 		nat_t_error_code = &dummy_int;

 	}

 

+	Zero(&dummy_ret_ip, sizeof(IP));

+	if (ret_ip == NULL)

+	{

+		ret_ip = &dummy_ret_ip;

+	}

+

 	Zero(hint_str, sizeof(hint_str));

 	StrCpy(hostname_original, sizeof(hostname_original), hostname);

 

@@ -15251,10 +15263,27 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 	Zero(&ip4, sizeof(ip4));

 	Zero(&ip6, sizeof(ip6));

 

-	// Forward resolution

-	if (GetIP46Ex(&ip4, &ip6, hostname_original, 0, cancel_flag) == false)

+	if (IsZeroIp(ret_ip) == false)

 	{

-		return NULL;

+		// Skip name resolution

+		if (IsIP6(ret_ip))

+		{

+			Copy(&ip6, ret_ip, sizeof(IP));

+		}

+		else

+		{

+			Copy(&ip4, ret_ip, sizeof(IP));

+		}

+

+		Debug("Using cached IP address: %s = %r\n", hostname_original, ret_ip);

+	}

+	else

+	{

+		// Forward resolution

+		if (GetIP46Ex(&ip4, &ip6, hostname_original, 0, cancel_flag) == false)

+		{

+			return NULL;

+		}

 	}

 

 	if (IsZeroIp(&ip4) == false && IsIPLocalHostOrMySelf(&ip4))

@@ -15277,6 +15306,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 			if (s != INVALID_SOCKET)

 			{

 				Copy(&current_ip, &ip4, sizeof(IP));

+

+				Copy(ret_ip, &ip4, sizeof(IP));

 			}

 		}

 		else if (force_use_natt)

@@ -15290,6 +15321,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 				StrCpy(nat_t_sock->UnderlayProtocol, sizeof(nat_t_sock->UnderlayProtocol), SOCK_UNDERLAY_NAT_T);

 			}

 

+			Copy(ret_ip, &ip4, sizeof(IP));

+

 			return nat_t_sock;

 		}

 		else

@@ -15498,6 +15531,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 					p1.Result_Tcp_Sock->RemoteHostname = CopyStr(hostname);

 				}

 

+				Copy(ret_ip, &ip4, sizeof(IP));

+

 				return p1.Result_Tcp_Sock;

 			}

 			else if (p2.Ok)

@@ -15512,6 +15547,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 				StrCpy(p2.Result_Nat_T_Sock->UnderlayProtocol, sizeof(p2.Result_Nat_T_Sock->UnderlayProtocol),

 					SOCK_UNDERLAY_NAT_T);

 

+				Copy(ret_ip, &ip4, sizeof(IP));

+

 				return p2.Result_Nat_T_Sock;

 			}

 			else if (p4.Ok)

@@ -15524,6 +15561,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 				StrCpy(p4.Result_Nat_T_Sock->UnderlayProtocol, sizeof(p4.Result_Nat_T_Sock->UnderlayProtocol),

 					SOCK_UNDERLAY_DNS);

 

+				Copy(ret_ip, &ip4, sizeof(IP));

+

 				return p4.Result_Nat_T_Sock;

 			}

 			else if (p3.Ok)

@@ -15532,6 +15571,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 				StrCpy(p3.Result_Nat_T_Sock->UnderlayProtocol, sizeof(p3.Result_Nat_T_Sock->UnderlayProtocol),

 					SOCK_UNDERLAY_ICMP);

 

+				Copy(ret_ip, &ip4, sizeof(IP));

+

 				return p3.Result_Nat_T_Sock;

 			}

 			else

@@ -15574,6 +15615,8 @@ SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, cha
 				Copy(&current_ip, &ip6, sizeof(IP));

 

 				is_ipv6 = true;

+

+				Copy(ret_ip, &ip6, sizeof(IP));

 			}

 		}

 	}

diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
index 6f51bedf..bb4c69b7 100644
--- a/src/Mayaqua/Network.h
+++ b/src/Mayaqua/Network.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

@@ -1275,6 +1275,7 @@ SOCK *Connect(char *hostname, UINT port);
 SOCK *ConnectEx(char *hostname, UINT port, UINT timeout);

 SOCK *ConnectEx2(char *hostname, UINT port, UINT timeout, bool *cancel_flag);

 SOCK *ConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, char *nat_t_svc_name, UINT *nat_t_error_code, bool try_start_ssl, bool ssl_no_tls, bool no_get_hostname);

+SOCK *ConnectEx4(char *hostname, UINT port, UINT timeout, bool *cancel_flag, char *nat_t_svc_name, UINT *nat_t_error_code, bool try_start_ssl, bool ssl_no_tls, bool no_get_hostname, IP *ret_ip);

 SOCKET ConnectTimeoutIPv4(IP *ip, UINT port, UINT timeout, bool *cancel_flag);

 void SetSocketSendRecvBufferSize(SOCKET s, UINT size);

 UINT GetSocketBufferSize(SOCKET s, bool send);

diff --git a/src/Mayaqua/OS.c b/src/Mayaqua/OS.c
index d4355918..aa14936e 100644
--- a/src/Mayaqua/OS.c
+++ b/src/Mayaqua/OS.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/OS.h b/src/Mayaqua/OS.h
index fb0d0460..372351c2 100644
--- a/src/Mayaqua/OS.h
+++ b/src/Mayaqua/OS.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Object.c b/src/Mayaqua/Object.c
index e2684025..5838a2ad 100644
--- a/src/Mayaqua/Object.c
+++ b/src/Mayaqua/Object.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Object.h b/src/Mayaqua/Object.h
index 6423e685..fdfbfd35 100644
--- a/src/Mayaqua/Object.h
+++ b/src/Mayaqua/Object.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Pack.c b/src/Mayaqua/Pack.c
index d2aff711..bcc9408c 100644
--- a/src/Mayaqua/Pack.c
+++ b/src/Mayaqua/Pack.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Pack.h b/src/Mayaqua/Pack.h
index 99dccddb..378533ec 100644
--- a/src/Mayaqua/Pack.h
+++ b/src/Mayaqua/Pack.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Secure.c b/src/Mayaqua/Secure.c
index 00df3c98..a6b646ec 100644
--- a/src/Mayaqua/Secure.c
+++ b/src/Mayaqua/Secure.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Secure.h b/src/Mayaqua/Secure.h
index c7d794d5..a0555bf3 100644
--- a/src/Mayaqua/Secure.h
+++ b/src/Mayaqua/Secure.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Str.c b/src/Mayaqua/Str.c
index 362baef4..ddc0d55c 100644
--- a/src/Mayaqua/Str.c
+++ b/src/Mayaqua/Str.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Str.h b/src/Mayaqua/Str.h
index 70bde377..ed72ae1b 100644
--- a/src/Mayaqua/Str.h
+++ b/src/Mayaqua/Str.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Table.c b/src/Mayaqua/Table.c
index 57b7a46e..d306059f 100644
--- a/src/Mayaqua/Table.c
+++ b/src/Mayaqua/Table.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Table.h b/src/Mayaqua/Table.h
index f121e615..fa7e6f89 100644
--- a/src/Mayaqua/Table.h
+++ b/src/Mayaqua/Table.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/TcpIp.c b/src/Mayaqua/TcpIp.c
index 45e1624b..39c43c09 100644
--- a/src/Mayaqua/TcpIp.c
+++ b/src/Mayaqua/TcpIp.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/TcpIp.h b/src/Mayaqua/TcpIp.h
index 2b559883..da75d21b 100644
--- a/src/Mayaqua/TcpIp.h
+++ b/src/Mayaqua/TcpIp.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Tick64.c b/src/Mayaqua/Tick64.c
index 261c9ab7..522284de 100644
--- a/src/Mayaqua/Tick64.c
+++ b/src/Mayaqua/Tick64.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Tick64.h b/src/Mayaqua/Tick64.h
index f3aa70e8..647c39f6 100644
--- a/src/Mayaqua/Tick64.h
+++ b/src/Mayaqua/Tick64.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Tracking.c b/src/Mayaqua/Tracking.c
index 064bbd05..05141be7 100644
--- a/src/Mayaqua/Tracking.c
+++ b/src/Mayaqua/Tracking.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Tracking.h b/src/Mayaqua/Tracking.h
index 9b6b69c1..e1590c9f 100644
--- a/src/Mayaqua/Tracking.h
+++ b/src/Mayaqua/Tracking.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Unix.c b/src/Mayaqua/Unix.c
index d9193e81..f0b28109 100644
--- a/src/Mayaqua/Unix.c
+++ b/src/Mayaqua/Unix.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Unix.h b/src/Mayaqua/Unix.h
index 1db8425b..2ed91e32 100644
--- a/src/Mayaqua/Unix.h
+++ b/src/Mayaqua/Unix.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Win32.c b/src/Mayaqua/Win32.c
index cbde3bf5..6f6d221b 100644
--- a/src/Mayaqua/Win32.c
+++ b/src/Mayaqua/Win32.c
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 // 

diff --git a/src/Mayaqua/Win32.h b/src/Mayaqua/Win32.h
index e9f4fbb8..8eabcf86 100644
--- a/src/Mayaqua/Win32.h
+++ b/src/Mayaqua/Win32.h
@@ -3,9 +3,9 @@
 // 

 // SoftEther VPN Server, Client and Bridge are free software under GPLv2.

 // 

-// Copyright (c) 2012-2015 Daiyuu Nobori.

-// Copyright (c) 2012-2015 SoftEther VPN Project, University of Tsukuba, Japan.

-// Copyright (c) 2012-2015 SoftEther Corporation.

+// Copyright (c) 2012-2016 Daiyuu Nobori.

+// Copyright (c) 2012-2016 SoftEther VPN Project, University of Tsukuba, Japan.

+// Copyright (c) 2012-2016 SoftEther Corporation.

 // 

 // All Rights Reserved.

 //