Update OpenSSL to 1.0.1j.

[ffftp/ffftp.git] / getput.c

diff --git a/getput.c b/getput.c
index fb0e1f6..d542b53 100644 (file)
--- a/getput.c
+++ b/getput.c
@@ -170,6 +170,10 @@ static int WaitForMainThread = NO;
 // 再転送対応\r
 static int TransferErrorMode = EXIST_OVW;\r
 static int TransferErrorNotify = NO;\r
+// タスクバー進捗表示\r
+static LONGLONG TransferSizeLeft = 0;\r
+static LONGLONG TransferSizeTotal = 0;\r
+static int TransferErrorDisplay = 0;\r
 \r
 /*===== 外部参照 =====*/\r
 \r
@@ -184,6 +188,8 @@ extern int FolderAttr;
 extern int FolderAttrNum;\r
 // 同時接続対応\r
 extern int SendQuit;\r
+// 自動切断対策\r
+extern time_t LastDataConnectionTime;\r
 \r
 \r
 /*----- ファイル転送スレッドを起動する ----------------------------------------\r
@@ -417,6 +423,9 @@ void AddTransFileList(TRANSPACKET *Pkt)
                   (strncmp(Pkt->Cmd, "STOR", 4) == 0))\r
                {\r
                        TransFiles++;\r
+                       // タスクバー進捗表示\r
+                       TransferSizeLeft += Pkt->Size;\r
+                       TransferSizeTotal += Pkt->Size;\r
                        PostMessage(GetMainHwnd(), WM_CHANGE_COND, 0, 0);\r
                }\r
        }\r
@@ -492,6 +501,9 @@ void AppendTransFileList(TRANSPACKET *Pkt)
                   (strncmp(Pkt->Cmd, "STOR", 4) == 0))\r
                {\r
                        TransFiles++;\r
+                       // タスクバー進捗表示\r
+                       TransferSizeLeft += Pkt->Size;\r
+                       TransferSizeTotal += Pkt->Size;\r
                        PostMessage(GetMainHwnd(), WM_CHANGE_COND, 0, 0);\r
                }\r
                Pkt = Pkt->Next;\r
@@ -588,6 +600,9 @@ static void EraseTransFileList(void)
        // 同時接続対応\r
        NextTransPacketBase = NotDel;\r
        TransFiles = 0;\r
+       // タスクバー進捗表示\r
+       TransferSizeLeft = 0;\r
+       TransferSizeTotal = 0;\r
        PostMessage(GetMainHwnd(), WM_CHANGE_COND, 0, 0);\r
        ReleaseMutex(hListAccMutex);\r
        // 同時接続対応\r
@@ -710,6 +725,8 @@ static ULONG WINAPI TransferThread(void *Dummy)
        RECT WndRect;\r
        int i;\r
        DWORD LastUsed;\r
+       int LastError;\r
+       int Sts;\r
 \r
        hWndTrans = NULL;\r
        Down = NO;\r
@@ -722,6 +739,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
        CmdSkt = INVALID_SOCKET;\r
        NewCmdSkt = INVALID_SOCKET;\r
        TrnSkt = INVALID_SOCKET;\r
+       LastError = NO;\r
        SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);\r
 \r
        while((TransPacketBase != NULL) ||\r
@@ -765,6 +783,20 @@ static ULONG WINAPI TransferThread(void *Dummy)
                }\r
                else\r
                {\r
+                       // セッションあたりの転送量制限対策\r
+                       if(AskErrorReconnect() == YES && LastError == YES)\r
+                       {\r
+                               ReleaseMutex(hListAccMutex);\r
+                               DoQUIT(TrnSkt, &Canceled[ThreadCount]);\r
+                               DoClose(TrnSkt);\r
+                               TrnSkt = INVALID_SOCKET;\r
+//                             WaitForSingleObject(hListAccMutex, INFINITE);\r
+                               while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)\r
+                               {\r
+                                       BackgrndMessageProc();\r
+                                       Sleep(1);\r
+                               }\r
+                       }\r
                        if(TransPacketBase && NewCmdSkt != INVALID_SOCKET && ThreadCount < AskMaxThreadCount())\r
                        {\r
                                ReleaseMutex(hListAccMutex);\r
@@ -816,6 +848,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
                        }\r
                }\r
                CmdSkt = NewCmdSkt;\r
+               LastError = NO;\r
 //             if(TransPacketBase != NULL)\r
                if(TrnSkt != INVALID_SOCKET && NextTransPacketBase != NULL)\r
                {\r
@@ -897,7 +930,9 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //                                             {\r
 //                                                     if(ReConnectTrnSkt() == FFFTP_SUCCESS)\r
 //                                                             DoDownload(AskTrnCtrlSkt(), TransPacketBase, NO, &Canceled);\r
-                                                               DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]);\r
+                                                               Sts = DoDownload(TrnSkt, Pos, NO, &Canceled[Pos->ThreadCount]) / 100;\r
+                                                               if(Sts != FTP_COMPLETE)\r
+                                                                       LastError = YES;\r
 //                                             }\r
                                        }\r
                                }\r
@@ -919,7 +954,9 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //                                     {\r
 //                                             if(ReConnectTrnSkt() == FFFTP_SUCCESS)\r
 //                                                     DoUpload(AskTrnCtrlSkt(), TransPacketBase);\r
-                                                       DoUpload(TrnSkt, Pos);\r
+                                                       Sts = DoUpload(TrnSkt, Pos) / 100;\r
+                                                       if(Sts != FTP_COMPLETE)\r
+                                                               LastError = YES;\r
 //                                     }\r
 \r
                                        // ホスト側の日時設定\r
@@ -1168,6 +1205,13 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //                                             TransFiles--;\r
                                                if(TransFiles > 0)\r
                                                        TransFiles--;\r
+                                               // タスクバー進捗表示\r
+                                               if(TransferSizeLeft > 0)\r
+                                                       TransferSizeLeft -= Pos->Size;\r
+                                               if(TransferSizeLeft < 0)\r
+                                                       TransferSizeLeft = 0;\r
+                                               if(TransFiles == 0)\r
+                                                       TransferSizeTotal = 0;\r
                                                PostMessage(GetMainHwnd(), WM_CHANGE_COND, 0, 0);\r
                                        }\r
 //                                     Pos = TransPacketBase;\r
@@ -1351,13 +1395,7 @@ int DoDownload(SOCKET cSkt, TRANSPACKET *Pkt, int DirList, int *CancelCheckWork)
                                        DispTransFileInfo(Pkt, MSGJPN087, FALSE, NO);\r
                        }\r
 \r
-                       // SFTP対応\r
-//                     if(BackgrndMessageProc() == NO)\r
-                       if(IsSFTPAttached(Pkt->ctrl_skt))\r
-                       {\r
-                               // TODO:\r
-                       }\r
-                       else if(BackgrndMessageProc() == NO)\r
+                       if(BackgrndMessageProc() == NO)\r
                        {\r
                                if(AskPasvMode() != YES)\r
                                        iRetCode = DownloadNonPassive(Pkt, CancelCheckWork);\r
@@ -1405,6 +1443,8 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 //     struct sockaddr_in saSockAddr1;\r
        struct sockaddr_in saSockAddrIPv4;\r
        struct sockaddr_in6 saSockAddrIPv6;\r
+       // UPnP対応\r
+       int Port;\r
        char Reply[ERR_MSG_LEN+7];\r
 \r
        if((listen_socket = GetFTPListenSocket(Pkt->ctrl_skt, CancelCheckWork)) != INVALID_SOCKET)\r
@@ -1436,6 +1476,12 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 \r
                                        if(shutdown(listen_socket, 1) != 0)\r
                                                ReportWSError("shutdown listen", WSAGetLastError());\r
+                                       // UPnP対応\r
+                                       if(IsUPnPLoaded() == YES)\r
+                                       {\r
+                                               if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)\r
+                                                       RemovePortMapping(Port);\r
+                                       }\r
                                        listen_socket = DoClose(listen_socket);\r
 \r
                                        if(data_socket == INVALID_SOCKET)\r
@@ -1468,7 +1514,7 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 //                                     iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);\r
                                        if(IsSSLAttached(Pkt->ctrl_skt))\r
                                        {\r
-                                               if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork))\r
+                                               if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork, FALSE))\r
                                                        iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);\r
                                                else\r
                                                        iRetCode = 500;\r
@@ -1482,12 +1528,29 @@ static int DownloadNonPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
                        {\r
                                SetErrorMsg(Reply);\r
                                SetTaskMsg(MSGJPN090);\r
+                               // UPnP対応\r
+                               if(IsUPnPLoaded() == YES)\r
+                               {\r
+                                       if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)\r
+                                               RemovePortMapping(Port);\r
+                               }\r
                                listen_socket = DoClose(listen_socket);\r
                                iRetCode = 500;\r
                        }\r
                }\r
                else\r
+               // バグ修正\r
+//                     iRetCode = 500;\r
+               {\r
+                       // UPnP対応\r
+                       if(IsUPnPLoaded() == YES)\r
+                       {\r
+                               if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)\r
+                                       RemovePortMapping(Port);\r
+                       }\r
+                       listen_socket = DoClose(listen_socket);\r
                        iRetCode = 500;\r
+               }\r
        }\r
        else\r
        {\r
@@ -1561,7 +1624,7 @@ static int DownloadPassive(TRANSPACKET *Pkt, int *CancelCheckWork)
 //                                             iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);\r
                                                if(IsSSLAttached(Pkt->ctrl_skt))\r
                                                {\r
-                                                       if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork))\r
+                                                       if(AttachSSL(data_socket, Pkt->ctrl_skt, CancelCheckWork, FALSE))\r
                                                                iRetCode = DownloadFile(Pkt, data_socket, CreateMode, CancelCheckWork);\r
                                                        else\r
                                                                iRetCode = 500;\r
@@ -2260,6 +2323,8 @@ static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *Canc
        if(shutdown(dSkt, 1) != 0)\r
                ReportWSError("shutdown", WSAGetLastError());\r
 \r
+       // 自動切断対策\r
+       LastDataConnectionTime = time(NULL);\r
        DoClose(dSkt);\r
 \r
        if(ForceAbort == NO)\r
@@ -2355,6 +2420,8 @@ static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
                                {\r
                                        if(strncmp(Pkt->Cmd, "RETR", 4) == 0 || strncmp(Pkt->Cmd, "STOR", 4) == 0)\r
                                        {\r
+                                               // タスクバー進捗表示\r
+                                               TransferErrorDisplay++;\r
                                                if(TransferErrorNotify == YES && DispUpDownErrDialog(downerr_dlg, Pkt->hWndTrans, Pkt) == NO)\r
                                                        ClearAll = YES;\r
                                                else\r
@@ -2362,6 +2429,8 @@ static void DispDownloadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
                                                        Pkt->Mode = TransferErrorMode;\r
                                                        AddTransFileList(Pkt);\r
                                                }\r
+                                               // タスクバー進捗表示\r
+                                               TransferErrorDisplay--;\r
                                        }\r
                                }\r
                        }\r
@@ -2609,13 +2678,7 @@ static int DoUpload(SOCKET cSkt, TRANSPACKET *Pkt)
                                if(Pkt->hWndTrans != NULL)\r
                                        DispTransFileInfo(Pkt, MSGJPN104, TRUE, YES);\r
 \r
-                               // SFTP対応\r
-//                             if(BackgrndMessageProc() == NO)\r
-                               if(IsSFTPAttached(Pkt->ctrl_skt))\r
-                               {\r
-                                       // TODO:\r
-                               }\r
-                               else if(BackgrndMessageProc() == NO)\r
+                               if(BackgrndMessageProc() == NO)\r
                                {\r
                                        if(AskPasvMode() != YES)\r
                                                iRetCode = UploadNonPassive(Pkt);\r
@@ -2678,6 +2741,8 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
 //     struct sockaddr_in saSockAddr1;\r
        struct sockaddr_in saSockAddrIPv4;\r
        struct sockaddr_in6 saSockAddrIPv6;\r
+       // UPnP対応\r
+       int Port;\r
        int Resume;\r
        char Reply[ERR_MSG_LEN+7];\r
 \r
@@ -2731,6 +2796,12 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
 \r
                                if(shutdown(listen_socket, 1) != 0)\r
                                        ReportWSError("shutdown listen", WSAGetLastError());\r
+                               // UPnP対応\r
+                               if(IsUPnPLoaded() == YES)\r
+                               {\r
+                                       if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)\r
+                                               RemovePortMapping(Port);\r
+                               }\r
                                listen_socket = DoClose(listen_socket);\r
 \r
                                if(data_socket == INVALID_SOCKET)\r
@@ -2763,7 +2834,7 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
 //                             iRetCode = UploadFile(Pkt, data_socket);\r
                                if(IsSSLAttached(Pkt->ctrl_skt))\r
                                {\r
-                                       if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount]))\r
+                                       if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount], FALSE))\r
                                                iRetCode = UploadFile(Pkt, data_socket);\r
                                        else\r
                                                iRetCode = 500;\r
@@ -2777,6 +2848,12 @@ static int UploadNonPassive(TRANSPACKET *Pkt)
                {\r
                        SetErrorMsg(Reply);\r
                        SetTaskMsg(MSGJPN108);\r
+                       // UPnP対応\r
+                       if(IsUPnPLoaded() == YES)\r
+                       {\r
+                               if(GetAsyncTableDataMapPort(listen_socket, &Port) == YES)\r
+                                       RemovePortMapping(Port);\r
+                       }\r
                        listen_socket = DoClose(listen_socket);\r
                        iRetCode = 500;\r
                }\r
@@ -2876,7 +2953,7 @@ static int UploadPassive(TRANSPACKET *Pkt)
 //                                     iRetCode = UploadFile(Pkt, data_socket);\r
                                        if(IsSSLAttached(Pkt->ctrl_skt))\r
                                        {\r
-                                               if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount]))\r
+                                               if(AttachSSL(data_socket, Pkt->ctrl_skt, &Canceled[Pkt->ThreadCount], FALSE))\r
                                                        iRetCode = UploadFile(Pkt, data_socket);\r
                                                else\r
                                                        iRetCode = 500;\r
@@ -3535,6 +3612,8 @@ static int UploadFile(TRANSPACKET *Pkt, SOCKET dSkt)
                Pkt->Abort = ABORT_ERROR;\r
        }\r
 \r
+       // 自動切断対策\r
+       LastDataConnectionTime = time(NULL);\r
        if(shutdown(dSkt, 1) != 0)\r
                ReportWSError("shutdown", WSAGetLastError());\r
 \r
@@ -3649,6 +3728,8 @@ static void DispUploadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
                                {\r
                                        if(strncmp(Pkt->Cmd, "RETR", 4) == 0 || strncmp(Pkt->Cmd, "STOR", 4) == 0)\r
                                        {\r
+                                               // タスクバー進捗表示\r
+                                               TransferErrorDisplay++;\r
                                                if(TransferErrorNotify == YES && DispUpDownErrDialog(uperr_dlg, Pkt->hWndTrans, Pkt) == NO)\r
                                                        ClearAll = YES;\r
                                                else\r
@@ -3656,6 +3737,8 @@ static void DispUploadFinishMsg(TRANSPACKET *Pkt, int iRetCode)
                                                        Pkt->Mode = TransferErrorMode;\r
                                                        AddTransFileList(Pkt);\r
                                                }\r
+                                               // タスクバー進捗表示\r
+                                               TransferErrorDisplay--;\r
                                        }\r
                                }\r
                        }\r
@@ -4350,3 +4433,20 @@ static char* GetErrMsg()
        ReleaseMutex(hErrMsgMutex);\r
        return r;\r
 }\r
+\r
+// タスクバー進捗表示\r
+LONGLONG AskTransferSizeLeft(void)\r
+{\r
+       return(TransferSizeLeft);\r
+}\r
+\r
+LONGLONG AskTransferSizeTotal(void)\r
+{\r
+       return(TransferSizeTotal);\r
+}\r
+\r
+int AskTransferErrorDisplay(void)\r
+{\r
+       return(TransferErrorDisplay);\r
+}\r
+\r