X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=history.c;h=8bd01e1cde56f482675e6e716de99f903b2a402d;hp=1ccde875937774069a76970b72a4c8b8243ba325;hb=698970baae62125ab8fd5d0e71a2835187288c7d;hpb=193bc37b9f55b9a1dd24a72e06203cb1503eab15

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