Add support for MLSD responses from some broken hosts.

[ffftp/ffftp.git] / history.c

diff --git a/history.c b/history.c
index a2aec84..8bd01e1 100644 (file)
--- a/history.c
+++ b/history.c
@@ -28,6 +28,8 @@
 /============================================================================*/\r
 \r
 #define  STRICT\r
+// IPv6対応\r
+#include <winsock2.h>\r
 #include <windows.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
@@ -37,7 +39,8 @@
 #include <windowsx.h>\r
 #include <commctrl.h>\r
 #include <stdarg.h>\r
-#include <winsock.h>\r
+// IPv6対応\r
+//#include <winsock.h>\r
 \r
 #include "common.h"\r
 #include "resource.h"\r
@@ -224,11 +227,23 @@ static void CopyHostToHistory(HOSTDATA *Host, HISTORYDATA *New)
        New->DialupNotify = Host->DialupNotify;\r
        strcpy(New->DialEntry, Host->DialEntry);\r
        // 暗号化通信対応\r
+       New->UseNoEncryption = Host->UseNoEncryption;\r
        New->UseFTPES = Host->UseFTPES;\r
        New->UseFTPIS = Host->UseFTPIS;\r
        New->UseSFTP = Host->UseSFTP;\r
+       strcpy(New->PrivateKey, Host->PrivateKey);\r
        // 同時接続対応\r
        New->MaxThreadCount = Host->MaxThreadCount;\r
+       New->ReuseCmdSkt = Host->ReuseCmdSkt;\r
+       // MLSD対応\r
+       New->UseMLSD = Host->UseMLSD;\r
+       // IPv6対応\r
+       New->NetType = Host->NetType;\r
+       // 自動切断対策\r
+       New->NoopInterval = Host->NoopInterval;\r
+       // 再転送対応\r
+       New->TransferErrorMode = Host->TransferErrorMode;\r
+       New->TransferErrorNotify = Host->TransferErrorNotify;\r
        return;\r
 }\r
 \r
@@ -279,11 +294,23 @@ void CopyHistoryToHost(HISTORYDATA *Hist, HOSTDATA *Host)
        Host->DialupNotify = Hist->DialupNotify;\r
        strcpy(Host->DialEntry, Hist->DialEntry);\r
        // 暗号化通信対応\r
+       Host->UseNoEncryption = Hist->UseNoEncryption;\r
        Host->UseFTPES = Hist->UseFTPES;\r
        Host->UseFTPIS = Hist->UseFTPIS;\r
        Host->UseSFTP = Hist->UseSFTP;\r
+       strcpy(Host->PrivateKey, Hist->PrivateKey);\r
        // 同時接続対応\r
        Host->MaxThreadCount = Hist->MaxThreadCount;\r
+       Host->ReuseCmdSkt = Hist->ReuseCmdSkt;\r
+       // MLSD対応\r
+       Host->UseMLSD = Hist->UseMLSD;\r
+       // IPv6対応\r
+       Host->NetType = Hist->NetType;\r
+       // 自動切断対策\r
+       Host->NoopInterval = Hist->NoopInterval;\r
+       // 再転送対応\r
+       Host->TransferErrorMode = Hist->TransferErrorMode;\r
+       Host->TransferErrorNotify = Hist->TransferErrorNotify;\r
        return;\r
 }\r
 \r