Commit: 79dd2b343ce394098b2f0f9d89e53bd8c28b7401 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisão: 79dd2b343ce394098b2f0f9d89e53bd8c28b7401 (tree)
• Hora: 2011-11-12 17:41:28
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Add support for IPv6 (not tested).

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: doc/eng/FFFTP.txt
• modified: doc/eng/history.txt
• modified: doc/jpn/FFFTP.txt
• modified: doc/jpn/history.txt
• modified: getput.c
• modified: hostman.c
• modified: local.c
• modified: registry.c
• modified: socket.c

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/common.h
+++ b/common.h
@@ -952,6 +952,7 @@ typedef struct {
 	// MLSD対応
 	int UseMLSD;						/* "MLSD"コマンドを使用する */
 	// IPv6対応
+	int InetFamily;						/* IPv6接続かどうか (AF_INET/AF_INET6) */
 	int UseIPv6;						/* IPv6接続を許可しEPRT/EPSVコマンドを使用する */
 } HOSTDATA;
 
@@ -1181,9 +1182,11 @@ typedef struct {
 	char Rsv;				/* （予約） */
 	char Type;				/* アドレスのタイプ */
 							/* 以後（可変長部分） */
-	ulong AdrsInt;			/* アドレス */
-	ushort Port;			/* ポート */
-	char _dummy[2];			/* dummy */
+	// IPv6対応
+//	ulong AdrsInt;			/* アドレス */
+//	ushort Port;			/* ポート */
+//	char _dummy[2];			/* dummy */
+	char _dummy[255+1+2];	/* dummy */
 } SOCKS5REPLY;
 
 #define SOCKS5REPLY_SIZE 4	/* 最初の固定部分のサイズ */
@@ -1416,7 +1419,13 @@ void DisconnectProc(void);
 void DisconnectSet(void);
 int AskConnecting(void);
 SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork);
+// IPv6対応
+SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork);
+SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork);
 SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork);
+// IPv6対応
+SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork);
+SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork);
 int AskTryingConnect(void);
 // 同時接続対応
 //int SocksGet2ndBindReply(SOCKET Socket, SOCKET *Data);
@@ -1436,6 +1445,7 @@ int AskHostFeature(void);
 // MLSD対応
 int AskUseMLSD(void);
 // IPv6対応
+int AskInetFamily(void);
 int AskUseIPv6(void);
 
 /*===== cache.c =====*/
@@ -1724,7 +1734,10 @@ char *AskLocalFreeSpace(char *Path);
 
 int MakeSocketWin(HWND hWnd, HINSTANCE hInst);
 void DeleteSocketWin(void);
-struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork);
+// IPv6対応
+//struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork);
+struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *CancelCheckWork);
+struct hostent *do_gethostbynameIPv6(const char *Name, char *Buf, int Len, int *CancelCheckWork);
 SOCKET do_socket(int af, int type, int protocol);
 int do_connect(SOCKET s, const struct sockaddr *name, int namelen, int *CancelCheckWork);
 int do_closesocket(SOCKET s);
@@ -1736,6 +1749,10 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 void RemoveReceivedData(SOCKET s);
 int CheckClosedAndReconnect(void);
 void CheckAllEventClosed(void);
+// IPv6対応
+char* AddressToStringIPv6(char* str, void* in6);
+char* inet6_ntoa(struct in6_addr in6);
+struct in6_addr inet6_addr(const char* cp);
 
 /*===== updatebell.c =====*/
 

--- a/connect.c
+++ b/connect.c
@@ -35,7 +35,9 @@
 #include <string.h>
 #include <mbstring.h>
 #include <time.h>
-#include <winsock.h>
+// IPv6対応
+//#include <winsock.h>
+#include <ws2tcpip.h>
 #include <windowsx.h>
 #include <commctrl.h>
 
