Commit: 91f406cab5f34e42988386c9078f877783d7e816 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Révision: 91f406cab5f34e42988386c9078f877783d7e816 (tree)
• l'heure: 2013-02-18 01:18:32
• Auteur: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Message de Log

Add support for UPnP port mapping (Windows XP or later only).

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: common.h
• modified: connect.c
• modified: getput.c
• modified: main.c
• modified: option.c
• modified: registry.c
• modified: socket.c
• modified: socketwrapper.c
• modified: socketwrapper.h

Modification

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/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -963,6 +963,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,94,196,10
     CONTROL         "切断時にQUITコマンドを送る(&U)",CONNECT_SENDQUIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,173,10
     CONTROL         "RASの制御を行わない(&R)",CONNECT_NORAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10
+    CONTROL         "非PASVモード時にUPnPを制御する(&U)",CONNECT_UPNP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10
 END
 
 rasnotify_dlg DIALOG  0, 0, 158, 46

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -235,6 +235,7 @@
 #define PERM_A_WRITE                    1018
 #define CONNECT_NORAS                   1018
 #define PERM_A_EXEC                     1019
+#define CONNECT_UPNP                    1019
 #define PERM_TEXT                       1020
 #define PERM_NOW                        1021
 #define SORT_LFILE_FILE                 1022

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -984,6 +984,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,109,173,10
     CONTROL         "Do not control dialup (&RAS) connection",CONNECT_NORAS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,122,173,10
+    CONTROL         "Control &UPnP when using non PASV mode",CONNECT_UPNP,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,136,173,10
 END
 
 rasnotify_dlg DIALOG  0, 0, 158, 46

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -235,6 +235,7 @@
 #define PERM_A_WRITE                    1018
 #define CONNECT_NORAS                   1018
 #define PERM_A_EXEC                     1019
+#define CONNECT_UPNP                    1019
 #define PERM_TEXT                       1020
 #define PERM_NOW                        1021
 #define SORT_LFILE_FILE                 1022

--- a/common.h
+++ b/common.h
@@ -1915,8 +1915,10 @@ void DeleteSocketWin(void);
 // ソケットにデータを付与
 int SetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks);
 int SetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_in6* Socks);
+int SetAsyncTableDataMapPort(SOCKET s, int Port);
 int GetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks);
 int GetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_in6* Socks);
+int GetAsyncTableDataMapPort(SOCKET s, int* Port);
 // 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);
@@ -1930,6 +1932,12 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOut, int *CancelCh
 int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int *CancelCheckWork);
 // 同時接続対応
 void RemoveReceivedData(SOCKET s);
+// UPnP対応
+int LoadUPnP();
+void FreeUPnP();
+int IsUPnPLoaded();
+int AddPortMapping(char* Adrs, int Port);
+int RemovePortMapping(int Port);
 int CheckClosedAndReconnect(void);
 // 同時接続対応
 int CheckClosedAndReconnectTrnSkt(SOCKET *Skt, int *CancelCheckWork);

--- a/connect.c
+++ b/connect.c
@@ -2616,6 +2616,10 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 	int Len;
 	int Fwall;
 
+	// UPnP対応
+	char Adrs[16];
+	int Port;
+
 	// ソケットにデータを付与
 	GetAsyncTableDataIPv4(ctrl_skt, &CurSockAddr, &SocksSockAddr);
 
@@ -2724,6 +2728,12 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 
 						a = (char *)&saTmpAddr.sin_addr;
 						p = (char *)&saCtrlAddr.sin_port;
