int ReConnectCmdSkt(void)\r
{\r
int Sts;\r
- SOCKET s;\r
\r
\r
// 同時接続対応\r
// if(CmdCtrlSocket != TrnCtrlSocket)\r
-// do_closesocket(TrnCtrlSocket);\r
-// TrnCtrlSocket = INVALID_SOCKET;\r
- s = TrnCtrlSocket;\r
+ if(CmdCtrlSocket != TrnCtrlSocket && TrnCtrlSocket != INVALID_SOCKET)\r
+ do_closesocket(TrnCtrlSocket);\r
TrnCtrlSocket = INVALID_SOCKET;\r
- if(CmdCtrlSocket != s && s != INVALID_SOCKET)\r
- do_closesocket(s);\r
\r
- // 同時接続対応\r
-// Sts = ReConnectSkt(&CmdCtrlSocket);\r
- s = CmdCtrlSocket;\r
- CmdCtrlSocket = INVALID_SOCKET;\r
- Sts = ReConnectSkt(&s);\r
- CmdCtrlSocket = s;\r
+ Sts = ReConnectSkt(&CmdCtrlSocket);\r
\r
TrnCtrlSocket = CmdCtrlSocket;\r
\r
// ;\r
if(CryptMode == CRYPT_FTPIS)\r
{\r
- if(AttachSSL(ContSock))\r
+ if(AttachSSL(ContSock, INVALID_SOCKET))\r
{\r
while((Sts = ReadReplyMessage(ContSock, Buf, 1024, &CancelFlg, TmpBuf) / 100) == FTP_PRELIM)\r
;\r
- if((Sts = command(ContSock, Reply, &CancelFlg, "PBSZ 0")) == 200)\r
- {\r
- if((Sts = command(ContSock, Reply, &CancelFlg, "PROT P")) == 200)\r
- {\r
- }\r
- else\r
- Sts = FTP_ERROR;\r
- }\r
- else\r
- Sts = FTP_ERROR;\r
}\r
else\r
Sts = FTP_ERROR;\r
{\r
if(IsOpenSSLLoaded() && (Sts = command(ContSock, Reply, &CancelFlg, "AUTH TLS")) == 234)\r
{\r
- if(AttachSSL(ContSock))\r
+ if(AttachSSL(ContSock, INVALID_SOCKET))\r
{\r
if((Sts = command(ContSock, Reply, &CancelFlg, "PBSZ 0")) == 200)\r
{\r
if((ContSock = DoConnectCrypt(CRYPT_SFTP, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)\r
HostData->CryptMode = CRYPT_SFTP;\r
}\r
-// if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseFTPIS == YES)\r
-// {\r
-// SetTaskMsg(MSGJPN316);\r
-// if((ContSock = DoConnectCrypt(CRYPT_FTPIS, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)\r
-// HostData->CryptMode = CRYPT_FTPIS;\r
-// }\r
+ if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseFTPIS == YES)\r
+ {\r
+ SetTaskMsg(MSGJPN316);\r
+ if((ContSock = DoConnectCrypt(CRYPT_FTPIS, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)\r
+ HostData->CryptMode = CRYPT_FTPIS;\r
+ }\r
if(CancelFlg == NO && ContSock == INVALID_SOCKET && HostData->UseFTPES == YES)\r
{\r
SetTaskMsg(MSGJPN315);\r