* The VRFY and EXPN commands have been removed from this implementation
* because nobody uses these commands anymore, except for spammers.
*
+ * Copyright (c) 1998-2009 by the citadel.org team
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include "support.h"
#include "config.h"
#include "control.h"
-#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
#include "database.h"
-struct citsmtp { /* Information about the current session */
+typedef struct _citsmtp { /* Information about the current session */
int command_state;
char helo_node[SIZ];
char from[SIZ];
int is_lmtp;
int is_unfiltered;
int is_msa;
-};
+}citsmtp;
enum { /* Command states for login authentication */
smtp_command,
smtp_plain
};
-#define SMTP ((struct citsmtp *)CC->session_specific_data)
+#define SMTP ((citsmtp *)CC->session_specific_data)
int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
+citthread_mutex_t smtp_send_lock;
/*****************************************************************************/
*/
void smtp_greeting(int is_msa)
{
+ citsmtp *sSMTP;
char message_to_spammer[1024];
strcpy(CC->cs_clientname, "SMTP session");
CC->internal_pgm = 1;
CC->cs_flags |= CS_STEALTH;
- CC->session_specific_data = malloc(sizeof(struct citsmtp));
- memset(SMTP, 0, sizeof(struct citsmtp));
- SMTP->is_msa = is_msa;
+ CC->session_specific_data = malloc(sizeof(citsmtp));
+ memset(SMTP, 0, sizeof(citsmtp));
+ sSMTP = SMTP;
+ sSMTP->is_msa = is_msa;
/* If this config option is set, reject connections from problem
* addresses immediately instead of after they execute a RCPT
*/
- if ( (config.c_rbl_at_greeting) && (SMTP->is_msa == 0) ) {
+ if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) {
if (rbl_check(message_to_spammer)) {
if (CtdlThreadCheckStop())
cprintf("421 %s\r\n", message_to_spammer);
* LMTP is like SMTP but with some extra bonus footage added.
*/
void lmtp_greeting(void) {
+ citsmtp *sSMTP;
+
smtp_greeting(0);
+ sSMTP = SMTP;
SMTP->is_lmtp = 1;
}
* We also have an unfiltered LMTP socket that bypasses spam filters.
*/
void lmtp_unfiltered_greeting(void) {
+ citsmtp *sSMTP;
+
smtp_greeting(0);
- SMTP->is_lmtp = 1;
- SMTP->is_unfiltered = 1;
+ sSMTP = SMTP;
+ sSMTP->is_lmtp = 1;
+ sSMTP->is_unfiltered = 1;
}
* which_command: 0=HELO, 1=EHLO, 2=LHLO
*/
void smtp_hello(char *argbuf, int which_command) {
+ citsmtp *sSMTP = SMTP;
- safestrncpy(SMTP->helo_node, argbuf, sizeof SMTP->helo_node);
+ safestrncpy(sSMTP->helo_node, argbuf, sizeof sSMTP->helo_node);
- if ( (which_command != 2) && (SMTP->is_lmtp) ) {
+ if ( (which_command != 2) && (sSMTP->is_lmtp) ) {
cprintf("500 Only LHLO is allowed when running LMTP\r\n");
return;
}
- if ( (which_command == 2) && (SMTP->is_lmtp == 0) ) {
+ if ( (which_command == 2) && (sSMTP->is_lmtp == 0) ) {
cprintf("500 LHLO is only allowed when running LMTP\r\n");
return;
}
if (which_command == 0) {
cprintf("250 Hello %s (%s [%s])\r\n",
- SMTP->helo_node,
+ sSMTP->helo_node,
CC->cs_host,
CC->cs_addr
);
else {
if (which_command == 1) {
cprintf("250-Hello %s (%s [%s])\r\n",
- SMTP->helo_node,
+ sSMTP->helo_node,
CC->cs_host,
CC->cs_addr
);
* the SMTP-MSA port, not on the SMTP-MTA port, due to
* questionable reliability of TLS in certain sending MTA's.
*/
- if ( (!CC->redirect_ssl) && (SMTP->is_msa) ) {
+ if ( (!CC->redirect_ssl) && (sSMTP->is_msa) ) {
cprintf("250-STARTTLS\r\n");
}
#endif /* HAVE_OPENSSL */
void smtp_get_user(char *argbuf) {
char buf[SIZ];
char username[SIZ];
+ citsmtp *sSMTP = SMTP;
CtdlDecodeBase64(username, argbuf, SIZ);
/* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", username); */
if (CtdlLoginExistingUser(NULL, username) == login_ok) {
CtdlEncodeBase64(buf, "Password:", 9, 0);
cprintf("334 %s\r\n", buf);
- SMTP->command_state = smtp_password;
+ sSMTP->command_state = smtp_password;
}
else {
cprintf("500 No such user.\r\n");
- SMTP->command_state = smtp_command;
+ sSMTP->command_state = smtp_command;
}
}
void smtp_get_pass(char *argbuf) {
char password[SIZ];
+ memset(password, 0, sizeof(password));
CtdlDecodeBase64(password, argbuf, SIZ);
/* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
if (CtdlTryPassword(password) == pass_ok) {
void smtp_rset(int do_response) {
int is_lmtp;
int is_unfiltered;
+ citsmtp *sSMTP = SMTP;
/*
* Our entire SMTP state is discarded when a RSET command is issued,
* but we need to preserve this one little piece of information, so
* we save it for later.
*/
- is_lmtp = SMTP->is_lmtp;
- is_unfiltered = SMTP->is_unfiltered;
+ is_lmtp = sSMTP->is_lmtp;
+ is_unfiltered = sSMTP->is_unfiltered;
- memset(SMTP, 0, sizeof(struct citsmtp));
+ memset(sSMTP, 0, sizeof(citsmtp));
/*
* It is somewhat ambiguous whether we want to log out when a RSET
/*
* Reinstate this little piece of information we saved (see above).
*/
- SMTP->is_lmtp = is_lmtp;
- SMTP->is_unfiltered = is_unfiltered;
+ sSMTP->is_lmtp = is_lmtp;
+ sSMTP->is_unfiltered = is_unfiltered;
if (do_response) {
cprintf("250 Zap!\r\n");
* after the DATA command finishes.
*/
void smtp_data_clear(void) {
- strcpy(SMTP->from, "");
- strcpy(SMTP->recipients, "");
- SMTP->number_of_recipients = 0;
- SMTP->delivery_mode = 0;
- SMTP->message_originated_locally = 0;
+ citsmtp *sSMTP = SMTP;
+
+ strcpy(sSMTP->from, "");
+ strcpy(sSMTP->recipients, "");
+ sSMTP->number_of_recipients = 0;
+ sSMTP->delivery_mode = 0;
+ sSMTP->message_originated_locally = 0;
}
const char *smtp_get_Recipients(void)
{
- if (SMTP == NULL)
- return NULL;
- else return SMTP->from;
+ citsmtp *sSMTP = SMTP;
+ if (sSMTP == NULL)
+ return NULL;
+ else return sSMTP->from;
}
/*
char user[SIZ];
char node[SIZ];
char name[SIZ];
+ citsmtp *sSMTP = SMTP;
- if (!IsEmptyStr(SMTP->from)) {
+ if (!IsEmptyStr(sSMTP->from)) {
cprintf("503 Only one sender permitted\r\n");
return;
}
return;
}
- strcpy(SMTP->from, &argbuf[5]);
- striplt(SMTP->from);
- if (haschar(SMTP->from, '<') > 0) {
- stripallbut(SMTP->from, '<', '>');
+ strcpy(sSMTP->from, &argbuf[5]);
+ striplt(sSMTP->from);
+ if (haschar(sSMTP->from, '<') > 0) {
+ stripallbut(sSMTP->from, '<', '>');
}
/* We used to reject empty sender names, until it was brought to our
* address so we don't have to contend with the empty string causing
* other code to fail when it's expecting something there.
*/
- if (IsEmptyStr(SMTP->from)) {
- strcpy(SMTP->from, "someone@example.com");
+ if (IsEmptyStr(sSMTP->from)) {
+ strcpy(sSMTP->from, "someone@example.com");
}
/* If this SMTP connection is from a logged-in user, force the 'from'
* to be the user's Internet e-mail address as Citadel knows it.
*/
if (CC->logged_in) {
- safestrncpy(SMTP->from, CC->cs_inet_email, sizeof SMTP->from);
- cprintf("250 Sender ok <%s>\r\n", SMTP->from);
- SMTP->message_originated_locally = 1;
+ safestrncpy(sSMTP->from, CC->cs_inet_email, sizeof sSMTP->from);
+ cprintf("250 Sender ok <%s>\r\n", sSMTP->from);
+ sSMTP->message_originated_locally = 1;
return;
}
- else if (SMTP->is_lmtp) {
+ else if (sSMTP->is_lmtp) {
/* Bypass forgery checking for LMTP */
}
* this system (unless, of course, c_allow_spoofing is enabled)
*/
else if (config.c_allow_spoofing == 0) {
- process_rfc822_addr(SMTP->from, user, node, name);
+ process_rfc822_addr(sSMTP->from, user, node, name);
if (CtdlHostAlias(node) != hostalias_nomatch) {
cprintf("550 You must log in to send mail from %s\r\n", node);
- strcpy(SMTP->from, "");
+ strcpy(sSMTP->from, "");
return;
}
}
char recp[1024];
char message_to_spammer[SIZ];
struct recptypes *valid = NULL;
+ citsmtp *sSMTP = SMTP;
- if (IsEmptyStr(SMTP->from)) {
+ if (IsEmptyStr(sSMTP->from)) {
cprintf("503 Need MAIL before RCPT\r\n");
return;
}
return;
}
- if ( (SMTP->is_msa) && (!CC->logged_in) ) {
+ if ( (sSMTP->is_msa) && (!CC->logged_in) ) {
cprintf("550 You must log in to send mail on this port.\r\n");
- strcpy(SMTP->from, "");
+ strcpy(sSMTP->from, "");
return;
}
striplt(recp);
stripallbut(recp, '<', '>');
- if ( (strlen(recp) + strlen(SMTP->recipients) + 1 ) >= SIZ) {
+ if ( (strlen(recp) + strlen(sSMTP->recipients) + 1 ) >= SIZ) {
cprintf("452 Too many recipients\r\n");
return;
}
/* RBL check */
if ( (!CC->logged_in) /* Don't RBL authenticated users */
- && (!SMTP->is_lmtp) ) { /* Don't RBL LMTP clients */
+ && (!sSMTP->is_lmtp) ) { /* Don't RBL LMTP clients */
if (config.c_rbl_at_greeting == 0) { /* Don't RBL again if we already did it */
if (rbl_check(message_to_spammer)) {
if (CtdlThreadCheckStop())
valid = validate_recipients(recp,
smtp_get_Recipients (),
- (SMTP->is_lmtp)? POST_LMTP:
+ (sSMTP->is_lmtp)? POST_LMTP:
(CC->logged_in)? POST_LOGGED_IN:
POST_EXTERNAL);
if (valid->num_error != 0) {
}
if (valid->num_internet > 0) {
- if ( (SMTP->message_originated_locally == 0)
- && (SMTP->is_lmtp == 0) ) {
+ if ( (sSMTP->message_originated_locally == 0)
+ && (sSMTP->is_lmtp == 0) ) {
cprintf("551 <%s> - relaying denied\r\n", recp);
free_recipients(valid);
return;
}
cprintf("250 RCPT ok <%s>\r\n", recp);
- if (!IsEmptyStr(SMTP->recipients)) {
- strcat(SMTP->recipients, ",");
+ if (!IsEmptyStr(sSMTP->recipients)) {
+ strcat(sSMTP->recipients, ",");
}
- strcat(SMTP->recipients, recp);
- SMTP->number_of_recipients += 1;
+ strcat(sSMTP->recipients, recp);
+ sSMTP->number_of_recipients += 1;
if (valid != NULL) {
free_recipients(valid);
}
* Implements the DATA command
*/
void smtp_data(void) {
- char *body;
+ StrBuf *body;
+ char *defbody; //TODO: remove me
struct CtdlMessage *msg = NULL;
long msgnum = (-1L);
char nowstamp[SIZ];
int scan_errors;
int i;
char result[SIZ];
+ citsmtp *sSMTP = SMTP;
- if (IsEmptyStr(SMTP->from)) {
+ if (IsEmptyStr(sSMTP->from)) {
cprintf("503 Need MAIL command first.\r\n");
return;
}
- if (SMTP->number_of_recipients < 1) {
+ if (sSMTP->number_of_recipients < 1) {
cprintf("503 Need RCPT command first.\r\n");
return;
}
cprintf("354 Transmit message now - terminate with '.' by itself\r\n");
datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822);
- body = malloc(4096);
-
- if (body != NULL) snprintf(body, 4096,
- "Received: from %s (%s [%s])\n"
- " by %s; %s\n",
- SMTP->helo_node,
- CC->cs_host,
- CC->cs_addr,
- config.c_fqdn,
- nowstamp);
-
- body = CtdlReadMessageBody(".", config.c_maxmsglen, body, 1, 0);
+ defbody = malloc(4096);
+
+ if (defbody != NULL) {
+ if (sSMTP->is_lmtp && (CC->cs_UDSclientUID != -1)) {
+ snprintf(defbody, 4096,
+ "Received: from %s (Citadel from userid %ld)\n"
+ " by %s; %s\n",
+ sSMTP->helo_node,
+ (long int) CC->cs_UDSclientUID,
+ config.c_fqdn,
+ nowstamp);
+ }
+ else {
+ snprintf(defbody, 4096,
+ "Received: from %s (%s [%s])\n"
+ " by %s; %s\n",
+ sSMTP->helo_node,
+ CC->cs_host,
+ CC->cs_addr,
+ config.c_fqdn,
+ nowstamp);
+ }
+ }
+ body = CtdlReadMessageBodyBuf(HKEY("."), config.c_maxmsglen, defbody, 1, NULL);
if (body == NULL) {
cprintf("550 Unable to save message: internal error.\r\n");
return;
}
CtdlLogPrintf(CTDL_DEBUG, "Converting message...\n");
- msg = convert_internet_message(body);
+ msg = convert_internet_message_buf(&body);
/* If the user is locally authenticated, FORCE the From: header to
* show up as the real sender. Yes, this violates the RFC standard,
if (msg->cm_fields['P'] != NULL) {
free(msg->cm_fields['P']);
}
- msg->cm_fields['P'] = strdup(SMTP->from);
+ msg->cm_fields['P'] = strdup(sSMTP->from);
/* Set the "envelope to" address */
if (msg->cm_fields['V'] != NULL) {
free(msg->cm_fields['V']);
}
- msg->cm_fields['V'] = strdup(SMTP->recipients);
+ msg->cm_fields['V'] = strdup(sSMTP->recipients);
/* Submit the message into the Citadel system. */
- valid = validate_recipients(SMTP->recipients,
+ valid = validate_recipients(sSMTP->recipients,
smtp_get_Recipients (),
- (SMTP->is_lmtp)? POST_LMTP:
+ (sSMTP->is_lmtp)? POST_LMTP:
(CC->logged_in)? POST_LOGGED_IN:
POST_EXTERNAL);
* submission (such as virus checkers or spam filters), call them now
* and give them an opportunity to reject the message.
*/
- if (SMTP->is_unfiltered) {
+ if (sSMTP->is_unfiltered) {
scan_errors = 0;
}
else {
* have different results, we can get away with just spitting out the
* same message once for each recipient.
*/
- if (SMTP->is_lmtp) {
- for (i=0; i<SMTP->number_of_recipients; ++i) {
+ if (sSMTP->is_lmtp) {
+ for (i=0; i<sSMTP->number_of_recipients; ++i) {
cprintf("%s", result);
}
}
syslog((LOG_MAIL | LOG_INFO),
"%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s",
msgnum,
- SMTP->from,
- SMTP->number_of_recipients,
+ sSMTP->from,
+ sSMTP->number_of_recipients,
CC->cs_host,
CC->cs_addr,
result
*/
void smtp_command_loop(void) {
char cmdbuf[SIZ];
+ citsmtp *sSMTP = SMTP;
+
+ if (sSMTP == NULL) {
+ CtdlLogPrintf(CTDL_EMERG, "Session SMTP data is null. WTF? We will crash now.\n");
+ }
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
CtdlLogPrintf(CTDL_INFO, "SMTP server: %s\n", cmdbuf);
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
- if (SMTP->command_state == smtp_user) {
+ if (sSMTP->command_state == smtp_user) {
smtp_get_user(cmdbuf);
}
- else if (SMTP->command_state == smtp_password) {
+ else if (sSMTP->command_state == smtp_password) {
smtp_get_pass(cmdbuf);
}
- else if (SMTP->command_state == smtp_plain) {
+ else if (sSMTP->command_state == smtp_plain) {
smtp_try_plain(cmdbuf);
}
char mx_port[256];
int lp, rp;
char *msgtext;
- char *ptr;
+ const char *ptr;
size_t msg_size;
int scan_done;
+ CitContext *CCC=CC;
/* Parse out the host portion of the recipient address */
user, node, name);
/* Load the message out of the database */
- CC->redirect_buffer = malloc(SIZ);
- CC->redirect_len = 0;
- CC->redirect_alloc = SIZ;
+ CCC->redirect_buffer = malloc(SIZ);
+ CCC->redirect_len = 0;
+ CCC->redirect_alloc = SIZ;
CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, ESC_DOT);
msgtext = CC->redirect_buffer;
msg_size = CC->redirect_len;
- CC->redirect_buffer = NULL;
- CC->redirect_len = 0;
- CC->redirect_alloc = 0;
+ CCC->redirect_buffer = NULL;
+ CCC->redirect_len = 0;
+ CCC->redirect_alloc = 0;
/* If no envelope_from is supplied, extract one from the message */
if ( (envelope_from == NULL) || (IsEmptyStr(envelope_from)) ) {
return;
}
+ CCC->sReadBuf = NewStrBuf();
+ CCC->sMigrateBuf = NewStrBuf();
+ CCC->sPos = NULL;
+
/* Process the SMTP greeting from the server */
- if (ml_sock_gets(sock, buf) < 0) {
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP conversation");
goto bail;
/* Do a EHLO command. If it fails, try the HELO command. */
snprintf(buf, sizeof buf, "EHLO %s\r\n", config.c_fqdn);
CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
- sock_write(sock, buf, strlen(buf));
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, buf, strlen(buf));
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP HELO");
goto bail;
if (buf[0] != '2') {
snprintf(buf, sizeof buf, "HELO %s\r\n", config.c_fqdn);
CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
- sock_write(sock, buf, strlen(buf));
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, buf, strlen(buf));
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP HELO");
goto bail;
CtdlEncodeBase64(encoded, buf, strlen(mx_user) + strlen(mx_user) + strlen(mx_pass) + 2, 0);
snprintf(buf, sizeof buf, "AUTH PLAIN %s\r\n", encoded);
CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
- sock_write(sock, buf, strlen(buf));
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, buf, strlen(buf));
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP AUTH");
goto bail;
/* previous command succeeded, now try the MAIL FROM: command */
snprintf(buf, sizeof buf, "MAIL FROM:<%s>\r\n", envelope_from);
CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
- sock_write(sock, buf, strlen(buf));
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, buf, strlen(buf));
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP MAIL");
goto bail;
/* MAIL succeeded, now try the RCPT To: command */
snprintf(buf, sizeof buf, "RCPT TO:<%s@%s>\r\n", user, node);
CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
- sock_write(sock, buf, strlen(buf));
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, buf, strlen(buf));
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP RCPT");
goto bail;
/* RCPT succeeded, now try the DATA command */
CtdlLogPrintf(CTDL_DEBUG, ">DATA\n");
- sock_write(sock, "DATA\r\n", 6);
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, "DATA\r\n", 6);
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP DATA");
goto bail;
}
/* If we reach this point, the server is expecting data.*/
- sock_write(sock, msgtext, msg_size);
+ sock_write(&sock, msgtext, msg_size);
if (msgtext[msg_size-1] != 10) {
CtdlLogPrintf(CTDL_WARNING, "Possible problem: message did not "
"correctly terminate. (expecting 0x10, got 0x%02x)\n",
buf[msg_size-1]);
+ sock_write(&sock, "\r\n", 2);
}
- sock_write(sock, ".\r\n", 3);
- if (ml_sock_gets(sock, buf) < 0) {
+ sock_write(&sock, ".\r\n", 3);
+ if (ml_sock_gets(&sock, buf) < 0) {
*status = 4;
strcpy(dsn, "Connection broken during SMTP message transmit");
goto bail;
*status = 2;
CtdlLogPrintf(CTDL_DEBUG, ">QUIT\n");
- sock_write(sock, "QUIT\r\n", 6);
- ml_sock_gets(sock, buf);
+ sock_write(&sock, "QUIT\r\n", 6);
+ ml_sock_gets(&sock, buf);
CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
CtdlLogPrintf(CTDL_INFO, "SMTP client: delivery to <%s> @ <%s> (%s) succeeded\n",
user, node, name);
bail: free(msgtext);
- sock_close(sock);
+ FreeStrBuf(&CCC->sReadBuf);
+ FreeStrBuf(&CCC->sMigrateBuf);
+ if (sock != -1)
+ sock_close(sock);
/* Write something to the syslog (which may or may not be where the
* rest of the Citadel logs are going; some sysadmins want LOG_MAIL).
+
/*
* smtp_do_queue()
*
* Run through the queue sending out messages.
*/
-void smtp_do_queue(void) {
- static int doing_queue = 0;
+void *smtp_do_queue(void *arg) {
int num_processed = 0;
+ struct CitContext smtp_queue_CC;
- /*
- * This is a simple concurrency check to make sure only one queue run
- * is done at a time. We could do this with a mutex, but since we
- * don't really require extremely fine granularity here, we'll do it
- * with a static variable instead.
- */
- if (doing_queue) return;
- doing_queue = 1;
-
- /*
- * Go ahead and run the queue
- */
CtdlLogPrintf(CTDL_INFO, "SMTP client: processing outbound queue\n");
- if (getroom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
+ CtdlFillSystemContext(&smtp_queue_CC, "SMTP Send");
+ citthread_setspecific(MyConKey, (void *)&smtp_queue_CC );
+
+ if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
- return;
}
- num_processed = CtdlForEachMessage(MSGS_ALL, 0L, NULL, SPOOLMIME, NULL, smtp_do_procmsg, NULL);
+ else {
+ num_processed = CtdlForEachMessage(MSGS_ALL, 0L, NULL, SPOOLMIME, NULL, smtp_do_procmsg, NULL);
+ }
+ citthread_mutex_unlock (&smtp_send_lock);
CtdlLogPrintf(CTDL_INFO, "SMTP client: queue run completed; %d messages processed\n", num_processed);
- run_queue_now = 0;
- doing_queue = 0;
+ return(NULL);
+}
+
+
+
+/*
+ * smtp_queue_thread
+ *
+ * Create a thread to run the SMTP queue
+ *
+ * This was created as a response to a situation seen on Uncensored where a bad remote was holding
+ * up SMTP sending for long times.
+ * Converting to a thread does not fix the problem caused by the bad remote but it does prevent
+ * the SMTP sending from stopping housekeeping and the EVT_TIMER event system which in turn prevented
+ * other things from happening.
+ */
+void smtp_queue_thread (void)
+{
+ if (citthread_mutex_trylock (&smtp_send_lock)) {
+ CtdlLogPrintf(CTDL_DEBUG, "SMTP queue run already in progress\n");
+ }
+ else {
+ CtdlThreadCreate("SMTP Send", CTDLTHREAD_BIGSTACK, smtp_do_queue, NULL);
+ }
+}
+
+
+
+void smtp_server_going_down (void)
+{
+ CtdlLogPrintf(CTDL_DEBUG, "SMTP module clean up for shutdown.\n");
+
+ citthread_mutex_destroy (&smtp_send_lock);
}
* Create the room. This will silently fail if the room already
* exists, and that's perfectly ok, because we want it to exist.
*/
- create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
+ CtdlCreateRoom(SMTP_SPOOLOUT_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
/*
* Make sure it's set to be a "system room" so it doesn't show up
* in the <K>nown rooms list for Aides.
*/
- if (lgetroom(&qrbuf, SMTP_SPOOLOUT_ROOM) == 0) {
+ if (CtdlGetRoomLock(&qrbuf, SMTP_SPOOLOUT_ROOM) == 0) {
qrbuf.QRflags2 |= QR2_SYSTEM;
- lputroom(&qrbuf);
+ CtdlPutRoomLock(&qrbuf);
}
}
CitadelServiceSMTP_LMTP_UNF);
smtp_init_spoolout();
- CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
+ CtdlRegisterSessionHook(smtp_queue_thread, EVT_TIMER);
CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP);
CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
+ CtdlRegisterCleanupHook (smtp_server_going_down);
+ citthread_mutex_init (&smtp_send_lock, NULL);
}
/* return our Subversion id for the Log */
projects / citadel.git / blobdiff