#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"
#include "procheader.h"
#include "utils.h"
#include "gtkutils.h"
+#include "statusbar.h"
+#include "inc.h"
+#include "log.h"
typedef struct _SendProgressDialog SendProgressDialog;
GList *queue_list;
gboolean cancelled;
};
+#if 0
+static gint send_message_local (const gchar *command,
+ FILE *fp);
-#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);
+static gint send_message_smtp (PrefsAccount *ac_prefs,
+ GSList *to_list,
+ FILE *fp);
#endif
+static gint send_message_data (SendProgressDialog *dialog,
+ SockInfo *sock,
+ FILE *fp,
+ gint size);
-static gint send_message_data (SendProgressDialog *dialog, SockInfo *sock,
- FILE *fp, gint size);
+static SendProgressDialog *send_progress_dialog_create (void);
+static void send_progress_dialog_destroy (SendProgressDialog *dialog);
+static void send_cancel (GtkWidget *widget,
+ gpointer data);
-static SendProgressDialog *send_progress_dialog_create(void);
-static void send_progress_dialog_destroy(SendProgressDialog *dialog);
-static void send_cancel(GtkWidget *widget, gpointer data);
+static void send_progress_dialog_update (Session *session,
+ SMTPPhase phase);
gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
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;
}
- printf("account: %p\n", ac_prefs);
-
if (ac_prefs->use_mail_command && ac_prefs->mail_command &&
(*ac_prefs->mail_command)) {
val = send_message_local(ac_prefs->mail_command, fp);
{"AID:", NULL, FALSE},
{NULL, NULL, FALSE}};
FILE *fp;
- gint val;
+ gint val = 0;
gchar *from = NULL;
gchar *server = NULL;
GSList *to_list = NULL;
gchar buf[BUFFSIZE];
gint hnum;
- PrefsAccount *ac = NULL;
+ glong fpos;
+ PrefsAccount *ac = NULL, *mailac = NULL, *newsac = NULL;
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) {
+ if (((!ac || (ac && ac->protocol != A_NNTP)) && !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 {
- if (!ac) {
+ if (ac && ac->protocol == A_NNTP) {
+ newsac = ac;
+
+ /* search mail account */
+ mailac = account_find_from_address(from);
+ if (!mailac) {
+ if (cur_account &&
+ cur_account->protocol != A_NNTP)
+ mailac = cur_account;
+ else {
+ mailac = account_get_default();
+ if (mailac->protocol == A_NNTP)
+ mailac = NULL;
+ }
+ }
+ } else if (ac) {
+ mailac = ac;
+ } else {
ac = account_find_from_smtp_server(from, server);
if (!ac) {
g_warning(_("Account not found. "
"Using current account...\n"));
ac = cur_account;
+ if (ac && ac->protocol != A_NNTP)
+ mailac = ac;
}
}
- if (ac)
- val = send_message_smtp(ac, to_list, fp);
- else {
- PrefsAccount tmp_ac;
+ fpos = ftell(fp);
+ if (to_list) {
+ if (mailac)
+ val = send_message_smtp(mailac, to_list, fp);
+ else {
+ PrefsAccount tmp_ac;
- g_warning(_("Account not found.\n"));
+ g_warning(_("Account not found.\n"));
- memset(&tmp_ac, 0, sizeof(PrefsAccount));
- tmp_ac.address = from;
- tmp_ac.smtp_server = server;
- tmp_ac.smtpport = SMTP_PORT;
- val = send_message_smtp(&tmp_ac, to_list, fp);
+ memset(&tmp_ac, 0, sizeof(PrefsAccount));
+ tmp_ac.address = from;
+ tmp_ac.smtp_server = server;
+ tmp_ac.smtpport = SMTP_PORT;
+ val = send_message_smtp(&tmp_ac, to_list, fp);
+ }
+ }
+ if (val == 0 && newsac) {
+ fseek(fp, fpos, SEEK_SET);
+ val = news_post_stream(FOLDER(newsac->folder), 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);
while (fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
- /* escape when a dot appears on the top */
- if (buf[0] == '.')
+ if (buf[0] == '.' && buf[1] == '\0')
fputc('.', pipefp);
fputs(buf, pipefp);
fputc('\n', 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 failed: %s\n"), command);
+ g_warning(_("external command `%s' failed with code `%i'\n"), command, r);
return -1;
}
#define EXIT_IF_CANCELLED() \
{ \
+ GTK_EVENTS_FLUSH(); \
if (dialog->cancelled) { \
- sock_close(smtp_sock); \
+ 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); \
+ 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 (session->sock && \
+ smtp_quit(SMTP_SESSION(session)) != 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);
- g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
- ac_prefs->smtp_server);
- log_message("%s\n", buf);
- progress_dialog_set_label(dialog->dialog, buf);
- gtk_clist_set_text(clist, 0, 2, _("Connecting"));
- GTK_EVENTS_FLUSH();
+ if (ac_prefs->pop_before_smtp
+ && (ac_prefs->protocol == A_APOP || ac_prefs->protocol == A_POP3)
+ && (time(NULL) - ac_prefs->last_pop_login_time) > (60 * ac_prefs->pop_before_smtp_timeout)) {
+ g_snprintf(buf, sizeof(buf), _("Doing POP before SMTP..."));
+ statusbar_puts_all(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);
+ }
+
+ session = smtp_session_new();
+ session->data = dialog;
+ session->ui_func = (SessionUIFunc)send_progress_dialog_update;
#if USE_SSL
- SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
- (ac_prefs->smtp_server, port, domain,
- ac_prefs->use_smtp_auth, ac_prefs->ssl_smtp)),
- "connecting to server");
+ SEND_EXIT_IF_NOTOK
+ (smtp_connect(SMTP_SESSION(session), ac_prefs->smtp_server,
+ port, domain, user, pass, ac_prefs->ssl_smtp),
+ "connecting to server");
#else
- SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
- (ac_prefs->smtp_server, port, domain,
- ac_prefs->use_smtp_auth)),
- "connecting to server");
+ SEND_EXIT_IF_NOTOK
+ (smtp_connect(SMTP_SESSION(session), ac_prefs->smtp_server,
+ port, domain, user, pass),
+ "connecting to server");
#endif
- progress_dialog_set_label(dialog->dialog, _("Sending MAIL FROM..."));
- gtk_clist_set_text(clist, 0, 2, _("Sending"));
- GTK_EVENTS_FLUSH();
+ if (user) {
+ SEND_EXIT_IF_NOTOK(smtp_auth(SMTP_SESSION(session),
+ ac_prefs->smtp_auth_type),
+ "authenticating");
+ }
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),
"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(SMTP_SESSION(session),
+ (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(SMTP_SESSION(session)), "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..."));
+ statusbar_puts_all(_("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(SMTP_SESSION(session)), "terminating data");
+ SEND_EXIT_IF_NOTOK(smtp_quit(SMTP_SESSION(session)), "sending QUIT");
- sock_close(smtp_sock);
+ statusbar_pop_all();
+
+ session_destroy(session);
send_progress_dialog_destroy(dialog);
return 0;
_("Sending message (%d / %d bytes)"), \
bytes, size); \
progress_dialog_set_label(dialog->dialog, str); \
+ statusbar_puts_all(str); \
progress_dialog_set_percentage \
(dialog->dialog, (gfloat)bytes / (gfloat)size); \
GTK_EVENTS_FLUSH(); \
#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;
progress_dialog_set_value(progress, 0.0);
- gtk_widget_show_now(progress->window);
-
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ gtk_widget_show_now(progress->window);
+ }
+
dialog->dialog = progress;
dialog->queue_list = NULL;
dialog->cancelled = FALSE;
static void send_progress_dialog_destroy(SendProgressDialog *dialog)
{
g_return_if_fail(dialog != NULL);
-
- progress_dialog_destroy(dialog->dialog);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ progress_dialog_destroy(dialog->dialog);
+ }
g_free(dialog);
}
dialog->cancelled = TRUE;
}
+
+static void send_progress_dialog_update(Session *session, SMTPPhase phase)
+{
+ gchar buf[BUFFSIZE];
+ gchar *state_str = NULL;
+ SendProgressDialog *dialog = (SendProgressDialog *)session->data;
+
+ switch (phase) {
+ case SMTP_CONNECT:
+ g_snprintf(buf, sizeof(buf),
+ _("Connecting to SMTP server: %s ..."),
+ session->server);
+ state_str = _("Connecting");
+ log_message("%s\n", buf);
+ break;
+ case SMTP_HELO:
+ g_snprintf(buf, sizeof(buf), _("Sending HELO..."));
+ state_str = _("Authenticating");
+ break;
+ case SMTP_EHLO:
+ g_snprintf(buf, sizeof(buf), _("Sending EHLO..."));
+ state_str = _("Authenticating");
+ break;
+ case SMTP_AUTH:
+ g_snprintf(buf, sizeof(buf), _("Authenticating..."));
+ state_str = _("Authenticating");
+ break;
+ case SMTP_FROM:
+ g_snprintf(buf, sizeof(buf), _("Sending MAIL FROM..."));
+ state_str = _("Sending");
+ break;
+ case SMTP_RCPT:
+ g_snprintf(buf, sizeof(buf), _("Sending RCPT TO..."));
+ state_str = _("Sending");
+ break;
+ case SMTP_DATA:
+ case SMTP_EOM:
+ g_snprintf(buf, sizeof(buf), _("Sending DATA..."));
+ state_str = _("Sending");
+ break;
+ case SMTP_QUIT:
+ g_snprintf(buf, sizeof(buf), _("Quitting..."));
+ state_str = _("Quitting");
+ break;
+ default:
+ return;
+ }
+
+ progress_dialog_set_label(dialog->dialog, buf);
+ gtk_clist_set_text(GTK_CLIST(dialog->dialog->clist), 0, 2, state_str);
+ GTK_EVENTS_FLUSH();
+}
projects / claws.git / blobdiff