Commit: 8f80974f5d481a295349fbadb559754b213347f9 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 8f80974f5d481a295349fbadb559754b213347f9 (tree)
• Zeit: 2015-08-09 23:54:55
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of UPnP port mapping control.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: FFFTP_Eng_Release_64/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Release_64/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: ftpproc.c
• modified: main.c
• modified: socket.c

Diff

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

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

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

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

--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
 // 2014年7月31日中の30個目のリリースは2014073129
-#define RELEASE_VERSION_NUM		2015072001	/* リリースバージョン */
+#define RELEASE_VERSION_NUM		2015080901	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク
@@ -117,6 +117,10 @@
 #define WM_REFRESH_LOCAL_FLG	(WM_USER+7)
 #define WM_REFRESH_REMOTE_FLG	(WM_USER+8)
 
+// UPnP対応
+#define WM_ADDPORTMAPPING	(WM_USER+9)
+#define WM_REMOVEPORTMAPPING	(WM_USER+10)
+
 /*===== ホスト番号 =====*/
 /* ホスト番号は 0～ の値を取る */
 
@@ -1354,6 +1358,23 @@ typedef struct {
 } INTCONVTBL;
 
 
+// UPnP対応
+typedef struct
+{
+	int r;
+	HANDLE h;
+	char* Adrs;
+	int Port;
+	char* ExtAdrs;
+} ADDPORTMAPPINGDATA;
+
+typedef struct
+{
+	int r;
+	HANDLE h;
+	int Port;
+} REMOVEPORTMAPPINGDATA;
+
 /*=================================================
 *		プロトタイプ
 *=================================================*/
@@ -2001,7 +2022,7 @@ void RemoveReceivedData(SOCKET s);
 int LoadUPnP();
 void FreeUPnP();
 int IsUPnPLoaded();
-int AddPortMapping(char* Adrs, int Port);
+int AddPortMapping(char* Adrs, int Port, char* ExtAdrs);
 int RemovePortMapping(int Port);
 int CheckClosedAndReconnect(void);
 // 同時接続対応

--- a/connect.c
+++ b/connect.c
@@ -2643,6 +2643,7 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 	// UPnP対応
 	char Adrs[16];
 	int Port;
+	char ExtAdrs[40];
 
 	// ソケットにデータを付与
 	GetAsyncTableDataIPv4(ctrl_skt, &CurSockAddr, &SocksSockAddr);
@@ -2755,8 +2756,11 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 						// UPnP対応
 						if(IsUPnPLoaded() == YES && UPnPEnabled == YES)
 						{
-							if(AddPortMapping(AddressToStringIPv4(Adrs, &saTmpAddr.sin_addr), ntohs(saCtrlAddr.sin_port)) == FFFTP_SUCCESS)
+							if(AddPortMapping(AddressToStringIPv4(Adrs, &saTmpAddr.sin_addr), ntohs(saCtrlAddr.sin_port), ExtAdrs) == FFFTP_SUCCESS)
+							{
+								saTmpAddr.sin_addr.s_addr = inet_addr(ExtAdrs);
 								SetAsyncTableDataMapPort(listen_skt, ntohs(saCtrlAddr.sin_port));
+							}
 						}
 					}
 					else
@@ -2838,6 +2842,7 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 	char Adrs[40];
 	// UPnP対応
 	int Port;
+	char ExtAdrs[40];
 
 	// ソケットにデータを付与
 	GetAsyncTableDataIPv6(ctrl_skt, &CurSockAddr, &SocksSockAddr);
@@ -2914,8 +2919,11 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 						// UPnP対応
 						if(IsUPnPLoaded() == YES && UPnPEnabled == YES)
 						{
-							if(AddPortMapping(AddressToStringIPv6(Adrs, &saTmpAddr.sin6_addr), ntohs(saCtrlAddr.sin6_port)) == FFFTP_SUCCESS)
+							if(AddPortMapping(AddressToStringIPv6(Adrs, &saTmpAddr.sin6_addr), ntohs(saCtrlAddr.sin6_port), ExtAdrs) == FFFTP_SUCCESS)
+							{
+								saTmpAddr.sin6_addr = inet6_addr(ExtAdrs);
 								SetAsyncTableDataMapPort(listen_skt, ntohs(saCtrlAddr.sin6_port));
+							}
 						}
 					}
 					else

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3801,14 +3801,13 @@ static int RenameUnuseableName(char *Fname)
 // NOOPコマンドでは効果が無いホストが多いためLISTコマンドを使用
 void NoopProc(int Force)
 {
-	int CancelCheckWork;
-	CancelCheckWork = NO;
+//	CancelFlg = NO;
 	if(Force == YES || (AskConnecting() == YES && AskUserOpeDisabled() == NO))
 	{
 		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
 		{
 			DisableUserOpe();
-			DoDirListCmdSkt("", "", 999, &CancelCheckWork);
+			DoDirListCmdSkt("", "", 999, &CancelFlg);
 			EnableUserOpe();
 		}
 	}

--- a/main.c
+++ b/main.c
@@ -2056,6 +2056,17 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				PostMessage(hWnd,  WM_COMMAND, MAKEWPARAM(REFRESH_REMOTE, 0), 0);
 			break;
 
+		// UPnP対応
+		case WM_ADDPORTMAPPING :
+			((ADDPORTMAPPINGDATA*)lParam)->r = AddPortMapping(((ADDPORTMAPPINGDATA*)lParam)->Adrs, ((ADDPORTMAPPINGDATA*)lParam)->Port, ((ADDPORTMAPPINGDATA*)lParam)->ExtAdrs);
+			SetEvent(((ADDPORTMAPPINGDATA*)lParam)->h);
+			break;
+
+		case WM_REMOVEPORTMAPPING :
+			((REMOVEPORTMAPPINGDATA*)lParam)->r = RemovePortMapping(((REMOVEPORTMAPPINGDATA*)lParam)->Port);
+			SetEvent(((REMOVEPORTMAPPINGDATA*)lParam)->h);
+			break;
+
 		case WM_PAINT :
 		    BeginPaint(hWnd, (LPPAINTSTRUCT) &ps);
 		    EndPaint(hWnd, (LPPAINTSTRUCT) &ps);

--- a/socket.c
+++ b/socket.c
@@ -1389,7 +1389,7 @@ int IsUPnPLoaded()
 	return Sts;
 }
 