@@ -65,6 +67,8 @@ static SOCKET DoConnect(HOSTDATA* HostData, char *Host, char *User, char *Pass,
 static int CheckOneTimePassword(char *Pass, char *Reply, int Type);
 static BOOL CALLBACK BlkHookFnc(void);
 static int Socks5MakeCmdPacket(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, ulong IP, char *Host, ushort Port);
+// IPv6対応
+static int Socks5MakeCmdPacketIPv6(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, char *IP, char *Host, ushort Port);
 static int SocksSendCmd(SOCKET Socket, void *Data, int Size, int *CancelCheckWork);
 // 同時接続対応
 //static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet);
@@ -107,8 +111,14 @@ static int TmpNameKanjiCode;
 
 /* 接続中の接続先、SOCKSサーバのアドレス情報を保存しておく */
 /* この情報はlistenソケットを取得する際に用いる */
-static struct sockaddr_in SocksSockAddr;	/* SOCKSサーバのアドレス情報 */
-static struct sockaddr_in CurSockAddr;		/* 接続先ホストのアドレス情報 */
+// IPv6対応
+//static struct sockaddr_in SocksSockAddr;	/* SOCKSサーバのアドレス情報 */
+//static struct sockaddr_in CurSockAddr;		/* 接続先ホストのアドレス情報 */
+static struct sockaddr_in SocksSockAddrIPv4;	/* SOCKSサーバのアドレス情報 */
+static struct sockaddr_in CurSockAddrIPv4;		/* 接続先ホストのアドレス情報 */
+static struct sockaddr_in6 SocksSockAddrIPv6;	/* SOCKSサーバのアドレス情報 */
+static struct sockaddr_in6 CurSockAddrIPv6;		/* 接続先ホストのアドレス情報 */
+static const struct in6_addr IN6ADDR_NONE = {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
 
 static int UseIPadrs;
 static char DomainName[HOST_ADRS_LEN+1];
@@ -1789,8 +1799,34 @@ static int CheckOneTimePassword(char *Pass, char *Reply, int Type)
 *		SOCKET ソケット
 *----------------------------------------------------------------------------*/
 
+// IPv6対応
 SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 {
+	SOCKET Result;
+	Result = INVALID_SOCKET;
+	switch(CurHost.InetFamily)
+	{
+	case AF_UNSPEC:
+		if((Result = connectsockIPv4(host, port, PreMsg, CancelCheckWork)) != INVALID_SOCKET)
+			CurHost.InetFamily = AF_INET;
+		else if(CurHost.UseIPv6 == YES && (Result = connectsockIPv6(host, port, PreMsg, CancelCheckWork)) != INVALID_SOCKET)
+			CurHost.InetFamily = AF_INET6;
+		break;
+	case AF_INET:
+		Result = connectsockIPv4(host, port, PreMsg, CancelCheckWork);
+		break;
+	case AF_INET6:
+		Result = connectsockIPv6(host, port, PreMsg, CancelCheckWork);
+		break;
+	}
+	return Result;
+}
+
+
+// IPv6対応
+//SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
+SOCKET connectsockIPv4(char *host, int port, char *PreMsg, int *CancelCheckWork)
+{
 	struct sockaddr_in saSockAddr;
 	char HostEntry[MAXGETHOSTSTRUCT];
 	struct hostent *pHostEntry;
@@ -1814,10 +1850,15 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 
 	UseIPadrs = YES;
 	strcpy(DomainName, host);
-	memset(&CurSockAddr, 0, sizeof(CurSockAddr));
-	CurSockAddr.sin_port = htons((u_short)port);
-	CurSockAddr.sin_family = AF_INET;
-	if((CurSockAddr.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE)
+	// IPv6対応
+//	memset(&CurSockAddr, 0, sizeof(CurSockAddr));
+//	CurSockAddr.sin_port = htons((u_short)port);
+//	CurSockAddr.sin_family = AF_INET;
+//	if((CurSockAddr.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE)
+	memset(&CurSockAddrIPv4, 0, sizeof(CurSockAddrIPv4));
+	CurSockAddrIPv4.sin_port = htons((u_short)port);
+	CurSockAddrIPv4.sin_family = AF_INET;
+	if((CurSockAddrIPv4.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE)
 	{
 		// ホスト名が指定された
 		// ホスト名からアドレスを求める
@@ -1831,20 +1872,27 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 		{
 			// アドレスを取得
 			SetTaskMsg(MSGJPN016, DomainName);
-			pHostEntry = do_gethostbyname(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
+			// IPv6対応
+//			pHostEntry = do_gethostbyname(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
+			pHostEntry = do_gethostbynameIPv4(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
 		}
 
 		if(pHostEntry != NULL)
 		{
-			memcpy((char *)&CurSockAddr.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
-			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddr.sin_addr), ntohs(CurSockAddr.sin_port));
+			// IPv6対応
+//			memcpy((char *)&CurSockAddr.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
+//			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddr.sin_addr), ntohs(CurSockAddr.sin_port));
+			memcpy((char *)&CurSockAddrIPv4.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
+			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port));
 		}
 		else
 		{
 			if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
 			{
 				UseIPadrs = NO;
-				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddr.sin_port));
+				// IPv6対応
+//				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddr.sin_port));
+				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddrIPv4.sin_port));
 			}
 			else
 			{
@@ -1854,7 +1902,9 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 		}
 	}
 	else
-		SetTaskMsg(MSGJPN020, PreMsg, inet_ntoa(CurSockAddr.sin_addr), ntohs(CurSockAddr.sin_port));
+		// IPv6対応
+//		SetTaskMsg(MSGJPN020, PreMsg, inet_ntoa(CurSockAddr.sin_addr), ntohs(CurSockAddr.sin_port));
+		SetTaskMsg(MSGJPN020, PreMsg, inet_ntoa(CurSockAddrIPv4.sin_addr), ntohs(CurSockAddrIPv4.sin_port));
 
 	if((Fwall == FWALL_SOCKS4) || (Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
 	{
@@ -1864,37 +1914,56 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 		{
 			Socks4Cmd.Ver = SOCKS4_VER;
 			Socks4Cmd.Cmd = SOCKS4_CMD_CONNECT;
-			Socks4Cmd.Port = CurSockAddr.sin_port;
-			Socks4Cmd.AdrsInt = CurSockAddr.sin_addr.s_addr;
+			// IPv6対応
+//			Socks4Cmd.Port = CurSockAddr.sin_port;
+//			Socks4Cmd.AdrsInt = CurSockAddr.sin_addr.s_addr;
+			Socks4Cmd.Port = CurSockAddrIPv4.sin_port;
+			Socks4Cmd.AdrsInt = CurSockAddrIPv4.sin_addr.s_addr;
 			strcpy(Socks4Cmd.UserID, FwallUser);
 			Len = offsetof(SOCKS4CMD, UserID) + strlen(FwallUser) + 1;
 		}
 		else
 		{
-			Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_CONNECT, UseIPadrs, CurSockAddr.sin_addr.s_addr, DomainName, CurSockAddr.sin_port);
+			// IPv6対応
+//			Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_CONNECT, UseIPadrs, CurSockAddr.sin_addr.s_addr, DomainName, CurSockAddr.sin_port);
+			Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_CONNECT, UseIPadrs, CurSockAddrIPv4.sin_addr.s_addr, DomainName, CurSockAddrIPv4.sin_port);
 		}
 
-		memset(&SocksSockAddr, 0, sizeof(SocksSockAddr));
-		if((SocksSockAddr.sin_addr.s_addr = inet_addr(FwallHost)) == INADDR_NONE)
+		// IPv6対応
+//		memset(&SocksSockAddr, 0, sizeof(SocksSockAddr));
+//		if((SocksSockAddr.sin_addr.s_addr = inet_addr(FwallHost)) == INADDR_NONE)
+		memset(&SocksSockAddrIPv4, 0, sizeof(SocksSockAddrIPv4));
+		if((SocksSockAddrIPv4.sin_addr.s_addr = inet_addr(FwallHost)) == INADDR_NONE)
 		{
-			if((pHostEntry = do_gethostbyname(FwallHost, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork)) != NULL)
-				memcpy((char *)&SocksSockAddr.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
+			// IPv6対応
+//			if((pHostEntry = do_gethostbyname(FwallHost, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork)) != NULL)
+//				memcpy((char *)&SocksSockAddr.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
+			if((pHostEntry = do_gethostbynameIPv4(FwallHost, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork)) != NULL)
+				memcpy((char *)&SocksSockAddrIPv4.sin_addr, pHostEntry->h_addr, pHostEntry->h_length);
 			else
 			{
 				SetTaskMsg(MSGJPN021, FwallHost);
 				return INVALID_SOCKET;
 			}
 		}
-		SocksSockAddr.sin_port = htons((u_short)FwallPort);
-		SocksSockAddr.sin_family = AF_INET;
-		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddr.sin_addr), ntohs(SocksSockAddr.sin_port));
+		// IPv6対応
+//		SocksSockAddr.sin_port = htons((u_short)FwallPort);
+//		SocksSockAddr.sin_family = AF_INET;
+//		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddr.sin_addr), ntohs(SocksSockAddr.sin_port));
+		SocksSockAddrIPv4.sin_port = htons((u_short)FwallPort);
+		SocksSockAddrIPv4.sin_family = AF_INET;
+		SetTaskMsg(MSGJPN022, inet_ntoa(SocksSockAddrIPv4.sin_addr), ntohs(SocksSockAddrIPv4.sin_port));
 		// connectで接続する先はSOCKSサーバ
-		memcpy(&saSockAddr, &SocksSockAddr, sizeof(SocksSockAddr));
+		// IPv6対応
+//		memcpy(&saSockAddr, &SocksSockAddr, sizeof(SocksSockAddr));
+		memcpy(&saSockAddr, &SocksSockAddrIPv4, sizeof(SocksSockAddrIPv4));
 	}
 	else
 	{
 		// connectで接続するのは接続先のホスト
-		memcpy(&saSockAddr, &CurSockAddr, sizeof(CurSockAddr));
+		// IPv6対応
+//		memcpy(&saSockAddr, &CurSockAddr, sizeof(CurSockAddr));
+		memcpy(&saSockAddr, &CurSockAddrIPv4, sizeof(CurSockAddrIPv4));
 	}
 
 	/////////////
@@ -1963,6 +2032,155 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 }
 
 
+SOCKET connectsockIPv6(char *host, int port, char *PreMsg, int *CancelCheckWork)
+{
+	struct sockaddr_in6 saSockAddr;
+	char HostEntry[MAXGETHOSTSTRUCT];
+	struct hostent *pHostEntry;
+	SOCKET sSocket;
+	int Len;
+	int Fwall;
+	SOCKS5REQUEST Socks5Cmd;
+	SOCKS5REPLY Socks5Reply;
+
+	//////////////////////////////
+	// ホスト名解決と接続の準備
+	//////////////////////////////
+
+	Fwall = FWALL_NONE;
+	if(AskHostFireWall() == YES)
+		Fwall = FwallType;
+
+	sSocket = INVALID_SOCKET;
+
+	UseIPadrs = YES;
+	strcpy(DomainName, host);
+	memset(&CurSockAddrIPv6, 0, sizeof(CurSockAddrIPv6));
+	CurSockAddrIPv6.sin6_port = htons((u_short)port);
+	CurSockAddrIPv6.sin6_family = AF_INET6;
+	CurSockAddrIPv6.sin6_addr = inet6_addr(host);
+	if(memcmp(&CurSockAddrIPv6.sin6_addr, &IN6ADDR_NONE, sizeof(struct in6_addr)) == 0)
+	{
+		// ホスト名が指定された
+		// ホスト名からアドレスを求める
+		if(((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER)) &&
+		   (FwallResolv == YES))
+		{
+			// ホスト名解決はSOCKSサーバに任せる
+			pHostEntry = NULL;
+		}
+		else
+		{
+			// アドレスを取得
+			SetTaskMsg(MSGJPN016, DomainName);
+			pHostEntry = do_gethostbynameIPv6(host, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork);
+		}
+
+		if(pHostEntry != NULL)
+		{
+			memcpy((char *)&CurSockAddrIPv6.sin6_addr, pHostEntry->h_addr, pHostEntry->h_length);
+			SetTaskMsg(MSGJPN017, PreMsg, DomainName, inet6_ntoa(CurSockAddrIPv6.sin6_addr), ntohs(CurSockAddrIPv6.sin6_port));
+		}
+		else
+		{
+			if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
+			{
+				UseIPadrs = NO;
+				SetTaskMsg(MSGJPN018, PreMsg, DomainName, ntohs(CurSockAddrIPv6.sin6_port));
+			}
+			else
+			{
+				SetTaskMsg(MSGJPN019, host);
+				return(INVALID_SOCKET);
+			}
+		}
+	}
+	else
+		SetTaskMsg(MSGJPN020, PreMsg, inet6_ntoa(CurSockAddrIPv6.sin6_addr), ntohs(CurSockAddrIPv6.sin6_port));
+
+	if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
+	{
+		// SOCKSを使う
+		// SOCKSに接続する準備
+		{
+			Len = Socks5MakeCmdPacketIPv6(&Socks5Cmd, SOCKS5_CMD_CONNECT, UseIPadrs, (char*)&CurSockAddrIPv6.sin6_addr, DomainName, CurSockAddrIPv6.sin6_port);
+		}
+
+		memset(&SocksSockAddrIPv6, 0, sizeof(SocksSockAddrIPv6));
+		SocksSockAddrIPv6.sin6_addr = inet6_addr(FwallHost);
+		if(memcmp(&SocksSockAddrIPv6.sin6_addr, &IN6ADDR_NONE, sizeof(struct in6_addr)) == 0)
+		{
+			if((pHostEntry = do_gethostbynameIPv6(FwallHost, HostEntry, MAXGETHOSTSTRUCT, CancelCheckWork)) != NULL)
+				memcpy((char *)&SocksSockAddrIPv6.sin6_addr, pHostEntry->h_addr, pHostEntry->h_length);
+			else
+			{
+				SetTaskMsg(MSGJPN021, FwallHost);
+				return INVALID_SOCKET;
+			}
+		}
+		SocksSockAddrIPv6.sin6_port = htons((u_short)FwallPort);
+		SocksSockAddrIPv6.sin6_family = AF_INET6;
+		SetTaskMsg(MSGJPN022, inet6_ntoa(SocksSockAddrIPv6.sin6_addr), ntohs(SocksSockAddrIPv6.sin6_port));
+		// connectで接続する先はSOCKSサーバ
+		memcpy(&saSockAddr, &SocksSockAddrIPv6, sizeof(SocksSockAddrIPv6));
+	}
+	else
+	{
+		// connectで接続するのは接続先のホスト
+		memcpy(&saSockAddr, &CurSockAddrIPv6, sizeof(CurSockAddrIPv6));
+	}
+
+	/////////////
+	// 接続実行
+	/////////////
+
+	inet6_ntoa(saSockAddr.sin6_addr);
+	if((sSocket = do_socket(AF_INET6, SOCK_STREAM, TCP_PORT)) != INVALID_SOCKET)
+	{
+		if(do_connect(sSocket, (struct sockaddr *)&saSockAddr, sizeof(saSockAddr), CancelCheckWork) != SOCKET_ERROR)
+		{
+			if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
+			{
+				if(Socks5SelMethod(sSocket, CancelCheckWork) == FFFTP_FAIL)
+				{
+					DoClose(sSocket);
+					sSocket = INVALID_SOCKET;
+				}
+
+				Socks5Reply.Result = -1;
+				// 同時接続対応
+//				if((SocksSendCmd(sSocket, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+//				   (Socks5GetCmdReply(sSocket, &Socks5Reply) != FFFTP_SUCCESS) || 
+//				   (Socks5Reply.Result != SOCKS5_RES_OK))
+				if((SocksSendCmd(sSocket, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+				   (Socks5GetCmdReply(sSocket, &Socks5Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
+				   (Socks5Reply.Result != SOCKS5_RES_OK))
+				{
+					SetTaskMsg(MSGJPN024, Socks5Reply.Result);
+					DoClose(sSocket);
+					sSocket = INVALID_SOCKET;
+				}
+
+			}
+
+			if(sSocket != INVALID_SOCKET)
+				SetTaskMsg(MSGJPN025);
+		}
+		else
+		{
+//#pragma aaa
+			SetTaskMsg(MSGJPN026/*"接続できません(2) %x", sSocket*/);
+			DoClose(sSocket);
+			sSocket = INVALID_SOCKET;
+		}
+	}
+	else
+		SetTaskMsg(MSGJPN027);
+
+	return(sSocket);
+}
+
+
 /*----- リッスンソケットを取得 ------------------------------------------------
 *
 *	Parameter
@@ -1972,8 +2190,30 @@ SOCKET connectsock(char *host, int port, char *PreMsg, int *CancelCheckWork)
 *		SOCKET リッスンソケット
 *----------------------------------------------------------------------------*/
 
+// IPv6対応
 SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 {
+	SOCKET Result;
+	Result = INVALID_SOCKET;
+	switch(CurHost.InetFamily)
+	{
+	case AF_UNSPEC:
+		break;
+	case AF_INET:
+		Result = GetFTPListenSocketIPv4(ctrl_skt, CancelCheckWork);
+		break;
+	case AF_INET6:
+		Result = GetFTPListenSocketIPv6(ctrl_skt, CancelCheckWork);
+		break;
+	}
+	return Result;
+}
+
+
+// IPv6対応
+//SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
+SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
+{
     SOCKET listen_skt;
     int iLength;
     char *a,*p;
@@ -1997,12 +2237,17 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 		{
 			/*===== SOCKS4を使う =====*/
 			DoPrintf("Use SOCKS4 BIND");
-			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddr, sizeof(SocksSockAddr), CancelCheckWork) != SOCKET_ERROR)
+			// IPv6対応
+//			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddr, sizeof(SocksSockAddr), CancelCheckWork) != SOCKET_ERROR)
+			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddrIPv4, sizeof(SocksSockAddrIPv4), CancelCheckWork) != SOCKET_ERROR)
 			{
 				Socks4Cmd.Ver = SOCKS4_VER;
 				Socks4Cmd.Cmd = SOCKS4_CMD_BIND;
-				Socks4Cmd.Port = CurSockAddr.sin_port;
-				Socks4Cmd.AdrsInt = CurSockAddr.sin_addr.s_addr;
+				// IPv6対応
+//				Socks4Cmd.Port = CurSockAddr.sin_port;
+//				Socks4Cmd.AdrsInt = CurSockAddr.sin_addr.s_addr;
+				Socks4Cmd.Port = CurSockAddrIPv4.sin_port;
+				Socks4Cmd.AdrsInt = CurSockAddrIPv4.sin_addr.s_addr;
 				strcpy(Socks4Cmd.UserID, FwallUser);
 				Len = offsetof(SOCKS4CMD, UserID) + strlen(FwallUser) + 1;
 
@@ -2021,7 +2266,9 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 				}
 
 				if(Socks4Reply.AdrsInt == 0)
-					Socks4Reply.AdrsInt = SocksSockAddr.sin_addr.s_addr;
+					// IPv6対応
+//					Socks4Reply.AdrsInt = SocksSockAddr.sin_addr.s_addr;
+					Socks4Reply.AdrsInt = SocksSockAddrIPv4.sin_addr.s_addr;
 
 				a = (char *)&Socks4Reply.AdrsInt;
 				p = (char *)&Socks4Reply.Port;
@@ -2031,7 +2278,9 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 		{
 			/*===== SOCKS5を使う =====*/
 			DoPrintf("Use SOCKS5 BIND");
-			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddr, sizeof(SocksSockAddr), CancelCheckWork) != SOCKET_ERROR)
+			// IPv6対応
+//			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddr, sizeof(SocksSockAddr), CancelCheckWork) != SOCKET_ERROR)
+			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddrIPv4, sizeof(SocksSockAddrIPv4), CancelCheckWork) != SOCKET_ERROR)
 			{
 				if(Socks5SelMethod(listen_skt, CancelCheckWork) == FFFTP_FAIL)
 				{
@@ -2040,7 +2289,9 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 					return(listen_skt);
 				}
 
-				Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_BIND, UseIPadrs, CurSockAddr.sin_addr.s_addr, DomainName, CurSockAddr.sin_port);
+				// IPv6対応
+//				Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_BIND, UseIPadrs, CurSockAddr.sin_addr.s_addr, DomainName, CurSockAddr.sin_port);
+				Len = Socks5MakeCmdPacket(&Socks5Cmd, SOCKS5_CMD_BIND, UseIPadrs, CurSockAddrIPv4.sin_addr.s_addr, DomainName, CurSockAddrIPv4.sin_port);
 
 				Socks5Reply.Result = -1;
 				// 同時接続対応
