"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/engine/ftp/ftpcontrolsocket.cpp" between
FileZilla_3.48.0_src.tar.bz2 and FileZilla_3.48.1_src.tar.bz2

About: FileZilla is a fast and feature-rich cross-platform FTP, FTPS and SFTP client with an intuitive graphical user interface.

ftpcontrolsocket.cpp  (FileZilla_3.48.0_src.tar.bz2):ftpcontrolsocket.cpp  (FileZilla_3.48.1_src.tar.bz2)
skipping to change at line 180 skipping to change at line 180
ParseResponse(); ParseResponse();
m_Response.clear(); m_Response.clear();
} }
} }
} }
void CFtpControlSocket::OnConnect() void CFtpControlSocket::OnConnect()
{ {
m_lastTypeBinary = -1; m_lastTypeBinary = -1;
m_sentRestartOffset = false; m_sentRestartOffset = false;
m_protectDataChannel = false;
SetAlive(); SetAlive();
if (currentServer_.GetProtocol() == FTPS) { if (currentServer_.GetProtocol() == FTPS) {
if (!tls_layer_) { if (!tls_layer_) {
log(logmsg::status, _("Connection established, initializi ng TLS...")); log(logmsg::status, _("Connection established, initializi ng TLS..."));
tls_layer_ = std::make_unique<fz::tls_layer>(event_loop_, this, *active_layer_, &engine_.GetContext().GetTlsSystemTrustStore(), logger_); tls_layer_ = std::make_unique<fz::tls_layer>(event_loop_, this, *active_layer_, &engine_.GetContext().GetTlsSystemTrustStore(), logger_);
active_layer_ = tls_layer_.get(); active_layer_ = tls_layer_.get();
skipping to change at line 794 skipping to change at line 795
} }
CRealControlSocket::operator()(ev); CRealControlSocket::operator()(ev);
} }
void CFtpControlSocket::ResetSocket() void CFtpControlSocket::ResetSocket()
{ {
receiveBuffer_.clear(); receiveBuffer_.clear();
tls_layer_.reset(); tls_layer_.reset();
m_pendingReplies = 0; m_pendingReplies = 0;
m_repliesToSkip = 0;
CRealControlSocket::ResetSocket(); CRealControlSocket::ResetSocket();
} }
void CFtpControlSocket::OnVerifyCert(fz::tls_layer* source, fz::tls_session_info & info) void CFtpControlSocket::OnVerifyCert(fz::tls_layer* source, fz::tls_session_info & info)
{ {
if (!tls_layer_ || source != tls_layer_.get()) { if (!tls_layer_ || source != tls_layer_.get()) {
return; return;
} }
SendAsyncRequest(new CCertificateNotification(std::move(info))); SendAsyncRequest(new CCertificateNotification(std::move(info)));
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)