#include <stdio.h>
#include <string.h>
#include <sys/time.h>
+#include <signal.h>
#include <unistd.h>
#include "intl.h"
#include "socket.h"
#include "ssl.h"
#include "smtp.h"
-#include "esmtp.h"
#include "prefs_common.h"
#include "prefs_account.h"
#include "account.h"
gboolean cancelled;
};
-#if USE_SSL
-static SockInfo *send_smtp_open (const gchar *server, gushort port,
- const gchar *domain, gboolean use_smtp_auth,
- SSLSMTPType ssl_type);
-#else
-static SockInfo *send_smtp_open (const gchar *server, gushort port,
- const gchar *domain, gboolean use_smtp_auth);
-#endif
static gint send_message_data (SendProgressDialog *dialog, SockInfo *sock,
FILE *fp, gint size);
g_return_val_if_fail(ac_prefs != NULL, -1);
g_return_val_if_fail(to_list != NULL, -1);
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
- if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
+ if (ac_prefs->use_mail_command && ac_prefs->mail_command &&
+ (*ac_prefs->mail_command)) {
+ val = send_message_local(ac_prefs->mail_command, fp);
+ fclose(fp);
+ return val;
+ }
+ else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
val = send_message_local(prefs_common.extsend_cmd, fp);
fclose(fp);
return val;
}
-
- val = send_message_smtp(ac_prefs, to_list, fp);
-
- fclose(fp);
- return val;
+ else {
+ val = send_message_smtp(ac_prefs, to_list, fp);
+
+ fclose(fp);
+ return val;
+ }
}
enum
Q_ACCOUNT_ID = 3
};
+#if 0
gint send_message_queue(const gchar *file)
{
static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
g_return_val_if_fail(file != NULL, -1);
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
if (!to_list || !from) {
g_warning(_("Queued message header is broken.\n"));
val = -1;
+ } else if (ac && ac->use_mail_command && ac->mail_command &&
+ (*ac->mail_command)) {
+ val = send_message_local(ac->mail_command, fp);
} else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
val = send_message_local(prefs_common.extsend_cmd, fp);
} else {
return val;
}
+#endif
gint send_message_local(const gchar *command, FILE *fp)
{
FILE *pipefp;
gchar buf[BUFFSIZE];
+ int r;
+ sigset_t osig, mask;
g_return_val_if_fail(command != NULL, -1);
g_return_val_if_fail(fp != NULL, -1);
fputc('\n', pipefp);
}
- pclose(pipefp);
+ /* we need to block SIGCHLD, otherwise pspell's handler will wait()
+ * the pipecommand away and pclose will return -1 because of its
+ * failed wait4().
+ */
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &mask, &osig);
+
+ r = pclose(pipefp);
+
+ sigprocmask(SIG_SETMASK, &osig, NULL);
+ if (r != 0) {
+ g_warning(_("external command `%s' failed with code `%i'\n"), command, r);
+ return -1;
+ }
return 0;
}
#define EXIT_IF_CANCELLED() \
{ \
if (dialog->cancelled) { \
- sock_close(smtp_sock); \
+ if (session) \
+ session_destroy(session); \
send_progress_dialog_destroy(dialog); \
return -1; \
} \
EXIT_IF_CANCELLED(); \
if (!(f)) { \
log_warning("Error occurred while %s\n", s); \
- sock_close(smtp_sock); \
+ if (session) \
+ session_destroy(session); \
send_progress_dialog_destroy(dialog); \
return -1; \
} \
if ((ok = (f)) != SM_OK) { \
log_warning("Error occurred while %s\n", s); \
if (ok == SM_AUTHFAIL) { \
- log_warning("SMTP AUTH failed\n"); \
+ log_warning(_("SMTP AUTH failed\n")); \
if (ac_prefs->tmp_pass) { \
g_free(ac_prefs->tmp_pass); \
ac_prefs->tmp_pass = NULL; \
ac_prefs->tmp_smtp_pass = NULL; \
} \
} \
- if (smtp_quit(smtp_sock) != SM_OK) \
- log_warning("Error occurred while sending QUIT\n"); \
- sock_close(smtp_sock); \
+ if (smtp_quit(session->sock) != SM_OK) \
+ log_warning(_("Error occurred while sending QUIT\n")); \
+ session_destroy(session); \
send_progress_dialog_destroy(dialog); \
return -1; \
} \
gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list,
FILE *fp)
{
- SockInfo *smtp_sock = NULL;
SendProgressDialog *dialog;
+ Session *session = NULL;
GtkCList *clist;
const gchar *text[3];
gchar buf[BUFFSIZE];
#if USE_SSL
port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
- ac_prefs->ssl_smtp == SSL_SMTP_TUNNEL ? SSMTP_PORT : SMTP_PORT;
+ ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
#else
port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
#endif
clist = GTK_CLIST(dialog->dialog->clist);
gtk_clist_append(clist, (gchar **)text);
+ if (ac_prefs->pop_before_smtp
+ && (ac_prefs->protocol == A_APOP || ac_prefs->protocol == A_POP3)) {
+ g_snprintf(buf, sizeof(buf), _("Doing POP before SMTP..."));
+ log_message("%s\n", buf);
+ progress_dialog_set_label(dialog->dialog, buf);
+ gtk_clist_set_text(clist, 0, 2, _("POP before SMTP"));
+ GTK_EVENTS_FLUSH();
+ inc_pop_before_smtp(ac_prefs);
+ }
+
g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
ac_prefs->smtp_server);
log_message("%s\n", buf);
GTK_EVENTS_FLUSH();
#if USE_SSL
- SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
+ SEND_EXIT_IF_ERROR((session = smtp_session_new
(ac_prefs->smtp_server, port, domain,
- ac_prefs->use_smtp_auth, ac_prefs->ssl_smtp)),
+ user, pass, ac_prefs->ssl_smtp)),
"connecting to server");
#else
- SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
+ SEND_EXIT_IF_ERROR((session = smtp_session_new
(ac_prefs->smtp_server, port, domain,
- ac_prefs->use_smtp_auth)),
+ user, pass)),
"connecting to server");
#endif
GTK_EVENTS_FLUSH();
SEND_EXIT_IF_NOTOK
- (smtp_from(smtp_sock, ac_prefs->address, user, pass,
- ac_prefs->use_smtp_auth),
+ (smtp_from(SMTP_SESSION(session), ac_prefs->address,
+ ac_prefs->smtp_auth_type),
"sending MAIL FROM");
progress_dialog_set_label(dialog->dialog, _("Sending RCPT TO..."));
GTK_EVENTS_FLUSH();
for (cur = to_list; cur != NULL; cur = cur->next)
- SEND_EXIT_IF_NOTOK(smtp_rcpt(smtp_sock, (gchar *)cur->data),
+ SEND_EXIT_IF_NOTOK(smtp_rcpt(session->sock, (gchar *)cur->data),
"sending RCPT TO");
progress_dialog_set_label(dialog->dialog, _("Sending DATA..."));
GTK_EVENTS_FLUSH();
- SEND_EXIT_IF_NOTOK(smtp_data(smtp_sock), "sending DATA");
+ SEND_EXIT_IF_NOTOK(smtp_data(session->sock), "sending DATA");
/* send main part */
- SEND_EXIT_IF_ERROR(send_message_data(dialog, smtp_sock, fp, size) == 0,
- "sending data");
+ SEND_EXIT_IF_ERROR
+ (send_message_data(dialog, session->sock, fp, size) == 0,
+ "sending data");
progress_dialog_set_label(dialog->dialog, _("Quitting..."));
GTK_EVENTS_FLUSH();
- SEND_EXIT_IF_NOTOK(smtp_eom(smtp_sock), "terminating data");
- SEND_EXIT_IF_NOTOK(smtp_quit(smtp_sock), "sending QUIT");
+ SEND_EXIT_IF_NOTOK(smtp_eom(session->sock), "terminating data");
+ SEND_EXIT_IF_NOTOK(smtp_quit(session->sock), "sending QUIT");
- sock_close(smtp_sock);
+ session_destroy(session);
send_progress_dialog_destroy(dialog);
return 0;
#undef SEND_EXIT_IF_ERROR
#undef SEND_DIALOG_UPDATE
-#if USE_SSL
-static SockInfo *send_smtp_open(const gchar *server, gushort port,
- const gchar *domain, gboolean use_smtp_auth,
- SSLSMTPType ssl_type)
-#else
-static SockInfo *send_smtp_open(const gchar *server, gushort port,
- const gchar *domain, gboolean use_smtp_auth)
-#endif
-{
- SockInfo *sock;
- gint val;
-
- g_return_val_if_fail(server != NULL, NULL);
-
- if ((sock = sock_connect(server, port)) == NULL) {
- log_warning(_("Can't connect to SMTP server: %s:%d\n"),
- server, port);
- return NULL;
- }
-
-#if USE_SSL
- if (ssl_type == SSL_SMTP_TUNNEL && !ssl_init_socket(sock)) {
- log_warning(_("SSL connection failed"));
- sock_close(sock);
- return NULL;
- }
-#endif
-
- if (smtp_ok(sock) != SM_OK) {
- log_warning(_("Error occurred while connecting to %s:%d\n"),
- server, port);
- sock_close(sock);
- return NULL;
- }
-
-#if USE_SSL
- val = smtp_helo(sock, domain ? domain : get_domain_name(),
- use_smtp_auth || ssl_type == SSL_SMTP_STARTTLS);
-#else
- val = smtp_helo(sock, domain ? domain : get_domain_name(),
- use_smtp_auth);
-#endif
-
- if (val != SM_OK) {
- log_warning(_("Error occurred while sending HELO\n"));
- sock_close(sock);
- return NULL;
- }
-
-#if USE_SSL
- if (ssl_type == SSL_SMTP_STARTTLS) {
- val = esmtp_starttls(sock);
- if (val != SM_OK) {
- log_warning(_("Error occurred while sending STARTTLS\n"));
- sock_close(sock);
- return NULL;
- }
- if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1)) {
- sock_close(sock);
- return NULL;
- }
- val = esmtp_ehlo(sock, domain ? domain : get_domain_name());
- if (val != SM_OK) {
- log_warning(_("Error occurred while sending EHLO\n"));
- sock_close(sock);
- return NULL;
- }
- }
-#endif
-
- return sock;
-}
-
-
static SendProgressDialog *send_progress_dialog_create(void)
{
SendProgressDialog *dialog;
projects / claws.git / blobdiff