* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2016 by the citadel.org team
+ * Copyright (c) 2000-2018 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, version 3.
#include "netspool.h"
#include "netmail.h"
-int NetQDebugEnabled = 0;
struct CitContext networker_spool_CC;
/* comes from lookup3.c from libcitadel... */
DeleteHash(&sc.the_netmap);
free_spoolcontrol_struct_members(&sc);
- QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>", num_spooled, target_node);
+ syslog(LOG_NOTICE, "network: synchronized %d messages to <%s>", num_spooled, target_node);
return(num_spooled);
}
*/
void network_do_queue(void)
{
- struct CitContext *CCC = CC;
static time_t last_run = 0L;
int full_processing = 1;
HashList *working_ignetcfg;
if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") )
{
full_processing = 0;
- MARK_syslog(LOG_DEBUG, "Network full processing in %ld seconds.",
- CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
- );
+ syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run));
}
become_session(&networker_spool_CC);
* Go ahead and run the queue
*/
if (full_processing && !server_shutting_down) {
- QNM_syslog(LOG_DEBUG, "network: loading outbound queue");
+ syslog(LOG_DEBUG, "network: loading outbound queue");
CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL);
}
if ((RL.rplist != NULL) && (!server_shutting_down)) {
RoomProcList *ptr, *cmp;
ptr = RL.rplist;
- QNM_syslog(LOG_DEBUG, "network: running outbound queue");
+ syslog(LOG_DEBUG, "network: running outbound queue");
while (ptr != NULL && !server_shutting_down) {
cmp = ptr->next;
free_spoolcontrol_struct(&pSC);
pSC = sc;
}
- /* If there is anything in the inbound queue, process it */
- if (!server_shutting_down) {
- network_do_spoolin(working_ignetcfg,
- the_netmap,
- &netmap_changed);
- }
-
- /* Free the filter list in memory */
- free_netfilter_list();
/* Save the network map back to disk */
if (netmap_changed) {
free(pMapStr);
}
- /* combine single message files into one spool entry per remote node. */
- network_consolidate_spoolout(working_ignetcfg, the_netmap);
-
/* shut down. */
DeleteHash(&the_netmap);
DeleteHash(&working_ignetcfg);
- QNM_syslog(LOG_DEBUG, "network: queue run completed");
+ syslog(LOG_DEBUG, "network: queue run completed");
if (full_processing) {
last_run = time(NULL);
}
-int ignet_aftersave(struct CtdlMessage *msg, recptypes *recps)
-{
- /* For IGnet mail, we have to save a new copy into the spooler for
- * each recipient, with the R and D fields set to the recipient and
- * destination-node. This has two ugly side effects: all other
- * recipients end up being unlisted in this recipient's copy of the
- * message, and it has to deliver multiple messages to the same
- * node. We'll revisit this again in a year or so when everyone has
- * a network spool receiver that can handle the new style messages.
- */
- if ((recps != NULL) && (recps->num_ignet > 0))
- {
- char *recipient;
- int rv = 0;
- struct ser_ret smr;
- FILE *network_fp = NULL;
- char submit_filename[128];
- static int seqnum = 1;
- int i;
- char *hold_R, *hold_D, *RBuf, *DBuf;
- long hrlen, hdlen, rblen, dblen, count, rlen;
- CitContext *CCC = MyContext();
-
- CM_GetAsField(msg, eRecipient, &hold_R, &hrlen);;
- CM_GetAsField(msg, eDestination, &hold_D, &hdlen);;
-
- count = num_tokens(recps->recp_ignet, '|');
- rlen = strlen(recps->recp_ignet);
- recipient = malloc(rlen + 1);
- RBuf = malloc(rlen + 1);
- DBuf = malloc(rlen + 1);
- for (i=0; i<count; ++i) {
- extract_token(recipient, recps->recp_ignet, i, '|', rlen + 1);
-
- rblen = extract_token(RBuf, recipient, 0, '@', rlen + 1);
- dblen = extract_token(DBuf, recipient, 1, '@', rlen + 1);
-
- CM_SetAsField(msg, eRecipient, &RBuf, rblen);;
- CM_SetAsField(msg, eDestination, &DBuf, dblen);;
- CtdlSerializeMessage(&smr, msg);
- if (smr.len > 0) {
- snprintf(submit_filename, sizeof submit_filename,
- "%s/netmail.%04lx.%04x.%04x",
- ctdl_netin_dir,
- (long) getpid(),
- CCC->cs_pid,
- ++seqnum);
-
- network_fp = fopen(submit_filename, "wb+");
- if (network_fp != NULL) {
- rv = fwrite(smr.ser, smr.len, 1, network_fp);
- if (rv == -1) {
- MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s",
- strerror(errno));
- }
- fclose(network_fp);
- }
- free(smr.ser);
- }
- CM_GetAsField(msg, eRecipient, &RBuf, &rblen);;
- CM_GetAsField(msg, eDestination, &DBuf, &dblen);;
- }
- free(RBuf);
- free(DBuf);
- free(recipient);
- CM_SetAsField(msg, eRecipient, &hold_R, hrlen);
- CM_SetAsField(msg, eDestination, &hold_D, hdlen);
- return 1;
- }
- return 0;
-}
-
-
/*
* Module entry point
*/
-void SetNetQDebugEnabled(const int n)
-{
- NetQDebugEnabled = n;
-}
-
CTDL_MODULE_INIT(network)
{
if (!threading)
{
- CtdlRegisterMessageHook(ignet_aftersave, EVT_AFTERSAVE);
-
CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool");
- CtdlRegisterDebugFlagHook(HKEY("networkqueue"), SetNetQDebugEnabled, &NetQDebugEnabled);
CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP, PRIO_STOP + 30);
CtdlRegisterSessionHook(network_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 10);
CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");