diff --git a/src/addins/ftp/dependencies.log b/src/addins/ftp/dependencies.log index a456d4c710..d9f8c49535 100644 --- a/src/addins/ftp/dependencies.log +++ b/src/addins/ftp/dependencies.log @@ -1,9 +1,9 @@ "MAIN ---" - linux-vdso.so.1 (0x00007ffe2dff2000) - libpthread.so.0 => /lib64/libpthread.so.0 (0x00007dec8fc00000) - libc.so.6 => /lib64/libc.so.6 (0x00007dec8f800000) - libdl.so.2 => /lib64/libdl.so.2 (0x00007dec8f400000) - /lib64/ld-linux-x86-64.so.2 (0x00007dec90200000) + linux-vdso.so.1 (0x00007ffe82d8e000) + libpthread.so.0 => /lib64/libpthread.so.0 (0x0000725577200000) + libc.so.6 => /lib64/libc.so.6 (0x0000725576e00000) + libdl.so.2 => /lib64/libdl.so.2 (0x0000725576a00000) + /lib64/ld-linux-x86-64.so.2 (0x0000725577800000) GLIBC_2.2.5 GLIBC_2.3 GLIBC_2.3.4 diff --git a/src/addins/ftp/src/component/ftp_client.rs b/src/addins/ftp/src/component/ftp_client.rs index ad153ca87b..347e3c5a34 100644 --- a/src/addins/ftp/src/component/ftp_client.rs +++ b/src/addins/ftp/src/component/ftp_client.rs @@ -205,7 +205,7 @@ impl FtpClient { .map_err(|e| format!("Upload error: {}", e))?; let _ = std::io::Write::flush(&mut data_stream); - std::thread::sleep(std::time::Duration::from_millis(150)); + std::thread::sleep(std::time::Duration::from_millis(300)); stream.finalize_put_stream(data_stream) .map(|_| bytes) diff --git a/src/addins/ftp/src/component/tcp_establish.rs b/src/addins/ftp/src/component/tcp_establish.rs index 1cdd104031..c635ecddd0 100644 --- a/src/addins/ftp/src/component/tcp_establish.rs +++ b/src/addins/ftp/src/component/tcp_establish.rs @@ -1,5 +1,6 @@ use std::io::{BufRead, BufReader, Write}; use std::net::{SocketAddr, TcpStream}; +use std::time::Duration; use socks::{Socks4Stream, Socks5Stream}; use base64::{Engine as _, engine::general_purpose}; use suppaftp::FtpError; @@ -30,9 +31,23 @@ pub fn make_passive_proxy_stream( addr }; - create_tcp_connection_for_passive(&proxy_settings, corrected_addr) + match create_tcp_connection_for_passive(&proxy_settings, corrected_addr) .map_err(|e| FtpError::ConnectionError( - std::io::Error::new(std::io::ErrorKind::Other, e))) + std::io::Error::new(std::io::ErrorKind::Other, e))){ + + Ok(tcp_connection) => { + + let w_timeout = Some(Duration::from_secs(ftp_settings.write_timeout)); + let r_timeout = Some(Duration::from_secs(ftp_settings.read_timeout)); + + let _ = tcp_connection.set_write_timeout(w_timeout); + let _ = tcp_connection.set_read_timeout(r_timeout); + + Ok(tcp_connection) + + }, + Err(e) => Err(e) + } } pub fn create_tcp_connection( diff --git a/src/en/OInt/addins/OPI_FTP.zip b/src/en/OInt/addins/OPI_FTP.zip index d033cfb4a9..0c7baff1ae 100644 Binary files a/src/en/OInt/addins/OPI_FTP.zip and b/src/en/OInt/addins/OPI_FTP.zip differ diff --git a/src/en/OPI/src/CommonTemplates/OPI_FTP/Template.addin b/src/en/OPI/src/CommonTemplates/OPI_FTP/Template.addin index d033cfb4a9..0c7baff1ae 100644 Binary files a/src/en/OPI/src/CommonTemplates/OPI_FTP/Template.addin and b/src/en/OPI/src/CommonTemplates/OPI_FTP/Template.addin differ diff --git a/src/ru/OInt/addins/OPI_FTP.zip b/src/ru/OInt/addins/OPI_FTP.zip index d033cfb4a9..0c7baff1ae 100644 Binary files a/src/ru/OInt/addins/OPI_FTP.zip and b/src/ru/OInt/addins/OPI_FTP.zip differ diff --git a/src/ru/OPI/src/CommonTemplates/OPI_FTP/Template.addin b/src/ru/OPI/src/CommonTemplates/OPI_FTP/Template.addin index d033cfb4a9..0c7baff1ae 100644 Binary files a/src/ru/OPI/src/CommonTemplates/OPI_FTP/Template.addin and b/src/ru/OPI/src/CommonTemplates/OPI_FTP/Template.addin differ