@@ -2056,11 +2307,15 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 					listen_skt = INVALID_SOCKET;
 				}
 
-				if(Socks5Reply.AdrsInt == 0)
-					Socks5Reply.AdrsInt = SocksSockAddr.sin_addr.s_addr;
+				// IPv6対応
+//				if(Socks5Reply.AdrsInt == 0)
+//					Socks5Reply.AdrsInt = SocksSockAddr.sin_addr.s_addr;
 
-				a = (char *)&Socks5Reply.AdrsInt;
-				p = (char *)&Socks5Reply.Port;
+				// IPv6対応
+//				a = (char *)&Socks5Reply.AdrsInt;
+//				p = (char *)&Socks5Reply.Port;
+				a = (char *)&Socks5Reply._dummy[0];
+				p = (char *)&Socks5Reply._dummy[4];
 			}
 		}
 		else
@@ -2136,6 +2391,140 @@ SOCKET GetFTPListenSocket(SOCKET ctrl_skt, int *CancelCheckWork)
 }
 
 
+SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
+{
+    SOCKET listen_skt;
+    int iLength;
+    char *a,*p;
+	struct sockaddr_in6 saCtrlAddr;
+	struct sockaddr_in6 saTmpAddr;
+	SOCKS5REQUEST Socks5Cmd;
+	SOCKS5REPLY Socks5Reply;
+
+	int Len;
+	int Fwall;
+
+	char Adrs[40];
+
+	Fwall = FWALL_NONE;
+	if(AskHostFireWall() == YES)
+		Fwall = FwallType;
+
+	if((listen_skt = do_socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP)) != INVALID_SOCKET)
+	{
+		if((Fwall == FWALL_SOCKS5_NOAUTH) || (Fwall == FWALL_SOCKS5_USER))
+		{
+			/*===== SOCKS5を使う =====*/
+			DoPrintf("Use SOCKS5 BIND");
+			if(do_connect(listen_skt, (struct sockaddr *)&SocksSockAddrIPv6, sizeof(SocksSockAddrIPv6), CancelCheckWork) != SOCKET_ERROR)
+			{
+				if(Socks5SelMethod(listen_skt, CancelCheckWork) == FFFTP_FAIL)
+				{
+					DoClose(listen_skt);
+					listen_skt = INVALID_SOCKET;
+					return(listen_skt);
+				}
+
+				Len = Socks5MakeCmdPacketIPv6(&Socks5Cmd, SOCKS5_CMD_BIND, UseIPadrs, (char*)&CurSockAddrIPv6.sin6_addr, DomainName, CurSockAddrIPv6.sin6_port);
+
+				Socks5Reply.Result = -1;
+				// 同時接続対応
+//				if((SocksSendCmd(listen_skt, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+//				   (Socks5GetCmdReply(listen_skt, &Socks5Reply) != FFFTP_SUCCESS) || 
+//				   (Socks5Reply.Result != SOCKS5_RES_OK))
+				if((SocksSendCmd(listen_skt, &Socks5Cmd, Len, CancelCheckWork) != FFFTP_SUCCESS) ||
+				   (Socks5GetCmdReply(listen_skt, &Socks5Reply, CancelCheckWork) != FFFTP_SUCCESS) || 
+				   (Socks5Reply.Result != SOCKS5_RES_OK))
+				{
+					SetTaskMsg(MSGJPN029, Socks5Reply.Result);
+					DoClose(listen_skt);
+					listen_skt = INVALID_SOCKET;
+				}
+
+				// IPv6対応
+//				if(Socks5Reply.AdrsInt == 0)
+//					Socks5Reply.AdrsInt = SocksSockAddr.sin_addr.s_addr;
+
+				// IPv6対応
+//				a = (char *)&Socks5Reply.AdrsInt;
+//				p = (char *)&Socks5Reply.Port;
+				a = (char *)&Socks5Reply._dummy[0];
+				p = (char *)&Socks5Reply._dummy[16];
+			}
+		}
+		else
+		{
+			/*===== SOCKSを使わない =====*/
+			DoPrintf("Use normal BIND");
+			saCtrlAddr.sin6_port = htons(0);
+			saCtrlAddr.sin6_family = AF_INET6;
+			memset(&saCtrlAddr.sin6_addr, 0, 16);
+
+			if(bind(listen_skt, (struct sockaddr *)&saCtrlAddr, sizeof(struct sockaddr_in6)) != SOCKET_ERROR)
+			{
+				iLength = sizeof(saCtrlAddr);
+				if(getsockname(listen_skt, (struct sockaddr *)&saCtrlAddr, &iLength) != SOCKET_ERROR)
+				{
+					if(do_listen(listen_skt, 1) == 0)
+					{
+						iLength = sizeof(saTmpAddr);
+						if(getsockname(ctrl_skt, (struct sockaddr *)&saTmpAddr, &iLength) == SOCKET_ERROR)
+							ReportWSError("getsockname", WSAGetLastError());
+
+						a = (char *)&saTmpAddr.sin6_addr;
+						p = (char *)&saCtrlAddr.sin6_port;
+					}
+					else
+					{
+						ReportWSError("listen", WSAGetLastError());
+						do_closesocket(listen_skt);
+						listen_skt = INVALID_SOCKET;
+					}
+				}
+				else
+				{
+					ReportWSError("getsockname", WSAGetLastError());
+					do_closesocket(listen_skt);
+					listen_skt = INVALID_SOCKET;
+				}
+			}
+			else
+			{
+				ReportWSError("bind", WSAGetLastError());
+				do_closesocket(listen_skt);
+				listen_skt = INVALID_SOCKET;
+			}
+
+			if(listen_skt == INVALID_SOCKET)
+				SetTaskMsg(MSGJPN030);
+		}
+	}
+	else
+		ReportWSError("socket create", WSAGetLastError());
+
+	if(listen_skt != INVALID_SOCKET)
+	{
+#define  US(w)  (((int)w)&0xffff)
+		// 同時接続対応
+//		if((command(ctrl_skt,NULL, &CancelFlg, "PORT %d,%d,%d,%d,%d,%d",
+//				UC(a[0]), UC(a[1]), UC(a[2]), UC(a[3]),
+//				UC(p[0]), UC(p[1])) / 100) != FTP_COMPLETE)
+		if((command(ctrl_skt,NULL, CancelCheckWork, "EPRT |2|%s|%d|",
+				AddressToStringIPv6(Adrs, a),
+				US(p[0])) / 100) != FTP_COMPLETE)
+		{
+			SetTaskMsg(MSGJPN031);
+			do_closesocket(listen_skt);
+			listen_skt = INVALID_SOCKET;
+		}
+//		else
+//			DoPrintf("Skt=%u : listener %s port %u",listen_skt,inet_ntoa(saCtrlAddr.sin_addr),ntohs(saCtrlAddr.sin_port));
+	}
+
+	return(listen_skt);
+}
+
+
 /*----- ホストへ接続処理中かどうかを返す---------------------------------------
 *
 *	Parameter
@@ -2229,6 +2618,44 @@ static int Socks5MakeCmdPacket(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, ulo
 }
 
 
+// IPv6対応
+static int Socks5MakeCmdPacketIPv6(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, char *IP, char *Host, ushort Port)
+{
+	uchar *Pos;
+	int Len;
+	int TotalLen;
+
+	Pos = (uchar *)Packet;
+	Pos += SOCKS5REQUEST_SIZE;
+	TotalLen = SOCKS5REQUEST_SIZE + 2;	/* +2はポートの分 */
+
+	Packet->Ver = SOCKS5_VER;
+	Packet->Cmd = Cmd;
+	Packet->Rsv = 0;
+	if(ValidIP == YES)
+	{
+		/* IPアドレスを指定 */
+		Packet->Type = SOCKS5_ADRS_IPV6;
+		memcpy(Pos, IP, 16);
+		Pos += 16;
+		TotalLen += 16;
+	}
+	else
+	{
+		/* ホスト名を指定 */
+		Packet->Type = SOCKS5_ADRS_NAME;
+		Len = strlen(Host);
+		*Pos++ = Len;
+		strcpy(Pos, Host);
+		Pos += Len;
+		TotalLen += Len + 1;
+	}
+	*((ushort *)Pos) = Port;
+
+	return(TotalLen);
+}
+
+
 /*----- SOCKSのコマンドを送る -------------------------------------------------
 *
 *	Parameter
@@ -2281,7 +2708,7 @@ static int Socks5GetCmdReply(SOCKET Socket, SOCKS5REPLY *Packet, int *CancelChec
 		if(Packet->Type == SOCKS5_ADRS_IPV4)
 			Len = 4 + 2;
 		else if(Packet->Type == SOCKS5_ADRS_IPV6)
-			Len = 6 + 2;
+			Len = 16 + 2;
 		else
 		{
 			// 同時接続対応
@@ -2496,6 +2923,11 @@ int AskUseMLSD(void)
 }
 
 // IPv6対応
+int AskInetFamily(void)
+{
+	return(CurHost.InetFamily);
+}
+
 int AskUseIPv6(void)
 {
 	return(CurHost.UseIPv6);

--- a/doc/eng/FFFTP.txt
+++ b/doc/eng/FFFTP.txt
@@ -34,6 +34,19 @@ Changes in Ver.1.99
 -- MLSD command became used for retrieving filenames on appropriate hosts.
    That is helpful for hosts that do not return filenames properly.
 
+-- Enhanced communication routines to reduce waiting time.
+
+-- Changed to display responses from hosts after decoding as Kanji code of
+   filenames.
+
+-- Fixed bugs of arbitrary code execution in saving registry settings to a
+   file.
+
+-- Fixed bugs of launching wrong files if correct ones contain no extensions.
+
+-- Internet Protocol Version 6 became available.
+   IPv6 will be used when name resolution for IPv4 is unavailable.
+
 
 Outline
 -------

--- a/doc/eng/history.txt
+++ b/doc/eng/history.txt
@@ -6,6 +6,19 @@ Changes in Ver.1.99
 -- MLSD command became used for retrieving filenames on appropriate hosts.
    That is helpful for hosts that do not return filenames properly.
 
+-- Enhanced communication routines to reduce waiting time.
+
+-- Changed to display responses from hosts after decoding as Kanji code of
+   filenames.
+
+-- Fixed bugs of arbitrary code execution in saving registry settings to a
+   file.
+
+-- Fixed bugs of launching wrong files if correct ones contain no extensions.
+
+-- Internet Protocol Version 6 became available.
+   IPv6 will be used when name resolution for IPv4 is unavailable.
+
 Changes in Ver.1.98c
 --------------------
 

--- a/doc/jpn/FFFTP.txt
+++ b/doc/jpn/FFFTP.txt
@@ -34,6 +34,21 @@ Ver 1.99
 　取得するようにしました。LISTコマンドの応答に特定のファイルが
 　含まれない一部のホストでも正しく列挙できる可能性が高くなります。
 
+・通信のルーチンを待ち時間が減るように改善しました。
+
+・ホストの応答をホストのファイル名の漢字コードでデコードしてからログに
+　表示するように変更しました。
+
+・レジストリの設定をファイルに保存するときに任意のコードが実行される
+　可能性があるバグを修正しました。
+
+・拡張子が無いファイルをダブルクリックした場合に選択されたものと異なる
+　ファイルが表示されるバグを修正しました。
+
+・ホストとの接続にInternet Protocol Version 6（略称IPv6）が使用できる
+　ようになりました。従来のIPv4で名前解決ができない場合にIPv6で接続を
+　試みるようにしました。
+
 
 Ver 1.96d以前へ戻す場合
 -----------------------

--- a/doc/jpn/history.txt
+++ b/doc/jpn/history.txt
@@ -6,6 +6,21 @@ FFFTP
 　取得するようにしました。LISTコマンドの応答に特定のファイルが
 　含まれない一部のホストでも正しく列挙できる可能性が高くなります。
 
+・通信のルーチンを待ち時間が減るように改善しました。
+
+・ホストの応答をホストのファイル名の漢字コードでデコードしてからログに
+　表示するように変更しました。
+
+・レジストリの設定をファイルに保存するときに任意のコードが実行される
+　可能性があるバグを修正しました。
+
+・拡張子が無いファイルをダブルクリックした場合に選択されたものと異なる
+　ファイルが表示されるバグを修正しました。
+
+・ホストとの接続にInternet Protocol Version 6（略称IPv6）が使用できる
+　ようになりました。従来のIPv4で名前解決ができない場合にIPv6で接続を
+　試みるようにしました。
+
 ■Ver 1.98c
 
 ・日本語ドメイン名のホストへの接続時にアドレスをPunycodeへ変換してから

--- a/getput.c
+++ b/getput.c
@@ -43,7 +43,7 @@
 #include <time.h>
 // IPv6対応
 //#include <winsock.h>
-#include <winsock2.h>
+#include <ws2tcpip.h>
 #include <windowsx.h>
 #include <commctrl.h>
 #include <process.h>
@@ -104,7 +104,11 @@ static int SetUploadResume(TRANSPACKET *Pkt, int ProcMode, LONGLONG Size, int *M
 static LRESULT CALLBACK TransDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
 static void DispTransferStatus(HWND hWnd, int End, TRANSPACKET *Pkt);
 static void DispTransFileInfo(TRANSPACKET *Pkt, char *Title, int SkipButton, int Info);
-static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max);
+// IPv6対応
+//static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max);
+static int GetAdrsAndPort(SOCKET Skt, char *Str, char *Adrs, int *Port, int Max);
+static int GetAdrsAndPortIPv4(SOCKET Skt, char *Str, char *Adrs, int *Port, int Max);
+static int GetAdrsAndPortIPv6(SOCKET Skt, char *Str, char *Adrs, int *Port, int Max);
 static int IsSpecialDevice(char *Fname);
 static int MirrorDelNotify(int Cur, int Notify, TRANSPACKET *Pkt);
 static BOOL CALLBACK MirrorDeleteDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam);
@@ -1316,7 +1320,10 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 	SOCKET listen_socket = INVALID_SOCKET; // data listen socket
 	char Buf[1024];
 	int CreateMode;
-	struct sockaddr_in saSockAddr1;
+	// IPv6対応
+//	struct sockaddr_in saSockAddr1;
+	struct sockaddr_in saSockAddrIPv4;
+	struct sockaddr_in6 saSockAddrIPv6;
 	char Reply[ERR_MSG_LEN+7];
 
 	if((listen_socket = GetFTPListenSocket(Pkt->ctrl_skt, CancelCheckWork)) != INVALID_SOCKET)
@@ -1331,8 +1338,20 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 //				if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)
 				if(SocksGet2ndBindReply(listen_socket, &data_socket, CancelCheckWork) == FFFTP_FAIL)
 				{
-					iLength = sizeof(saSockAddr1);
-					data_socket = do_accept(listen_socket, (struct sockaddr *)&saSockAddr1, (int *)&iLength);
+					// IPv6対応
+//					iLength = sizeof(saSockAddr1);
+//					data_socket = do_accept(listen_socket, (struct sockaddr *)&saSockAddr1, (int *)&iLength);
+					switch(AskInetFamily())
+					{
+					case AF_INET:
+						iLength=sizeof(saSockAddrIPv4);
+						data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddrIPv4, (int *)&iLength);
+						break;
+					case AF_INET6:
+						iLength=sizeof(saSockAddrIPv6);
+						data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddrIPv6, (int *)&iLength);
+						break;
+					}
 
 					if(shutdown(listen_socket, 1) != 0)
 						ReportWSError("shutdown listen", WSAGetLastError());
@@ -1345,7 +1364,19 @@ static int DownLoadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 						iRetCode = 500;
 					}
 					else
-						DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet_ntoa(saSockAddr1.sin_addr), ntohs(saSockAddr1.sin_port));
+						// IPv6対応
+//						DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet_ntoa(saSockAddr1.sin_addr), ntohs(saSockAddr1.sin_port));
+					{
+						switch(AskInetFamily())
+						{
+						case AF_INET:
+							DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet_ntoa(saSockAddrIPv4.sin_addr), ntohs(saSockAddrIPv4.sin_port));
+							break;
+						case AF_INET6:
+							DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet6_ntoa(saSockAddrIPv6.sin6_addr), ntohs(saSockAddrIPv6.sin6_port));
+							break;
+						}
+					}
 				}
 
 				if(data_socket != INVALID_SOCKET)
@@ -1403,15 +1434,29 @@ static int DownLoadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
 	char Buf[1024];
 	int CreateMode;
-	char Adrs[20];
+	// IPv6対応
+//	char Adrs[20];
+	char Adrs[40];
 	int Port;
 	int Flg;
 	char Reply[ERR_MSG_LEN+7];
 
-	iRetCode = command(Pkt->ctrl_skt, Buf, CancelCheckWork, "PASV");
+	// IPv6対応
+//	iRetCode = command(Pkt->ctrl_skt, Buf, CancelCheckWork, "PASV");
+	switch(AskInetFamily())
+	{
+	case AF_INET:
+		iRetCode = command(Pkt->ctrl_skt, Buf, CancelCheckWork, "PASV");
+		break;
+	case AF_INET6:
+		iRetCode = command(Pkt->ctrl_skt, Buf, CancelCheckWork, "EPSV");
+		break;
+	}
 	if(iRetCode/100 == FTP_COMPLETE)
 	{
-		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)
+		// IPv6対応
+//		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)
+		if(GetAdrsAndPort(Pkt->ctrl_skt, Buf, Adrs, &Port, 39) == FFFTP_SUCCESS)
 		{
 			if((data_socket = connectsock(Adrs, Port, MSGJPN091, CancelCheckWork)) != INVALID_SOCKET)
 			{
@@ -2475,7 +2520,10 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
 	SOCKET listen_socket = INVALID_SOCKET; // data listen socket
 	char Buf[1024];
-	struct sockaddr_in saSockAddr1;
+	// IPv6対応
+//	struct sockaddr_in saSockAddr1;
+	struct sockaddr_in saSockAddrIPv4;
+	struct sockaddr_in6 saSockAddrIPv6;
 	int Resume;
 	char Reply[ERR_MSG_LEN+7];
 
@@ -2498,8 +2546,20 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 //			if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)
 			if(SocksGet2ndBindReply(listen_socket, &data_socket, &Canceled[Pkt->ThreadCount]) == FFFTP_FAIL)
 			{
-				iLength=sizeof(saSockAddr1);
-				data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddr1, (int *)&iLength);
+				// IPv6対応
+//				iLength=sizeof(saSockAddr1);
+//				data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddr1, (int *)&iLength);
+				switch(AskInetFamily())
+				{
+				case AF_INET:
+					iLength=sizeof(saSockAddrIPv4);
+					data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddrIPv4, (int *)&iLength);
+					break;
+				case AF_INET6:
+					iLength=sizeof(saSockAddrIPv6);
+					data_socket = do_accept(listen_socket,(struct sockaddr *)&saSockAddrIPv6, (int *)&iLength);
+					break;
+				}
 
 				if(shutdown(listen_socket, 1) != 0)
 					ReportWSError("shutdown listen", WSAGetLastError());
@@ -2512,7 +2572,19 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 					iRetCode = 500;
 				}
 				else
-					DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet_ntoa(saSockAddr1.sin_addr), ntohs(saSockAddr1.sin_port));
+					// IPv6対応
+//					DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet_ntoa(saSockAddr1.sin_addr), ntohs(saSockAddr1.sin_port));
+				{
+					switch(AskInetFamily())
+					{
+					case AF_INET:
+						DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet_ntoa(saSockAddrIPv4.sin_addr), ntohs(saSockAddrIPv4.sin_port));
+						break;
+					case AF_INET6:
+						DoPrintf("Skt=%u : accept from %s port %u", data_socket, inet6_ntoa(saSockAddrIPv6.sin6_addr), ntohs(saSockAddrIPv6.sin6_port));
+						break;
+					}
+				}
 			}
 
 			if(data_socket != INVALID_SOCKET)
@@ -2566,7 +2638,9 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 	int iRetCode;
 	SOCKET data_socket = INVALID_SOCKET;   // data channel socket
 	char Buf[1024];
-	char Adrs[20];
+	// IPv6対応
+//	char Adrs[20];
+	char Adrs[40];
 	int Port;
 	int Flg;
 	int Resume;
@@ -2574,10 +2648,22 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 
 	// 同時接続対応
 //	iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled, "PASV");
-	iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled[Pkt->ThreadCount], "PASV");
+	// IPv6対応
+//	iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled[Pkt->ThreadCount], "PASV");
+	switch(AskInetFamily())
+	{
+	case AF_INET:
+		iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled[Pkt->ThreadCount], "PASV");
+		break;
+	case AF_INET6:
+		iRetCode = command(Pkt->ctrl_skt, Buf, &Canceled[Pkt->ThreadCount], "EPSV");
+		break;
+	}
 	if(iRetCode/100 == FTP_COMPLETE)
 	{
-		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)
+		// IPv6対応
+//		if(GetAdrsAndPort(Buf, Adrs, &Port, 19) == FFFTP_SUCCESS)
+		if(GetAdrsAndPort(Pkt->ctrl_skt, Buf, Adrs, &Port, 39) == FFFTP_SUCCESS)
 		{
 			// 同時接続対応
 //			if((data_socket = connectsock(Adrs, Port, MSGJPN109, &Canceled)) != INVALID_SOCKET)
@@ -3675,7 +3761,26 @@ static void DispTransFileInfo(TRANSPACKET *Pkt, char *Title, int SkipButton, int
 *			FFFTP_SUCCESS/FFFTP_FAIL
 *----------------------------------------------------------------------------*/
 