+						// UPnP対応
+						if(IsUPnPLoaded() == YES)
+						{
+							if(AddPortMapping(AddressToStringIPv4(Adrs, &saTmpAddr.sin_addr), ntohs(saCtrlAddr.sin_port)) == FFFTP_SUCCESS)
+								SetAsyncTableDataMapPort(listen_skt, ntohs(saCtrlAddr.sin_port));
+						}
 					}
 					else
 					{
@@ -2769,6 +2779,12 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 			// IPv6対応
 //			SetTaskMsg(MSGJPN031);
 			SetTaskMsg(MSGJPN031, MSGJPN333);
+			// UPnP対応
+			if(IsUPnPLoaded() == YES)
+			{
+				if(GetAsyncTableDataMapPort(listen_skt, &Port) == YES)
+					RemovePortMapping(Port);
+			}
 			do_closesocket(listen_skt);
 			listen_skt = INVALID_SOCKET;
 		}
@@ -2796,6 +2812,8 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 	int Fwall;
 
 	char Adrs[40];
+	// UPnP対応
+	int Port;
 
 	// ソケットにデータを付与
 	GetAsyncTableDataIPv6(ctrl_skt, &CurSockAddr, &SocksSockAddr);
@@ -2867,6 +2885,12 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 
 						a = (char *)&saTmpAddr.sin6_addr;
 						p = (char *)&saCtrlAddr.sin6_port;
+						// UPnP対応
+						if(IsUPnPLoaded() == YES)
+						{
+							if(AddPortMapping(AddressToStringIPv6(Adrs, &saTmpAddr.sin6_addr), ntohs(saCtrlAddr.sin6_port)) == FFFTP_SUCCESS)
+								SetAsyncTableDataMapPort(listen_skt, ntohs(saCtrlAddr.sin6_port));
+						}
 					}
 					else
 					{
@@ -2908,6 +2932,12 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 				(UC(p[0]) << 8) | UC(p[1])) / 100) != FTP_COMPLETE)
 		{
 			SetTaskMsg(MSGJPN031, MSGJPN334);
+			// UPnP対応
+			if(IsUPnPLoaded() == YES)
+			{
+				if(GetAsyncTableDataMapPort(listen_skt, &Port) == YES)
+					RemovePortMapping(Port);
+			}
 			do_closesocket(listen_skt);
 			listen_skt = INVALID_SOCKET;
 		}

--- a/getput.c
+++ b/getput.c
@@ -1429,6 +1429,8 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 //	struct sockaddr_in saSockAddr1;
 	struct sockaddr_in saSockAddrIPv4;
 	struct sockaddr_in6 saSockAddrIPv6;
+	// UPnP対応
+	int Port;
 	char Reply[ERR_MSG_LEN+7];
 
 	if((listen_socket = GetFTPListenSocket(Pkt->ctrl_skt, CancelCheckWork)) != INVALID_SOCKET)
@@ -1460,6 +1462,12 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 
 					if(shutdown(listen_socket, 1) != 0)
 						ReportWSError("shutdown listen", WSAGetLastError());
+					// UPnP対応
+					if(IsUPnPLoaded() == YES)
+					{
+						if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)
+							RemovePortMapping(Port);
+					}
 					listen_socket = DoClose(listen_socket);
 
 					if(data_socket == INVALID_SOCKET)
@@ -1506,12 +1514,29 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 			{
 				SetErrorMsg(Reply);
 				SetTaskMsg(MSGJPN090);
+				// UPnP対応
+				if(IsUPnPLoaded() == YES)
+				{
+					if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)
+						RemovePortMapping(Port);
+				}
 				listen_socket = DoClose(listen_socket);
 				iRetCode = 500;
 			}
 		}
 		else
+		// バグ修正
+//			iRetCode = 500;
+		{
+			// UPnP対応
+			if(IsUPnPLoaded() == YES)
+			{
+				if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)
+					RemovePortMapping(Port);
+			}
+			listen_socket = DoClose(listen_socket);
 			iRetCode = 500;
+		}
 	}
 	else
 	{
@@ -2704,6 +2729,8 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
 //	struct sockaddr_in saSockAddr1;
 	struct sockaddr_in saSockAddrIPv4;
 	struct sockaddr_in6 saSockAddrIPv6;
+	// UPnP対応
+	int Port;
 	int Resume;
 	char Reply[ERR_MSG_LEN+7];
 
@@ -2757,6 +2784,12 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
 
 				if(shutdown(listen_socket, 1) != 0)
 					ReportWSError("shutdown listen", WSAGetLastError());
+				// UPnP対応
+				if(IsUPnPLoaded() == YES)
+				{
+					if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)
+						RemovePortMapping(Port);
+				}
 				listen_socket = DoClose(listen_socket);
 
 				if(data_socket == INVALID_SOCKET)
