/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "ssl.h"
#include "smtp.h"
#include "esmtp.h"
+#include "prefs_common.h"
#include "prefs_account.h"
#include "account.h"
#include "compose.h"
#include "progressdialog.h"
+#include "inputdialog.h"
#include "manage_window.h"
#include "procmsg.h"
#include "procheader.h"
#include "utils.h"
#include "gtkutils.h"
-#define SMTP_PORT 25
-#if USE_SSL
-#define SSMTP_PORT 465
-#endif
-
typedef struct _SendProgressDialog SendProgressDialog;
struct _SendProgressDialog
};
#if USE_SSL
-static gint send_message_smtp (GSList *to_list, const gchar *from,
- const gchar *server, gushort port,
- const gchar *domain, const gchar *userid,
- const gchar *passwd, gboolean use_smtp_auth,
- SSLSMTPType ssl_type, FILE *fp);
static SockInfo *send_smtp_open (const gchar *server, gushort port,
const gchar *domain, gboolean use_smtp_auth,
SSLSMTPType ssl_type);
#else
-static gint send_message_smtp (GSList *to_list, const gchar *from,
- const gchar *server, gushort port,
- const gchar *domain, const gchar *userid,
- const gchar *passwd, gboolean use_smtp_auth,
- FILE *fp);
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);
+
static SendProgressDialog *send_progress_dialog_create(void);
static void send_progress_dialog_destroy(SendProgressDialog *dialog);
static void send_cancel(GtkWidget *widget, gpointer data);
-static gint send_message_with_command(GSList *to_list, gchar * mailcmd,
- FILE * fp);
gint send_message(const gchar *file, PrefsAccount *ac_prefs, GSList *to_list)
{
FILE *fp;
gint val;
- gushort port;
- gchar *domain;
g_return_val_if_fail(file != NULL, -1);
g_return_val_if_fail(ac_prefs != NULL, -1);
return -1;
}
- if (ac_prefs->protocol == A_LOCAL && ac_prefs->use_mail_command) {
- val = send_message_with_command(to_list,
- ac_prefs->mail_command,
- fp);
- } else {
-#if USE_SSL
- port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
- ac_prefs->ssl_smtp == SSL_SMTP_TUNNEL ? SSMTP_PORT : SMTP_PORT;
-#else
- port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
-#endif
- domain = ac_prefs->set_domain ? ac_prefs->domain : NULL;
+ printf("account: %p\n", ac_prefs);
-#if USE_SSL
- val = send_message_smtp(to_list, ac_prefs->address,
- ac_prefs->smtp_server, port, domain,
- ac_prefs->userid, ac_prefs->passwd,
- ac_prefs->use_smtp_auth, ac_prefs->ssl_smtp,
- fp);
-#else
- val = send_message_smtp(to_list, ac_prefs->address,
- ac_prefs->smtp_server, port, domain,
- ac_prefs->userid, ac_prefs->passwd,
- ac_prefs->use_smtp_auth, fp);
-#endif
+ 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;
+ }
+ else {
+ val = send_message_smtp(ac_prefs, to_list, fp);
+
+ fclose(fp);
+ return val;
}
-
- fclose(fp);
- return val;
}
enum
{
Q_SENDER = 0,
Q_SMTPSERVER = 1,
- Q_RECIPIENTS = 2
+ Q_RECIPIENTS = 2,
+ Q_ACCOUNT_ID = 3
};
-static gint send_message_with_command(GSList *to_list, gchar * mailcmd,
- FILE * fp)
-{
- FILE * p;
- int len;
- gchar * cmdline;
- GSList *cur;
- gchar buf[BUFFSIZE];
-
- len = strlen(mailcmd);
- for (cur = to_list; cur != NULL; cur = cur->next)
- len += strlen((gchar *)cur->data) + 1;
-
- cmdline = g_new(gchar, len + 1);
- strcpy(cmdline, mailcmd);
-
- for (cur = to_list; cur != NULL; cur = cur->next) {
- cmdline = strncat(cmdline, " ", len);
- cmdline = strncat(cmdline, (gchar *)cur->data, len);
- }
-
- log_message(_("Using command to send mail: %s ...\n"), cmdline);
-
- p = popen(cmdline, "w");
- if (p != NULL) {
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- strretchomp(buf);
-
- /* escape when a dot appears on the top */
- if (buf[0] == '.')
- fputs(".", p);
-
- fputs(buf, p);
- fputs("\n", p);
- }
- pclose(p);
- }
-
- log_message(_("Mail sent successfully ...\n"));
-
- return 0;
-}
-
+#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;
GSList *to_list = NULL;
gchar buf[BUFFSIZE];
gint hnum;
+ PrefsAccount *ac = NULL;
g_return_val_if_fail(file != NULL, -1);
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 (!to_list || !from || !server) {
+ 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 {
- gushort port;
- gchar *domain;
- PrefsAccount *ac;
-
- ac = account_find_from_smtp_server(from, server);
if (!ac) {
- g_warning(_("Account not found. Using current account...\n"));
- ac = cur_account;
+ ac = account_find_from_smtp_server(from, server);
+ if (!ac) {
+ g_warning(_("Account not found. "
+ "Using current account...\n"));
+ ac = cur_account;
+ }
}
- if (ac) {
-#if USE_SSL
- port = ac->set_smtpport ? ac->smtpport :
- ac->ssl_smtp == SSL_SMTP_TUNNEL ?
- SSMTP_PORT : SMTP_PORT;
-#else
- port = ac->set_smtpport ? ac->smtpport : SMTP_PORT;
-#endif
- domain = ac->set_domain ? ac->domain : NULL;
-#if USE_SSL
- val = send_message_smtp
- (to_list, from, server, port, domain,
- ac->userid, ac->passwd, ac->use_smtp_auth,
- ac->ssl_smtp, fp);
-#else
- val = send_message_smtp
- (to_list, from, server, port, domain,
- ac->userid, ac->passwd, ac->use_smtp_auth, fp);
-#endif
- } else {
+ if (ac)
+ val = send_message_smtp(ac, to_list, fp);
+ else {
+ PrefsAccount tmp_ac;
+
g_warning(_("Account not found.\n"));
-#if USE_SSL
- val = send_message_smtp
- (to_list, from, server, SMTP_PORT, NULL,
- NULL, NULL, FALSE, FALSE, fp);
-#else
- val = send_message_smtp
- (to_list, from, server, SMTP_PORT, NULL,
- NULL, NULL, FALSE, fp);
-#endif
+
+ 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);
}
}
return val;
}
+#endif
+
+gint send_message_local(const gchar *command, FILE *fp)
+{
+ FILE *pipefp;
+ gchar buf[BUFFSIZE];
+ int r;
+
+ 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);
+ return -1;
+ }
+
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ strretchomp(buf);
+ /* escape when a dot appears on the top */
+ if (buf[0] == '.')
+ fputc('.', pipefp);
+ fputs(buf, pipefp);
+ fputc('\n', pipefp);
+ }
+
+ r = pclose(pipefp);
+ if (r != 0) {
+ g_warning(_("external command failed: %s\n"), command);
+ return -1;
+ }
+
+ return 0;
+}
#define EXIT_IF_CANCELLED() \
{ \
#define SEND_EXIT_IF_NOTOK(f, s) \
{ \
+ gint ok; \
+ \
EXIT_IF_CANCELLED(); \
- if ((f) != SM_OK) { \
+ if ((ok = (f)) != SM_OK) { \
log_warning("Error occurred while %s\n", s); \
+ if (ok == SM_AUTHFAIL) { \
+ log_warning("SMTP AUTH failed\n"); \
+ if (ac_prefs->tmp_pass) { \
+ g_free(ac_prefs->tmp_pass); \
+ ac_prefs->tmp_pass = NULL; \
+ } \
+ if (ac_prefs->tmp_smtp_pass) { \
+ g_free(ac_prefs->tmp_smtp_pass); \
+ 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 USE_SSL
-static gint send_message_smtp(GSList *to_list, const gchar *from,
- const gchar *server, gushort port,
- const gchar *domain, const gchar *userid,
- const gchar *passwd, gboolean use_smtp_auth,
- SSLSMTPType ssl_type, FILE *fp)
-#else
-static gint send_message_smtp(GSList *to_list, const gchar *from,
- const gchar *server, gushort port,
- const gchar *domain, const gchar *userid,
- const gchar *passwd, gboolean use_smtp_auth,
+gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list,
FILE *fp)
-#endif
{
SockInfo *smtp_sock = NULL;
SendProgressDialog *dialog;
GtkCList *clist;
const gchar *text[3];
gchar buf[BUFFSIZE];
- gchar str[BUFFSIZE];
+ gushort port;
+ gchar *domain;
+ gchar *user = NULL;
+ gchar *pass = NULL;
GSList *cur;
gint size;
- gint bytes = 0;
- struct timeval tv_prev, tv_cur;
+ g_return_val_if_fail(ac_prefs != NULL, -1);
+ g_return_val_if_fail(ac_prefs->address != NULL, -1);
+ g_return_val_if_fail(ac_prefs->smtp_server != NULL, -1);
g_return_val_if_fail(to_list != NULL, -1);
- g_return_val_if_fail(from != NULL, -1);
- g_return_val_if_fail(server != NULL, -1);
g_return_val_if_fail(fp != NULL, -1);
size = get_left_file_size(fp);
if (size < 0) return -1;
+#if USE_SSL
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
+ ac_prefs->ssl_smtp == SSL_SMTP_TUNNEL ? SSMTP_PORT : SMTP_PORT;
+#else
+ port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT;
+#endif
+ domain = ac_prefs->set_domain ? ac_prefs->domain : NULL;
+
+ if (ac_prefs->use_smtp_auth) {
+ if (ac_prefs->smtp_userid) {
+ user = ac_prefs->smtp_userid;
+ if (ac_prefs->smtp_passwd)
+ pass = ac_prefs->smtp_passwd;
+ else if (ac_prefs->tmp_smtp_pass)
+ pass = ac_prefs->tmp_smtp_pass;
+ else {
+ pass = input_dialog_query_password
+ (ac_prefs->smtp_server, user);
+ if (!pass) pass = g_strdup("");
+ ac_prefs->tmp_smtp_pass = pass;
+ }
+ } else {
+ user = ac_prefs->userid;
+ if (ac_prefs->passwd)
+ pass = ac_prefs->passwd;
+ else if (ac_prefs->tmp_pass)
+ pass = ac_prefs->tmp_pass;
+ else {
+ pass = input_dialog_query_password
+ (ac_prefs->smtp_server, user);
+ if (!pass) pass = g_strdup("");
+ ac_prefs->tmp_pass = pass;
+ }
+ }
+ }
+
dialog = send_progress_dialog_create();
text[0] = NULL;
- text[1] = server;
+ text[1] = ac_prefs->smtp_server;
text[2] = _("Standby");
clist = GTK_CLIST(dialog->dialog->clist);
gtk_clist_append(clist, (gchar **)text);
g_snprintf(buf, sizeof(buf), _("Connecting to SMTP server: %s ..."),
- server);
+ ac_prefs->smtp_server);
log_message("%s\n", buf);
progress_dialog_set_label(dialog->dialog, buf);
gtk_clist_set_text(clist, 0, 2, _("Connecting"));
#if USE_SSL
SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
- (server, port, domain, use_smtp_auth, ssl_type)),
+ (ac_prefs->smtp_server, port, domain,
+ ac_prefs->use_smtp_auth, ac_prefs->ssl_smtp)),
"connecting to server");
#else
SEND_EXIT_IF_ERROR((smtp_sock = send_smtp_open
- (server, port, domain, use_smtp_auth)),
+ (ac_prefs->smtp_server, port, domain,
+ ac_prefs->use_smtp_auth)),
"connecting to server");
#endif
GTK_EVENTS_FLUSH();
SEND_EXIT_IF_NOTOK
- (smtp_from(smtp_sock, from, userid, passwd, use_smtp_auth),
+ (smtp_from(smtp_sock, ac_prefs->address, user, pass,
+ ac_prefs->use_smtp_auth),
"sending MAIL FROM");
progress_dialog_set_label(dialog->dialog, _("Sending RCPT TO..."));
SEND_EXIT_IF_NOTOK(smtp_data(smtp_sock), "sending DATA");
+ /* send main part */
+ SEND_EXIT_IF_ERROR(send_message_data(dialog, smtp_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");
+
+ sock_close(smtp_sock);
+ send_progress_dialog_destroy(dialog);
+
+ return 0;
+}
+
+#undef EXIT_IF_CANCELLED
+#undef SEND_EXIT_IF_ERROR
+#undef SEND_EXIT_IF_NOTOK
+
+#define EXIT_IF_CANCELLED() \
+{ \
+ if (dialog->cancelled) return -1; \
+}
+
+#define SEND_EXIT_IF_ERROR(f) \
+{ \
+ EXIT_IF_CANCELLED(); \
+ if ((f) <= 0) return -1; \
+}
+
+#define SEND_DIALOG_UPDATE() \
+{ \
+ gettimeofday(&tv_cur, NULL); \
+ if (tv_cur.tv_sec - tv_prev.tv_sec > 0 || \
+ tv_cur.tv_usec - tv_prev.tv_usec > UI_REFRESH_INTERVAL) { \
+ g_snprintf(str, sizeof(str), \
+ _("Sending message (%d / %d bytes)"), \
+ bytes, size); \
+ progress_dialog_set_label(dialog->dialog, str); \
+ progress_dialog_set_percentage \
+ (dialog->dialog, (gfloat)bytes / (gfloat)size); \
+ GTK_EVENTS_FLUSH(); \
+ gettimeofday(&tv_prev, NULL); \
+ } \
+}
+
+static gint send_message_data(SendProgressDialog *dialog, SockInfo *sock,
+ FILE *fp, gint size)
+{
+ gchar buf[BUFFSIZE];
+ gchar str[BUFFSIZE];
+ gint bytes = 0;
+ struct timeval tv_prev, tv_cur;
+
gettimeofday(&tv_prev, NULL);
- /* send main part */
+ /* output header part */
while (fgets(buf, sizeof(buf), fp) != NULL) {
bytes += strlen(buf);
strretchomp(buf);
- gettimeofday(&tv_cur, NULL);
- if (tv_cur.tv_sec - tv_prev.tv_sec > 0 ||
- tv_cur.tv_usec - tv_prev.tv_usec > UI_REFRESH_INTERVAL) {
- g_snprintf(str, sizeof(str),
- _("Sending message (%d / %d bytes)"),
- bytes, size);
- progress_dialog_set_label(dialog->dialog, str);
- progress_dialog_set_percentage
- (dialog->dialog, (gfloat)bytes / (gfloat)size);
- GTK_EVENTS_FLUSH();
- gettimeofday(&tv_prev, NULL);
+ SEND_DIALOG_UPDATE();
+
+ if (!g_strncasecmp(buf, "Bcc:", 4)) {
+ gint next;
+
+ for (;;) {
+ next = fgetc(fp);
+ if (next == EOF)
+ break;
+ else if (next != ' ' && next != '\t') {
+ ungetc(next, fp);
+ break;
+ }
+ if (fgets(buf, sizeof(buf), fp) == NULL)
+ break;
+ else
+ bytes += strlen(buf);
+ }
+ } else {
+ SEND_EXIT_IF_ERROR(sock_puts(sock, buf));
+ if (buf[0] == '\0')
+ break;
}
+ }
+
+ /* output body part */
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ bytes += strlen(buf);
+ strretchomp(buf);
+
+ SEND_DIALOG_UPDATE();
/* escape when a dot appears on the top */
if (buf[0] == '.')
- SEND_EXIT_IF_ERROR(sock_write(smtp_sock, ".", 1),
- "sending data");
+ SEND_EXIT_IF_ERROR(sock_write(sock, ".", 1));
- SEND_EXIT_IF_ERROR(sock_puts(smtp_sock, buf), "sending data");
+ SEND_EXIT_IF_ERROR(sock_puts(sock, buf));
}
- progress_dialog_set_label(dialog->dialog, _("Quitting..."));
+ g_snprintf(str, sizeof(str), _("Sending message (%d / %d bytes)"),
+ bytes, size);
+ progress_dialog_set_label(dialog->dialog, str);
+ progress_dialog_set_percentage
+ (dialog->dialog, (gfloat)bytes / (gfloat)size);
GTK_EVENTS_FLUSH();
- SEND_EXIT_IF_NOTOK(smtp_eom(smtp_sock), "terminating data");
- SEND_EXIT_IF_NOTOK(smtp_quit(smtp_sock), "sending QUIT");
-
- sock_close(smtp_sock);
- send_progress_dialog_destroy(dialog);
-
return 0;
}
+#undef EXIT_IF_CANCELLED
+#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,
projects / claws.git / blobdiff