*
* This is the new, exciting, clever version that makes libcurl do all the work :)
*
- * Copyright (c) 1997-2018 by the citadel.org team
+ * Copyright (c) 1997-2020 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as published
int bytes_sent;
};
-struct CitContext smtp_client_CC;
static int doing_smtpclient = 0;
long *smtpq = NULL; // array of msgnums containing queue instructions
int smtpq_count = 0; // number of queue messages in smtpq
CM_SetField(imsg, eAuthor, HKEY("Citadel"));
CM_SetField(imsg, eJournal, HKEY("do not journal"));
CM_SetAsFieldSB(imsg, eMesageText, &SpoolMsg);
- CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
+ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
CM_Free(imsg);
}
return 0;
int delete_this_queue = 0;
char server_response[SIZ];
- msg = CtdlFetchMessage(qmsgnum, 1, 1);
+ msg = CtdlFetchMessage(qmsgnum, 1);
if (msg == NULL) {
syslog(LOG_WARNING, "smtpclient: %ld does not exist", qmsgnum);
return;
// replace the old queue entry with the new one
syslog(LOG_DEBUG, "smtpclient: %ld rewriting", qmsgnum);
msg = convert_internet_message_buf(&NewInstr); // This function will free NewInstr for us
- CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, 0);
+ CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
CM_Free(msg);
CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &qmsgnum, 1, "");
}
doing_smtpclient = 1;
syslog(LOG_DEBUG, "smtpclient: start queue run");
- pthread_setspecific(MyConKey, (void *) &smtp_client_CC);
if (CtdlGetRoom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
syslog(LOG_WARNING, "Cannot find room <%s>", SMTP_SPOOLOUT_ROOM);
CTDL_MODULE_INIT(smtpclient)
{
if (!threading) {
- CtdlFillSystemContext(&smtp_client_CC, "SMTP_Send");
CtdlRegisterMessageHook(smtp_aftersave, EVT_AFTERSAVE);
CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER, PRIO_AGGR + 50);
smtp_init_spoolout();