Diffstat (limited to 'kmicromail/libmailwrapper/smtpwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index f54fe2b..24f4786 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -154,17 +154,17 @@ bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { | |||
154 | 154 | ||
155 | void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*failuremessage) | 155 | void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*failuremessage) |
156 | { | 156 | { |
157 | if (data) { | 157 | if (data) { |
158 | storeMail(data,size,"Sendfailed"); | 158 | storeMail(data,size,"Sendfailed"); |
159 | } | 159 | } |
160 | if (failuremessage) { | 160 | if (failuremessage) { |
161 | QMessageBox::critical(0,i18n("Error sending mail"), | 161 | QMessageBox::critical(0,i18n("Error sending mail"), |
162 | i18n("<center>%1</center>").arg(failuremessage)); | 162 | failuremessage); |
163 | } | 163 | } |
164 | } | 164 | } |
165 | 165 | ||
166 | int SMTPwrapper::start_smtp_tls() | 166 | int SMTPwrapper::start_smtp_tls() |
167 | { | 167 | { |
168 | if (!m_smtp) { | 168 | if (!m_smtp) { |
169 | return MAILSMTP_ERROR_IN_PROCESSING; | 169 | return MAILSMTP_ERROR_IN_PROCESSING; |
170 | } | 170 | } |
@@ -214,75 +214,78 @@ void SMTPwrapper::connect_server() | |||
214 | /* no failure message cause this happens when problems with memory - than we | 214 | /* no failure message cause this happens when problems with memory - than we |
215 | we can not display any messagebox */ | 215 | we can not display any messagebox */ |
216 | return; | 216 | return; |
217 | } | 217 | } |
218 | 218 | ||
219 | int err = MAILSMTP_NO_ERROR; | 219 | int err = MAILSMTP_NO_ERROR; |
220 | ; // odebug << "Servername " << server << " at port " << port << "" << oendl; | 220 | ; // odebug << "Servername " << server << " at port " << port << "" << oendl; |
221 | if ( ssl ) { | 221 | if ( ssl ) { |
222 | ; // odebug << "SSL session" << oendl; | 222 | qDebug("smtp: ssl_connect "); |
223 | err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port ); | 223 | err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port ); |
224 | } else { | 224 | } else { |
225 | ; // odebug << "No SSL session" << oendl; | 225 | ; // odebug << "No SSL session" << oendl; |
226 | err = mailsmtp_socket_connect( m_smtp, server.latin1(), port ); | 226 | err = mailsmtp_socket_connect( m_smtp, server.latin1(), port ); |
227 | } | 227 | } |
228 | if ( err != MAILSMTP_NO_ERROR ) { | 228 | if ( err != MAILSMTP_NO_ERROR ) { |
229 | ; // odebug << "Error init connection" << oendl; | 229 | qDebug("Error init SMTP connection" ); |
230 | failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 230 | failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err)); |
231 | result = 0; | 231 | result = 0; |
232 | } | 232 | } |
233 | 233 | ||
234 | qDebug("SMTP connection inited "); | ||
234 | /* switch to tls after init 'cause there it will send the ehlo */ | 235 | /* switch to tls after init 'cause there it will send the ehlo */ |
235 | if (result) { | 236 | if (result) { |
236 | err = mailsmtp_init( m_smtp ); | 237 | err = mailsmtp_init( m_smtp ); |
237 | if (err != MAILSMTP_NO_ERROR) { | 238 | if (err != MAILSMTP_NO_ERROR) { |
238 | result = 0; | 239 | result = 0; |
239 | failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 240 | qDebug("Error init SMTP connection "); |
241 | failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err)); | ||
240 | } | 242 | } |
241 | } | 243 | } |
242 | |||
243 | if (try_tls) { | 244 | if (try_tls) { |
245 | qDebug("Smpt: Try tls "); | ||
244 | err = start_smtp_tls(); | 246 | err = start_smtp_tls(); |
245 | if (err != MAILSMTP_NO_ERROR) { | 247 | if (err != MAILSMTP_NO_ERROR) { |
246 | try_tls = false; | 248 | try_tls = false; |
249 | qDebug("no tls "); | ||
247 | } else { | 250 | } else { |
248 | err = mailesmtp_ehlo(m_smtp); | 251 | err = mailesmtp_ehlo(m_smtp); |
249 | } | 252 | } |
250 | } | 253 | } |
251 | 254 | //qDebug("mailesmtp_ehlo %d ",err ); | |
252 | if (!try_tls && force_tls) { | 255 | if (!try_tls && force_tls) { |
253 | result = 0; | 256 | result = 0; |
254 | failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err)); | 257 | failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err)); |
255 | } | 258 | } |
256 | 259 | ||
257 | if (result==1 && m_SmtpAccount->getLogin() ) { | 260 | if (result==1 && m_SmtpAccount->getLogin() ) { |
258 | ; // odebug << "smtp with auth" << oendl; | 261 | ; // odebug << "smtp with auth" << oendl; |
259 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { | 262 | if ( m_SmtpAccount->getUser().isEmpty() || m_SmtpAccount->getPassword().isEmpty() ) { |
260 | // get'em | 263 | // get'em |
261 | LoginDialog login( m_SmtpAccount->getUser(), | 264 | LoginDialog login( m_SmtpAccount->getUser(), |
262 | m_SmtpAccount->getPassword(), NULL, 0, true ); | 265 | m_SmtpAccount->getPassword(), NULL, 0, true ); |
263 | login.show(); | 266 | login.show(); |
264 | if ( QDialog::Accepted == login.exec() ) { | 267 | if ( QDialog::Accepted == login.exec() ) { |
265 | // ok | 268 | // ok |
266 | user = login.getUser(); | 269 | user = login.getUser(); |
267 | pass = login.getPassword(); | 270 | pass = login.getPassword(); |
268 | } else { | 271 | } else { |
269 | result = 0; | 272 | result = 0; |
270 | failuretext=i18n("Login aborted - storing mail to localfolder"); | 273 | failuretext=i18n("Login aborted - \nstoring mail to localfolder"); |
271 | } | 274 | } |
272 | } else { | 275 | } else { |
273 | user = m_SmtpAccount->getUser(); | 276 | user = m_SmtpAccount->getUser(); |
274 | pass = m_SmtpAccount->getPassword(); | 277 | pass = m_SmtpAccount->getPassword(); |
275 | } | 278 | } |
276 | ; // odebug << "session->auth: " << m_smtp->auth << "" << oendl; | 279 | ; // odebug << "session->auth: " << m_smtp->auth << "" << oendl; |
277 | if (result) { | 280 | if (result) { |
278 | err = mailsmtp_auth( m_smtp, (char*)user.latin1(), (char*)pass.latin1() ); | 281 | err = mailsmtp_auth( m_smtp, (char*)user.latin1(), (char*)pass.latin1() ); |
279 | if ( err == MAILSMTP_NO_ERROR ) { | 282 | if ( err == MAILSMTP_NO_ERROR ) { |
280 | ; // odebug << "auth ok" << oendl; | 283 | qDebug("Smtp authentification ok "); |
281 | } else { | 284 | } else { |
282 | failuretext = i18n("Authentification failed"); | 285 | failuretext = i18n("Authentification failed"); |
283 | result = 0; | 286 | result = 0; |
284 | } | 287 | } |
285 | } | 288 | } |
286 | } | 289 | } |
287 | } | 290 | } |
288 | 291 | ||
@@ -301,17 +304,18 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
301 | QString failuretext = ""; | 304 | QString failuretext = ""; |
302 | 305 | ||
303 | connect_server(); | 306 | connect_server(); |
304 | 307 | ||
305 | result = 1; | 308 | result = 1; |
306 | if (m_smtp) { | 309 | if (m_smtp) { |
307 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); | 310 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); |
308 | if ( err != MAILSMTP_NO_ERROR ) { | 311 | if ( err != MAILSMTP_NO_ERROR ) { |
309 | failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err)); | 312 | qDebug("Error sending mail"); |
313 | failuretext=i18n("Error sending mail:\n%1").arg(mailsmtpError(err)); | ||
310 | result = 0; | 314 | result = 0; |
311 | } | 315 | } |
312 | } else { | 316 | } else { |
313 | result = 0; | 317 | result = 0; |
314 | } | 318 | } |
315 | 319 | ||
316 | if (!result) { | 320 | if (!result) { |
317 | storeFailedMail(data,size,failuretext); | 321 | storeFailedMail(data,size,failuretext); |