Diffstat (limited to 'noncore/net/mail/libmailwrapper/smtpwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 55 |
1 files changed, 52 insertions, 3 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index e8db9ca..3ab6b77 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp @@ -60,4 +60,6 @@ QString SMTPwrapper::mailsmtpError( int errnum ) { case MAILSMTP_ERROR_IN_PROCESSING: return tr( "Error in processing" ); + case MAILSMTP_ERROR_STARTTLS_NOT_SUPPORTED: + return tr( "Starttls not supported" ); // case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE: // return tr( "Insufficient system storage" ); @@ -566,4 +568,27 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char* } +int SMTPwrapper::start_smtp_tls(mailsmtp *session) +{ + if (!session) { + return MAILSMTP_ERROR_IN_PROCESSING; + } + int err = mailesmtp_starttls(session); + if (err != MAILSMTP_NO_ERROR) return err; + mailstream_low * low; + mailstream_low * new_low; + low = mailstream_get_low(session->stream); + if (!low) { + return MAILSMTP_ERROR_IN_PROCESSING; + } + int fd = mailstream_low_get_fd(low); + if (fd > -1 && (new_low = mailstream_low_ssl_open(fd))!=0) { + mailstream_low_free(low); + mailstream_set_low(session->stream, new_low); + } else { + return MAILSMTP_ERROR_IN_PROCESSING; + } + return err; +} + int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp ) { const char *server, *user, *pass; @@ -581,7 +606,12 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT ssl = false; + bool try_tls = true; + bool force_tls=false; if ( smtp->ConnectionType() == 2 ) { ssl = true; + try_tls = false; + } else if (smtp->ConnectionType() == 1) { + force_tls = true; } @@ -609,4 +639,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT } + /* switch to tls after init 'cause there it will send the ehlo */ if (result) { err = mailsmtp_init( session ); @@ -617,4 +648,18 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT } + if (try_tls) { + err = start_smtp_tls(session); + if (err != MAILSMTP_NO_ERROR) { + try_tls = false; + } else { + err = mailesmtp_ehlo(session); + } + } + + if (!try_tls && force_tls) { + result = 0; + failuretext = tr("Error init SMTP tls: %1").arg(mailsmtpError(err)); + } + if (result==1 && smtp->getLogin() ) { qDebug("smtp with auth"); @@ -738,6 +783,9 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) { bool returnValue = true; - if (!smtp) + qDebug("Sending the queue"); + if (!smtp) { + qDebug("No smtp account given"); return false; + } bool reset_user_value = false; @@ -755,7 +803,8 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) { if (mailsToSend.count()==0) { delete wrap; + qDebug("No mails to send"); return false; } - + oldPw = smtp->getPassword(); oldUser = smtp->getUser(); @@ -777,5 +826,5 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) { } - + mailsToSend.setAutoDelete(false); sendProgress = new progressMailSend(); |