-int AddPortMapping(char* Adrs, int Port)
+int AddPortMapping(char* Adrs, int Port, char* ExtAdrs)
 {
 	int Sts;
 	WCHAR Tmp1[40];
@@ -1397,24 +1397,49 @@ int AddPortMapping(char* Adrs, int Port)
 	BSTR Tmp3;
 	BSTR Tmp4;
 	IStaticPortMapping* pPortMap;
+	BSTR Tmp5;
+	ADDPORTMAPPINGDATA Data;
 	Sts = FFFTP_FAIL;
-	MtoW(Tmp1, 40, Adrs, -1);
-	if((Tmp2 = SysAllocString(Tmp1)) != NULL)
+	if(IsMainThread())
 	{
-		if((Tmp3 = SysAllocString(L"TCP")) != NULL)
+		MtoW(Tmp1, 40, Adrs, -1);
+		if((Tmp2 = SysAllocString(Tmp1)) != NULL)
 		{
-			if((Tmp4 = SysAllocString(L"FFFTP")) != NULL)
+			if((Tmp3 = SysAllocString(L"TCP")) != NULL)
 			{
-				if(pUPnPMap->lpVtbl->Add(pUPnPMap, Port, Tmp3, Port, Tmp2, VARIANT_TRUE, Tmp4, &pPortMap) == S_OK)
+				if((Tmp4 = SysAllocString(L"FFFTP")) != NULL)
 				{
-					Sts = FFFTP_SUCCESS;
-					pPortMap->lpVtbl->Release(pPortMap);
+					if(pUPnPMap->lpVtbl->Add(pUPnPMap, Port, Tmp3, Port, Tmp2, VARIANT_TRUE, Tmp4, &pPortMap) == S_OK)
+					{
+						if(pPortMap->lpVtbl->get_ExternalIPAddress(pPortMap, &Tmp5) == S_OK)
+						{
+							WtoM(ExtAdrs, 40, Tmp5, -1);
+							Sts = FFFTP_SUCCESS;
+							SysFreeString(Tmp5);
+						}
+						pPortMap->lpVtbl->Release(pPortMap);
+					}
+					SysFreeString(Tmp4);
 				}
-				SysFreeString(Tmp4);
+				SysFreeString(Tmp3);
+			}
+			SysFreeString(Tmp2);
+		}
+	}
+	else
+	{
+		if(Data.h = CreateEvent(NULL, TRUE, FALSE, NULL))
+		{
+			Data.Adrs = Adrs;
+			Data.Port = Port;
+			Data.ExtAdrs = ExtAdrs;
+			if(PostMessage(GetMainHwnd(), WM_ADDPORTMAPPING, 0, (LPARAM)&Data))
+			{
+				if(WaitForSingleObject(Data.h, INFINITE) == WAIT_OBJECT_0)
+					Sts = Data.r;
 			}
-			SysFreeString(Tmp3);
+			CloseHandle(Data.h);
 		}
-		SysFreeString(Tmp2);
 	}
 	return Sts;
 }
@@ -1423,12 +1448,29 @@ int RemovePortMapping(int Port)
 {
 	int Sts;
 	BSTR Tmp;
+	REMOVEPORTMAPPINGDATA Data;
 	Sts = FFFTP_FAIL;
-	if((Tmp = SysAllocString(L"TCP")) != NULL)
+	if(IsMainThread())
 	{
-		if(pUPnPMap->lpVtbl->Remove(pUPnPMap, Port, Tmp) == S_OK)
-			Sts = FFFTP_SUCCESS;
-		SysFreeString(Tmp);
+		if((Tmp = SysAllocString(L"TCP")) != NULL)
+		{
+			if(pUPnPMap->lpVtbl->Remove(pUPnPMap, Port, Tmp) == S_OK)
+				Sts = FFFTP_SUCCESS;
+			SysFreeString(Tmp);
+		}
+	}
+	else
+	{
+		if(Data.h = CreateEvent(NULL, TRUE, FALSE, NULL))
+		{
+			Data.Port = Port;
+			if(PostMessage(GetMainHwnd(), WM_ADDPORTMAPPING, 0, (LPARAM)&Data))
+			{
+				if(WaitForSingleObject(Data.h, INFINITE) == WAIT_OBJECT_0)
+					Sts = Data.r;
+			}
+			CloseHandle(Data.h);
+		}
 	}
 	return Sts;
 }