1 files changed, 6 insertions, 6 deletions

diff --git a/src/Cedar/Protocol.h b/src/Cedar/Protocol.h
index ef7eb29e..033c181d 100644
--- a/src/Cedar/Protocol.h
+++ b/src/Cedar/Protocol.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.

 // 

@@ -218,7 +218,7 @@ bool ServerAccept(CONNECTION *c);
 bool ClientConnect(CONNECTION *c);

 SOCK *ClientConnectToServer(CONNECTION *c);

 SOCK *TcpIpConnect(char *hostname, UINT port, bool try_start_ssl, bool ssl_no_tls);

-SOCK *TcpIpConnectEx(char *hostname, UINT port, bool *cancel_flag, void *hWnd, UINT *nat_t_error_code, bool no_nat_t, bool try_start_ssl, bool ssl_no_tls);

+SOCK *TcpIpConnectEx(char *hostname, UINT port, bool *cancel_flag, void *hWnd, UINT *nat_t_error_code, bool no_nat_t, bool try_start_ssl, bool ssl_no_tls, IP *ret_ip);

 bool ClientUploadSignature(SOCK *s);

 bool ClientDownloadHello(CONNECTION *c, SOCK *s);

 bool ServerDownloadSignature(CONNECTION *c, char **error_detail_str);

@@ -226,7 +226,7 @@ bool ServerUploadHello(CONNECTION *c);
 bool ClientUploadAuth(CONNECTION *c);

 SOCK *ClientConnectGetSocket(CONNECTION *c, bool additional_connect, bool no_tls);

 SOCK *TcpConnectEx2(char *hostname, UINT port, UINT timeout, bool *cancel_flag, void *hWnd, bool try_start_ssl, bool ssl_no_tls);

-SOCK *TcpConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, void *hWnd, bool no_nat_t, UINT *nat_t_error_code, bool try_start_ssl, bool ssl_no_tls);

+SOCK *TcpConnectEx3(char *hostname, UINT port, UINT timeout, bool *cancel_flag, void *hWnd, bool no_nat_t, UINT *nat_t_error_code, bool try_start_ssl, bool ssl_no_tls, IP *ret_ip);

 

 void InitProtocol();

 void FreeProtocol();

@@ -280,7 +280,7 @@ SOCK *SocksConnectEx(CONNECTION *c, char *proxy_host_name, UINT proxy_port,
 SOCK *SocksConnectEx2(CONNECTION *c, char *proxy_host_name, UINT proxy_port,

 					 char *server_host_name, UINT server_port,

 					 char *username, bool additional_connect,

-					 bool *cancel_flag, void *hWnd, UINT timeout);

+					 bool *cancel_flag, void *hWnd, UINT timeout, IP *ret_ip);

 bool SocksSendRequestPacket(CONNECTION *c, SOCK *s, UINT dest_port, IP *dest_ip, char *userid);

 bool SocksRecvResponsePacket(CONNECTION *c, SOCK *s);

 void CreateNodeInfo(NODE_INFO *info, CONNECTION *c);