Commit: 342cbadfff643ffabaaf0a96cb9e02a2fbbdde31 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisão: 342cbadfff643ffabaaf0a96cb9e02a2fbbdde31 (tree)
• Hora: 2013-02-18 01:30:27
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Fix bugs of handling of UPnP.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: connect.c
• modified: main.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/connect.c
+++ b/connect.c
@@ -106,6 +106,8 @@ extern int PasvDefault;
 extern int QuickAnonymous;
 // 切断対策
 extern int TimeOut;
+// UPnP対応
+extern int UPnPEnabled;
 
 /*===== ローカルなワーク =====*/
 
@@ -2729,7 +2731,7 @@ SOCKET GetFTPListenSocketIPv4(SOCKET ctrl_skt, int *CancelCheckWork)
 						a = (char *)&saTmpAddr.sin_addr;
 						p = (char *)&saCtrlAddr.sin_port;
 						// UPnP対応
-						if(IsUPnPLoaded() == YES)
+						if(IsUPnPLoaded() == YES && UPnPEnabled == YES)
 						{
 							if(AddPortMapping(AddressToStringIPv4(Adrs, &saTmpAddr.sin_addr), ntohs(saCtrlAddr.sin_port)) == FFFTP_SUCCESS)
 								SetAsyncTableDataMapPort(listen_skt, ntohs(saCtrlAddr.sin_port));
@@ -2886,7 +2888,7 @@ SOCKET GetFTPListenSocketIPv6(SOCKET ctrl_skt, int *CancelCheckWork)
 						a = (char *)&saTmpAddr.sin6_addr;
 						p = (char *)&saCtrlAddr.sin6_port;
 						// UPnP対応
-						if(IsUPnPLoaded() == YES)
+						if(IsUPnPLoaded() == YES && UPnPEnabled == YES)
 						{
 							if(AddPortMapping(AddressToStringIPv6(Adrs, &saTmpAddr.sin6_addr), ntohs(saCtrlAddr.sin6_port)) == FFFTP_SUCCESS)
 								SetAsyncTableDataMapPort(listen_skt, ntohs(saCtrlAddr.sin6_port));

--- a/main.c
+++ b/main.c
@@ -257,7 +257,7 @@ int LocalKanjiCode = KANJI_SJIS;
 // 自動切断対策
 int NoopEnable = NO;
 // UPnP対応
-int UPnPEnabled = NO;
+int UPnPEnabled = YES;
 time_t LastDataConnectionTime = 0;