@@ -2803,6 +2836,12 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
 		{
 			SetErrorMsg(Reply);
 			SetTaskMsg(MSGJPN108);
+			// UPnP対応
+			if(IsUPnPLoaded() == YES)
+			{
+				if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)
+					RemovePortMapping(Port);
+			}
 			listen_socket = DoClose(listen_socket);
 			iRetCode = 500;
 		}

--- a/main.c
+++ b/main.c
@@ -256,6 +256,8 @@ int MakeAllDir = YES;
 int LocalKanjiCode = KANJI_SJIS;
 // 自動切断対策
 int NoopEnable = NO;
+// UPnP対応
+int UPnPEnabled = NO;
 time_t LastDataConnectionTime = 0;
 
 
@@ -360,6 +362,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 
 	InitCommonControls();
 
+	// UPnP対応
+	CoInitialize(NULL);
+	LoadUPnP();
+
 	// FTPS対応
 #ifdef USE_OPENSSL
 	LoadOpenSSL();
@@ -405,6 +411,9 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 #endif
 	// SFTP対応
 	FreePuTTY();
+	// UPnP対応
+	FreeUPnP();
+	CoUninitialize();
 	OleUninitialize();
 	return(Ret);
 }

--- a/option.c
+++ b/option.c
@@ -178,6 +178,8 @@ extern int DispTimeSeconds;
 extern int DispPermissionsNumber;
 // ディレクトリ自動作成
 extern int MakeAllDir;
