#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkwindow.h>
-#include <gtk/gtkclist.h>
#include <stdio.h>
#include <string.h>
#include <signal.h>
-#include "intl.h"
#include "send_message.h"
#include "session.h"
#include "ssl.h"
#include "inputdialog.h"
#include "alertpanel.h"
#include "manage_window.h"
+#include "socket.h"
#include "utils.h"
#include "gtkutils.h"
#include "inc.h"
Session *session;
gboolean cancelled;
};
-#if 0
-static gint send_message_local (const gchar *command,
- FILE *fp);
-static gint send_message_smtp (PrefsAccount *ac_prefs,
- GSList *to_list,
- FILE *fp);
-#endif
static gint send_recv_message (Session *session,
const gchar *msg,
Q_ACCOUNT_ID = 3
};
-#if 0
-gint send_message_queue(const gchar *file)
-{
- static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
- {"SSV:", NULL, FALSE},
- {"R:", NULL, FALSE},
- {"AID:", NULL, FALSE},
- {NULL, NULL, FALSE}};
- FILE *fp;
- gint val = 0;
- gchar *from = NULL;
- gchar *server = NULL;
- GSList *to_list = NULL;
- gchar buf[BUFFSIZE];
- gint hnum;
- glong fpos;
- PrefsAccount *ac = NULL, *mailac = NULL, *newsac = NULL;
-
- g_return_val_if_fail(file != NULL, -1);
-
- if ((fp = fopen(file, "rb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- return -1;
- }
-
- while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
- != -1) {
- gchar *p;
-
- p = buf + strlen(qentry[hnum].name);
-
- switch (hnum) {
- case Q_SENDER:
- if (!from) from = g_strdup(p);
- break;
- case Q_SMTPSERVER:
- if (!server) server = g_strdup(p);
- break;
- case Q_RECIPIENTS:
- to_list = address_list_append(to_list, p);
- break;
- case Q_ACCOUNT_ID:
- ac = account_find_from_id(atoi(p));
- break;
- default:
- break;
- }
- }
-
- if (((!ac || (ac && ac->protocol != A_NNTP)) && !to_list) || !from) {
- g_warning("Queued message header is broken.\n");
- val = -1;
- } else if (prefs_common.use_extsend && prefs_common.extsend_cmd) {
- val = send_message_local(prefs_common.extsend_cmd, fp);
- } else {
- 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;
- }
- }
-
- 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");
-
- 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);
- if (val < 0)
- alertpanel_error_log(_("Error occurred while posting the message to %s ."),
- newsac->nntp_server);
- }
- }
-
- slist_free_strings(to_list);
- g_slist_free(to_list);
- g_free(from);
- g_free(server);
- fclose(fp);
-
- return val;
-}
-#endif
-
gint send_message_local(const gchar *command, FILE *fp)
{
- FILE *pipefp;
+ gchar **argv;
+ GPid pid;
+ gint child_stdin;
gchar buf[BUFFSIZE];
- int r;
- sigset_t osig, mask;
+ gboolean err = FALSE;
g_return_val_if_fail(command != NULL, -1);
g_return_val_if_fail(fp != NULL, -1);
- pipefp = popen(command, "w");
- if (!pipefp) {
- g_warning("Can't execute external command: %s\n", command);
+ log_message(_("Sending message using command: %s\n"), command);
+
+ argv = strsplit_with_quote(command, " ", 0);
+
+ if (g_spawn_async_with_pipes(NULL, argv, NULL, 0, NULL, NULL, &pid,
+ &child_stdin, NULL, NULL, NULL) == FALSE) {
+ g_snprintf(buf, sizeof(buf),
+ _("Can't execute command: %s"), command);
+ log_warning("%s\n", buf);
+ alertpanel_error("%s", buf);
+ g_strfreev(argv);
return -1;
}
+ g_strfreev(argv);
while (fgets(buf, sizeof(buf), fp) != NULL) {
strretchomp(buf);
- fputs(buf, pipefp);
- fputc('\n', pipefp);
+ if (buf[0] == '.' && buf[1] == '\0') {
+ if (fd_write_all(child_stdin, ".", 1) < 0) {
+ err = TRUE;
+ break;
+ }
+ }
+ if (fd_write_all(child_stdin, buf, strlen(buf)) < 0 ||
+ fd_write_all(child_stdin, "\n", 1) < 0) {
+ err = TRUE;
+ break;
+ }
}
- /* 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);
+ fd_close(child_stdin);
+ g_spawn_close_pid(pid);
- sigprocmask(SIG_SETMASK, &osig, NULL);
- if (r != 0) {
- g_warning("external command `%s' failed with code `%i'\n", command, r);
+ if (err) {
+ g_snprintf(buf, sizeof(buf),
+ _("Error occurred while executing command: %s"),
+ command);
+ log_warning("%s\n", buf);
+ alertpanel_error("%s", buf);
return -1;
}
return 0;
}
-gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
+gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, gboolean keep_session)
{
Session *session;
SMTPSession *smtp_session;
- gushort port;
+ gushort port = 0;
SendProgressDialog *dialog;
- GtkCList *clist;
- const gchar *text[3];
gchar buf[BUFFSIZE];
gint ret = 0;
+ gboolean was_inited = FALSE;
g_return_val_if_fail(ac_prefs != NULL, -1);
g_return_val_if_fail(ac_prefs->address != NULL, -1);
g_return_val_if_fail(to_list != NULL, -1);
g_return_val_if_fail(fp != NULL, -1);
- session = smtp_session_new();
- smtp_session = SMTP_SESSION(session);
-
- smtp_session->hostname =
- ac_prefs->set_domain ? g_strdup(ac_prefs->domain) : NULL;
-
- if (ac_prefs->use_smtp_auth) {
- smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
- if (ac_prefs->smtp_userid && strlen(ac_prefs->smtp_userid)) {
- smtp_session->user = g_strdup(ac_prefs->smtp_userid);
- if (ac_prefs->smtp_passwd)
- smtp_session->pass =
- g_strdup(ac_prefs->smtp_passwd);
- else if (ac_prefs->tmp_smtp_pass)
- smtp_session->pass =
- g_strdup(ac_prefs->tmp_smtp_pass);
- else {
- smtp_session->pass =
- input_dialog_query_password
- (ac_prefs->smtp_server,
- smtp_session->user);
- if (!smtp_session->pass)
- smtp_session->pass = g_strdup("");
- ac_prefs->tmp_smtp_pass =
- g_strdup(smtp_session->pass);
+ if (!ac_prefs->session) {
+ /* we can't reuse a previously initialised session */
+ session = smtp_session_new();
+ smtp_session = SMTP_SESSION(session);
+
+ smtp_session->hostname =
+ ac_prefs->set_domain ? g_strdup(ac_prefs->domain) : NULL;
+
+ if (ac_prefs->use_smtp_auth) {
+ smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
+ if (ac_prefs->smtp_userid && strlen(ac_prefs->smtp_userid)) {
+ smtp_session->user = g_strdup(ac_prefs->smtp_userid);
+ if (ac_prefs->smtp_passwd)
+ smtp_session->pass =
+ g_strdup(ac_prefs->smtp_passwd);
+ else if (ac_prefs->tmp_smtp_pass)
+ smtp_session->pass =
+ g_strdup(ac_prefs->tmp_smtp_pass);
+ else {
+ smtp_session->pass =
+ input_dialog_query_password
+ (ac_prefs->smtp_server,
+ smtp_session->user);
+ if (!smtp_session->pass)
+ smtp_session->pass = g_strdup("");
+ ac_prefs->tmp_smtp_pass =
+ g_strdup(smtp_session->pass);
+ }
+ } else {
+ smtp_session->user = g_strdup(ac_prefs->userid);
+ if (ac_prefs->passwd)
+ smtp_session->pass = g_strdup(ac_prefs->passwd);
+ else if (ac_prefs->tmp_pass)
+ smtp_session->pass =
+ g_strdup(ac_prefs->tmp_pass);
+ else {
+ smtp_session->pass =
+ input_dialog_query_password
+ (ac_prefs->smtp_server,
+ smtp_session->user);
+ if (!smtp_session->pass)
+ smtp_session->pass = g_strdup("");
+ ac_prefs->tmp_pass =
+ g_strdup(smtp_session->pass);
+ }
}
} else {
- smtp_session->user = g_strdup(ac_prefs->userid);
- if (ac_prefs->passwd)
- smtp_session->pass = g_strdup(ac_prefs->passwd);
- else if (ac_prefs->tmp_pass)
- smtp_session->pass =
- g_strdup(ac_prefs->tmp_pass);
- else {
- smtp_session->pass =
- input_dialog_query_password
- (ac_prefs->smtp_server,
- smtp_session->user);
- if (!smtp_session->pass)
- smtp_session->pass = g_strdup("");
- ac_prefs->tmp_pass =
- g_strdup(smtp_session->pass);
- }
+ smtp_session->user = NULL;
+ smtp_session->pass = NULL;
+ }
+
+ #if USE_OPENSSL
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
+ ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
+ session->ssl_type = ac_prefs->ssl_smtp;
+ if (ac_prefs->ssl_smtp != SSL_NONE)
+ session->nonblocking = ac_prefs->use_nonblocking_ssl;
+ #else
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
+ #endif
+
+ dialog = send_progress_dialog_create();
+ dialog->session = session;
+ smtp_session->dialog = dialog;
+
+ progress_dialog_list_set(dialog->dialog, 0, NULL,
+ ac_prefs->smtp_server,
+ _("Connecting"));
+
+ 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..."));
+ log_message(buf);
+ progress_dialog_set_label(dialog->dialog, buf);
+ progress_dialog_list_set_status(dialog->dialog, 0, _("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);
+ progress_dialog_set_label(dialog->dialog, buf);
+ log_message("%s\n", buf);
+
+ session_set_recv_message_notify(session, send_recv_message, dialog);
+ session_set_send_data_progressive_notify
+ (session, send_send_data_progressive, dialog);
+ session_set_send_data_notify(session, send_send_data_finished, dialog);
+
+ ac_prefs->session = SMTP_SESSION(session);
} else {
- smtp_session->user = NULL;
- smtp_session->pass = NULL;
+ /* everything is ready to start at MAIL FROM:, just
+ * reinit useful variables.
+ */
+ session = SESSION(ac_prefs->session);
+ smtp_session = SMTP_SESSION(session);
+ smtp_session->state = SMTP_HELO;
+ dialog = (SendProgressDialog *)smtp_session->dialog;
+ was_inited = TRUE;
}
+ /* This has to be initialised for every mail sent */
smtp_session->from = g_strdup(ac_prefs->address);
smtp_session->to_list = to_list;
smtp_session->cur_to = to_list;
smtp_session->send_data = get_outgoing_rfc2822_str(fp);
smtp_session->send_data_len = strlen(smtp_session->send_data);
-#if USE_OPENSSL
- port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
- ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
- session->ssl_type = ac_prefs->ssl_smtp;
- if (ac_prefs->ssl_smtp != SSL_NONE)
- session->nonblocking = ac_prefs->use_nonblocking_ssl;
-#else
- port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
-#endif
-
- dialog = send_progress_dialog_create();
- dialog->session = session;
-
- text[0] = NULL;
- text[1] = ac_prefs->smtp_server;
- text[2] = _("Connecting");
- 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)
- && (time(NULL) - ac_prefs->last_pop_login_time) > (60 * ac_prefs->pop_before_smtp_timeout)) {
- g_snprintf(buf, sizeof(buf), _("Doing POP before SMTP..."));
- log_message(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);
- progress_dialog_set_label(dialog->dialog, buf);
- log_message("%s\n", buf);
-
- session_set_recv_message_notify(session, send_recv_message, dialog);
- session_set_send_data_progressive_notify
- (session, send_send_data_progressive, dialog);
- session_set_send_data_notify(session, send_send_data_finished, dialog);
-
- if (session_connect(session, ac_prefs->smtp_server, port) < 0) {
+ /* connect if necessary */
+ if (!was_inited && session_connect(session, ac_prefs->smtp_server, port) < 0) {
session_destroy(session);
send_progress_dialog_destroy(dialog);
return -1;
debug_print("send_message_smtp(): begin event loop\n");
- while (session_is_connected(session) && dialog->cancelled == FALSE)
+ if (was_inited) {
+ /* as the server is quiet, start sending ourselves */
+ smtp_from(smtp_session);
+ }
+
+ while (session_is_connected(session) && dialog->cancelled == FALSE
+ && SMTP_SESSION(session)->state != SMTP_MAIL_SENT_OK)
gtk_main_iteration();
if (SMTP_SESSION(session)->error_val == SM_AUTHFAIL) {
ac_prefs->tmp_smtp_pass = NULL;
}
ret = -1;
+ } else if (SMTP_SESSION(session)->state == SMTP_MAIL_SENT_OK) {
+ log_message("%s\n", _("Mail sent successfully."));
+ ret = 0;
+ } else if (session->state == SESSION_EOF &&
+ SMTP_SESSION(session)->state == SMTP_QUIT) {
+ /* consider EOF right after QUIT successful */
+ log_warning("%s\n", _("Connection closed by the remote host."));
+ ret = 0;
} else if (session->state == SESSION_ERROR ||
session->state == SESSION_EOF ||
session->state == SESSION_TIMEOUT ||
manage_window_focus_out(dialog->dialog->window, NULL, NULL);
}
- session_destroy(session);
- send_progress_dialog_destroy(dialog);
+ /* if we should close the connection, let's do it.
+ * Close it in case of error, too, as it helps reinitializing things
+ * easier.
+ */
+ if (!keep_session || ret != 0) {
+ if (session_is_connected(session))
+ smtp_quit(smtp_session);
+ while (session_is_connected(session))
+ gtk_main_iteration();
+ session_destroy(session);
+ ac_prefs->session = NULL;
+ send_progress_dialog_destroy(dialog);
+ } else {
+ g_free(smtp_session->from);
+ g_free(smtp_session->send_data);
+ g_free(smtp_session->error_msg);
+ }
statusbar_pop_all();
statusbar_verbosity_set(FALSE);
return ret;
}
+gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp)
+{
+ return send_message_smtp_full(ac_prefs, to_list, fp, FALSE);
+}
+
static gint send_recv_message(Session *session, const gchar *msg, gpointer data)
{
gchar buf[BUFFSIZE];
}
progress_dialog_set_label(dialog->dialog, buf);
- gtk_clist_set_text(GTK_CLIST(dialog->dialog->clist), 0, 2, state_str);
+ progress_dialog_list_set_status(dialog->dialog, 0, state_str);
return 0;
}
g_snprintf(buf, sizeof(buf), _("Sending message (%d / %d bytes)"),
cur_len, total_len);
progress_dialog_set_label(dialog->dialog, buf);
- progress_dialog_set_percentage
+ progress_dialog_set_fraction
(dialog->dialog, (gfloat)cur_len / (gfloat)total_len);
return 0;
gtk_window_set_modal(GTK_WINDOW(progress->window), TRUE);
manage_window_set_transient(GTK_WINDOW(progress->window));
- progress_dialog_set_value(progress, 0.0);
+ progress_dialog_get_fraction(progress);
if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
gtk_widget_show_now(progress->window);
projects / claws.git / blobdiff