-static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
+static int GetAdrsAndPort(SOCKET Skt, char *Str, char *Adrs, int *Port, int Max)
+{
+	int Result;
+	Result = FFFTP_FAIL;
+	switch(AskInetFamily())
+	{
+	case AF_INET:
+		Result = GetAdrsAndPortIPv4(Skt, Str, Adrs, Port, Max);
+		break;
+	case AF_INET6:
+		Result = GetAdrsAndPortIPv6(Skt, Str, Adrs, Port, Max);
+		break;
+	}
+	return Result;
+}
+
+
+// IPv6対応
+//static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
+static int GetAdrsAndPortIPv4(SOCKET Skt, char *Str, char *Adrs, int *Port, int Max)
 {
 	char *Pos;
 	char *Btm;
@@ -3742,49 +3847,55 @@ static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
 
 
 // IPv6対応
-static int GetAdrsAndPortIPv6(char *Str, char *Adrs, int *Port, int Max, short *Family)
+static int GetAdrsAndPortIPv6(SOCKET Skt, char *Str, char *Adrs, int *Port, int Max)
 {
 	char *Pos;
 	char *Btm;
 	int Sts;
+	int i;
+	struct sockaddr_in6 SockAddr;
 
 	Sts = FFFTP_FAIL;
 
-	Pos = strchr(Str, '|');
-	if(Pos != NULL)
+	Btm = strchr(Str, '(');
+	if(Btm != NULL)
 	{
-		Pos++;
-		Btm = strchr(Pos, '|');
+		Btm++;
+		Btm = strchr(Btm, '|');
 		if(Btm != NULL)
 		{
-			switch(atoi(Pos))
-			{
-			case 1:
-				*Family = AF_INET;
-				break;
-			case 2:
-				*Family = AF_INET6;
-				break;
-			}
 			Pos = Btm + 1;
 			Btm = strchr(Pos, '|');
 			if(Btm != NULL)
 			{
-				if((Btm - Pos) <= Max)
+				Pos = Btm + 1;
+				Btm = strchr(Pos, '|');
+				if(Btm != NULL)
 				{
-					if((Btm - Pos) > 0)
+					if((Btm - Pos) <= Max)
 					{
-						strncpy(Adrs, Pos, Btm - Pos);
-						*(Adrs + (Btm - Pos)) = NUL;
-					}
+						if((Btm - Pos) > 0)
+						{
+							strncpy(Adrs, Pos, Btm - Pos);
+							*(Adrs + (Btm - Pos)) = NUL;
+						}
+						else
+						{
+							i = sizeof(SockAddr);
+							if(getpeername(Skt, (struct sockaddr*)&SockAddr, &i) != SOCKET_ERROR)
+								AddressToStringIPv6(Adrs, &SockAddr.sin6_addr);
+						}
 
-					Pos = Btm + 1;
-					Btm = strchr(Pos, '|');
-					if(Btm != NULL)
-					{
-						Btm++;
-						*Port = atoi(Pos);
-						Sts = FFFTP_SUCCESS;
+						Pos = Btm + 1;
+						Btm = strchr(Pos, '|');
+						if(Btm != NULL)
+						{
+							Btm++;
+							*Port = atoi(Pos);
+							Btm = strchr(Btm, ')');
+							if(Btm != NULL)
+								Sts = FFFTP_SUCCESS;
+						}
 					}
 				}
 			}

--- a/hostman.c
+++ b/hostman.c
@@ -1328,6 +1328,7 @@ void CopyDefaultHost(HOSTDATA *Set)
 	Set->Feature = 0;
 	Set->UseMLSD = YES;
 	// IPv6対応
+	Set->InetFamily = AF_UNSPEC;
 	Set->UseIPv6 = YES;
 	return;
 }

--- a/local.c
+++ b/local.c
@@ -182,7 +182,8 @@ void DispFileProperty(char *Fname)
 {
 	SHELLEXECUTEINFO sInfo;
 	// 異なるファイルが表示されるバグ修正
-	// 詳細は不明だが末尾に半角スペースを置くと拡張子の補完がされなくなる
+	// UNCでない場合に末尾に半角スペースを置くと拡張子の補完がされなくなる
+	// 現在UNC対応の予定は無い
 	char Fname2[FMAX_PATH+1];
 
 	memset(&sInfo, NUL, sizeof(SHELLEXECUTEINFO));

--- a/registry.c
+++ b/registry.c
@@ -2351,7 +2351,6 @@ static int ReadStringFromReg(void *Handle, char *Name, char *Str, DWORD Size)
 				Sts = FFFTP_SUCCESS;
 				if(!CheckStringM(Str))
 					break;
-				Str = Str;
 				// UTF-8ではない可能性がある
 				// Shift_JISとみなす
 			case KANJI_SJIS:

--- a/socket.c
+++ b/socket.c
@@ -651,7 +651,53 @@ static int UnRegistAsyncTableDbase(HANDLE Async)
 
 
 
-struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork)
+// IPv6対応
+//struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork)
+struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *CancelCheckWork)
+{
+#if USE_THIS
+	struct hostent *Ret;
+	HANDLE hAsync;
+	int Error;
+
+#if DBG_MSG
+	DoPrintf("# Start gethostbyname");
+#endif
+	Ret = NULL;
+	// 同時接続対応
+//	*CancelCheckWork = NO;
+
+	// UTF-8対応
+//	hAsync = WSAAsyncGetHostByName(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
+	hAsync = WSAAsyncGetHostByNameM(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
+	if(hAsync != NULL)
+	{
+		RegistAsyncTableDbase(hAsync);
+		while((*CancelCheckWork == NO) && (AskAsyncDoneDbase(hAsync, &Error) != YES))
+		{
+			Sleep(1);
+			if(BackgrndMessageProc() == YES)
+				*CancelCheckWork = YES;
+		}
+
+		if(*CancelCheckWork == YES)
+		{
+			WSACancelAsyncRequest(hAsync);
+		}
+		else if(Error == 0)
+		{
+			Ret = (struct hostent *)Buf;
+		}
+		UnRegistAsyncTableDbase(hAsync);
+	}
+	return(Ret);
+#else
+	return(gethostbyname(Name));
+#endif
+}
+
+
+struct hostent *do_gethostbynameIPv6(const char *Name, char *Buf, int Len, int *CancelCheckWork)
 {
 #if USE_THIS
 	struct hostent *Ret;
@@ -667,9 +713,7 @@ struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *Canc
 
 	// UTF-8対応
 //	hAsync = WSAAsyncGetHostByName(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
-	// IPv6対応
-//	hAsync = WSAAsyncGetHostByNameM(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
-	hAsync = WSAAsyncGetHostByNameIPv6M(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len, AF_INET);
+	hAsync = WSAAsyncGetHostByNameIPv6M(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len, AF_INET6);
 	if(hAsync != NULL)
 	{
 		RegistAsyncTableDbase(hAsync);
@@ -1319,6 +1363,113 @@ int WSACancelAsyncRequestIPv6(HANDLE hAsyncTaskHandle)
 	return Result;
 }
 
+char* AddressToStringIPv6(char* str, void* in6)
+{
+	char* pResult;
+	unsigned char* p;
+	int MaxZero;
+	int MaxZeroLen;
+	int i;
+	int j;
+	char Tmp[5];
+	pResult = str;
+	p = (unsigned char*)in6;
+	MaxZero = 8;
+	MaxZeroLen = 1;
+	for(i = 0; i < 8; i++)
+	{
+		for(j = i; j < 8; j++)
+		{
+			if(p[j * 2] != 0 || p[j * 2 + 1] != 0)
+				break;
+		}
+		if(j - i > MaxZeroLen)
+		{
+			MaxZero = i;
+			MaxZeroLen = j - i;
+		}
+	}
+	strcpy(str, "");
+	for(i = 0; i < 8; i++)
+	{
+		if(i == MaxZero)
+		{
+			if(i == 0)
+				strcat(str, ":");
+			strcat(str, ":");
+		}
+		else if(i < MaxZero || i >= MaxZero + MaxZeroLen)
+		{
+			sprintf(Tmp, "%x", (((int)p[i * 2] & 0xff) << 8) | ((int)p[i * 2 + 1] & 0xff));
+			strcat(str, Tmp);
+			if(i < 7)
+				strcat(str, ":");
+		}
+	}
+	return pResult;
+}
+
+// IPv6対応のinet_ntoa相当の関数
+// ただしANSI用
+char* inet6_ntoa(struct in6_addr in6)
+{
+	char* pResult;
+	static char Adrs[40];
+	pResult = NULL;
+	memset(Adrs, 0, sizeof(Adrs));
+	pResult = AddressToStringIPv6(Adrs, &in6);
+	return pResult;
+}
+
+// IPv6対応のinet_addr相当の関数
+// ただしANSI用
+struct in6_addr inet6_addr(const char* cp)
+{
+	struct in6_addr Result;
+	int AfterZero;
+	int i;
+	char* p;
+	memset(&Result, 0, sizeof(Result));
+	AfterZero = 0;
+	for(i = 0; i < 8; i++)
+	{
+		if(!cp)
+		{
+			memset(&Result, 0xff, sizeof(Result));
+			break;
+		}
+		if(i >= AfterZero)
+		{
+			if(strncmp(cp, ":", 1) == 0)
+			{
+				cp = cp + 1;
+				if(i == 0 && strncmp(cp, ":", 1) == 0)
+					cp = cp + 1;
+				p = (char*)cp;
+				AfterZero = 7;
+				while(p = strstr(p, ":"))
+				{
+					p = p + 1;
+					AfterZero--;
+				}
+			}
+			else
+			{
+				Result.u.Word[i] = (USHORT)strtol(cp, &p, 16);
+				Result.u.Word[i] = ((Result.u.Word[i] & 0xff00) >> 8) | ((Result.u.Word[i] & 0x00ff) << 8);
+				if(strncmp(p, ":", 1) != 0 && strlen(p) > 0)
+				{
+					memset(&Result, 0xff, sizeof(Result));
+					break;
+				}
+				if(cp = strstr(cp, ":"))
+					cp = cp + 1;
+			}
+		}
+	}
+	return Result;
+}
+
 // UTF-8対応
 
 static BOOL ConvertStringToPunycode(LPSTR Output, DWORD Count, LPCSTR Input)