+// UPnP対応
+extern int UPnPEnabled;
 
 
 /*----- オプションのプロパティシート ------------------------------------------
@@ -1291,6 +1293,14 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
 			SendDlgItemMessage(hDlg, CONNECT_HIST_PASS, BM_SETCHECK, PassToHist, 0);
 			SendDlgItemMessage(hDlg, CONNECT_SENDQUIT, BM_SETCHECK, SendQuit, 0);
 			SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_SETCHECK, NoRasControl, 0);
+			// UPnP対応
+			if(IsUPnPLoaded() == YES)
+				SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_SETCHECK, UPnPEnabled, 0);
+			else
+			{
+				SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_SETCHECK, BST_UNCHECKED, 0);
+				EnableWindow(GetDlgItem(hDlg, CONNECT_UPNP), FALSE);
+			}
 		    return(TRUE);
 
 		case WM_NOTIFY:
@@ -1308,6 +1318,9 @@ static INT_PTR CALLBACK ConnectSettingProc(HWND hDlg, UINT message, WPARAM wPara
 					PassToHist = SendDlgItemMessage(hDlg, CONNECT_HIST_PASS, BM_GETCHECK, 0, 0);
 					SendQuit = SendDlgItemMessage(hDlg, CONNECT_SENDQUIT, BM_GETCHECK, 0, 0);
 					NoRasControl = SendDlgItemMessage(hDlg, CONNECT_NORAS, BM_GETCHECK, 0, 0);
+					// UPnP対応
+					if(IsUPnPLoaded() == YES)
+						UPnPEnabled = SendDlgItemMessage(hDlg, CONNECT_UPNP, BM_GETCHECK, 0, 0);
 					break;
 
 				case PSN_RESET :

--- a/registry.c
+++ b/registry.c
@@ -203,6 +203,8 @@ extern int DispPermissionsNumber;
 extern int MakeAllDir;
 // UTF-8対応
 extern int LocalKanjiCode;
+// UPnP対応
+extern int UPnPEnabled;
 
 /*----- マスタパスワードの設定 ----------------------------------------------
 *
@@ -641,6 +643,8 @@ void SaveRegistry(void)
 				WriteIntValueToReg(hKey4, "MakeDir", MakeAllDir);
 				// UTF-8対応
 				WriteIntValueToReg(hKey4, "Kanji", LocalKanjiCode);
+				// UPnP対応
+				WriteIntValueToReg(hKey4, "UPnP", UPnPEnabled);
 			}
 			CloseSubKey(hKey4);
 		}
@@ -1053,6 +1057,8 @@ int LoadRegistry(void)
 			ReadIntValueFromReg(hKey4, "MakeDir", &MakeAllDir);
 			// UTF-8対応
 			ReadIntValueFromReg(hKey4, "Kanji", &LocalKanjiCode);
+			// UPnP対応
+			ReadIntValueFromReg(hKey4, "UPnP", &UPnPEnabled);
 
 			CloseSubKey(hKey4);
 		}

--- a/socket.c
+++ b/socket.c
@@ -37,6 +37,8 @@
 #include <time.h>
 #include <windowsx.h>
 #include <commctrl.h>
+// UPnP対応
+#include <natupnp.h>
 
 #include "common.h"
 #include "resource.h"
@@ -71,6 +73,7 @@ typedef struct {
 	struct sockaddr_in SocksAddrIPv4;
 	struct sockaddr_in6 HostAddrIPv6;
 	struct sockaddr_in6 SocksAddrIPv6;
+	int MapPort;
 } ASYNCSIGNAL;
 
 
@@ -119,6 +122,9 @@ static ASYNCSIGNALDATABASE SignalDbase[MAX_SIGNAL_ENTRY_DBASE];
 // スレッド衝突のバグ修正
 static HANDLE hAsyncTblAccMutex;
 
+// UPnP対応
+IUPnPNAT* pUPnPNAT;
+IStaticPortMappingCollection* pUPnPMap;
 
 
 
@@ -499,6 +505,7 @@ static int RegisterAsyncTable(SOCKET s)
 				memset(&Signal[Pos].SocksAddrIPv4, 0, sizeof(struct sockaddr_in));
 				memset(&Signal[Pos].HostAddrIPv6, 0, sizeof(struct sockaddr_in6));
 				memset(&Signal[Pos].SocksAddrIPv6, 0, sizeof(struct sockaddr_in6));
+				Signal[Pos].MapPort = 0;
 				Sts = YES;
 				break;
 			}
@@ -699,6 +706,27 @@ int SetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_i
 	return(Sts);
 }
 
+int SetAsyncTableDataMapPort(SOCKET s, int Port)
+{
+	int Sts;
+	int Pos;
+
+	WaitForSingleObject(hAsyncTblAccMutex, INFINITE);
+	Sts = NO;
+	for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)
+	{
+		if(Signal[Pos].Socket == s)
+		{
+			Signal[Pos].MapPort = Port;
+			Sts = YES;
+			break;
+		}
+	}
+	ReleaseMutex(hAsyncTblAccMutex);
+
+	return(Sts);
+}
+
 int GetAsyncTableDataIPv4(SOCKET s, struct sockaddr_in* Host, struct sockaddr_in* Socks)
 {
 	int Sts;
@@ -747,6 +775,27 @@ int GetAsyncTableDataIPv6(SOCKET s, struct sockaddr_in6* Host, struct sockaddr_i
 	return(Sts);
 }
 
+int GetAsyncTableDataMapPort(SOCKET s, int* Port)
+{
+	int Sts;
+	int Pos;
+
+	WaitForSingleObject(hAsyncTblAccMutex, INFINITE);
+	Sts = NO;
+	for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)
+	{
+		if(Signal[Pos].Socket == s)
+		{
+			*Port = Signal[Pos].MapPort;
+			Sts = YES;
+			break;
+		}
+	}
+	ReleaseMutex(hAsyncTblAccMutex);
+
+	return(Sts);
+}
+
 
 
 
@@ -1308,6 +1357,82 @@ void RemoveReceivedData(SOCKET s)
 	}
 }
 
+// UPnP対応
+int LoadUPnP()
+{
+	int Sts;
+	Sts = FFFTP_FAIL;
+	if(CoCreateInstance(&CLSID_UPnPNAT, NULL, CLSCTX_ALL, &IID_IUPnPNAT, (void**)&pUPnPNAT) == S_OK)
+	{
+		if(pUPnPNAT->lpVtbl->get_StaticPortMappingCollection(pUPnPNAT, &pUPnPMap) == S_OK)
+			Sts = FFFTP_SUCCESS;
+	}
+	return Sts;
+}
+
+void FreeUPnP()
+{
+	if(pUPnPMap != NULL)
+		pUPnPMap->lpVtbl->Release(pUPnPMap);
+	pUPnPMap = NULL;
+	if(pUPnPNAT != NULL)
+		pUPnPNAT->lpVtbl->Release(pUPnPNAT);
+	pUPnPNAT = NULL;
+}
+
+int IsUPnPLoaded()
+{
+	int Sts;
+	Sts = FFFTP_FAIL;
+	if(pUPnPNAT != NULL && pUPnPMap != NULL)
+		Sts = FFFTP_SUCCESS;
+	return Sts;
+}
+
+int AddPortMapping(char* Adrs, int Port)
+{
+	int Sts;
+	WCHAR Tmp1[40];
+	BSTR Tmp2;
+	BSTR Tmp3;
+	BSTR Tmp4;
+	IStaticPortMapping* pPortMap;
+	Sts = FFFTP_FAIL;
+	MtoW(Tmp1, 40, Adrs, -1);
+	if((Tmp2 = SysAllocString(Tmp1)) != NULL)
+	{
+		if((Tmp3 = SysAllocString(L"TCP")) != NULL)
+		{
+			if((Tmp4 = SysAllocString(L"FFFTP")) != NULL)
+			{
+				if(pUPnPMap->lpVtbl->Add(pUPnPMap, Port, Tmp3, Port, Tmp2, VARIANT_TRUE, Tmp4, &pPortMap) == S_OK)
+				{
+					Sts = FFFTP_SUCCESS;
+					pPortMap->lpVtbl->Release(pPortMap);
+				}
+				SysFreeString(Tmp4);
+			}
+			SysFreeString(Tmp3);
+		}
+		SysFreeString(Tmp2);
+	}
+	return Sts;
+}
+
+int RemovePortMapping(int Port)
+{
+	int Sts;
+	BSTR Tmp;
+	Sts = FFFTP_FAIL;
+	if((Tmp = SysAllocString(L"TCP")) != NULL)
+	{
+		if(pUPnPMap->lpVtbl->Remove(pUPnPMap, Port, Tmp) == S_OK)
+			Sts = FFFTP_SUCCESS;
+		SysFreeString(Tmp);
+	}
+	return Sts;
+}
+
 
 /*----- 
 *

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -794,6 +794,16 @@ int WSACancelAsyncRequestIPv6(HANDLE hAsyncTaskHandle)
 	return Result;
 }
 
+char* AddressToStringIPv4(char* str, void* in)
+{
+	char* pResult;
+	unsigned char* p;
+	pResult = str;
+	p = (unsigned char*)in;
+	sprintf(str, "%u.%u.%u.%u", p[0], p[1], p[2], p[3]);
+	return pResult;
+}
+
 char* AddressToStringIPv6(char* str, void* in6)
 {
 	char* pResult;

--- a/socketwrapper.h
+++ b/socketwrapper.h
@@ -34,6 +34,7 @@ int FTPS_recv(SOCKET s, char * buf, int len, int flags);
 
 HANDLE WSAAsyncGetHostByNameIPv6(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen, short Family);
 int WSACancelAsyncRequestIPv6(HANDLE hAsyncTaskHandle);
+char* AddressToStringIPv4(char* str, void* in);
 char* AddressToStringIPv6(char* str, void* in6);
 char* inet6_ntoa(struct in6_addr in6);
 struct in6_addr inet6_addr(const char* cp);