/*
- * This module handles shared rooms, inter-Citadel mail, and outbound
- * mailing list processing.
+ * This module handles network mail and mailing list processing.
*
- * Copyright (c) 2000-2016 by the citadel.org team
+ * Copyright (c) 2000-2021 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... */
extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval);
*/
struct RoomProcList *rplist = NULL;
-
-/*
- * Send the *entire* contents of the current room to one specific network node,
- * ignoring anything we know about which messages have already undergone
- * network processing. This can be used to bring a new node into sync.
- */
-int network_sync_to(char *target_node, long len)
-{
- struct CitContext *CCC = CC;
- OneRoomNetCfg OneRNCFG;
- OneRoomNetCfg *pRNCFG;
- const RoomNetCfgLine *pCfgLine;
- SpoolControl sc;
- int num_spooled = 0;
-
- /* Load the netconfig for this room */
- pRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
- if (pRNCFG == NULL) { // no netconfig at all?
- return -1;
- }
- if (pRNCFG->NetConfigs[ignet_push_share] == NULL) // no ignet push shares?
- {
- FreeRoomNetworkStruct(&pRNCFG);
- return -1;
- }
-
- /* Search for an ignet_oush_share configuration bearing the target node's name */
- for (pCfgLine = pRNCFG->NetConfigs[ignet_push_share]; pCfgLine != NULL; pCfgLine = pCfgLine->next)
- {
- if (!strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
- break;
- }
-
- /* If we aren't sharing with that node, bail out */
- if (pCfgLine == NULL)
- {
- FreeRoomNetworkStruct(&pRNCFG);
- return -1;
- }
-
- /* If we got here, we're good to go ... make up a dummy spoolconfig and roll with it */
-
- begin_critical_section(S_NETCONFIGS);
- memset(&sc, 0, sizeof(SpoolControl));
- memset(&OneRNCFG, 0, sizeof(OneRoomNetCfg));
- sc.RNCfg = &OneRNCFG;
- sc.RNCfg->NetConfigs[ignet_push_share] = DuplicateOneGenericCfgLine(pCfgLine);
- sc.Users[ignet_push_share] = NewStrBufPlain(NULL, (StrLength(pCfgLine->Value[0]) + StrLength(pCfgLine->Value[1]) + 10) );
- StrBufAppendBuf(sc.Users[ignet_push_share], pCfgLine->Value[0], 0);
- StrBufAppendBufPlain(sc.Users[ignet_push_share], HKEY(","), 0);
- StrBufAppendBuf(sc.Users[ignet_push_share], pCfgLine->Value[1], 0);
- CalcListID(&sc);
- end_critical_section(S_NETCONFIGS);
-
- sc.working_ignetcfg = CtdlLoadIgNetCfg();
- sc.the_netmap = CtdlReadNetworkMap();
-
- /* Send ALL messages */
- num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, network_spool_msg, &sc);
-
- /* Concise cleanup because we know there's only one node in the sc */
- DeleteGenericCfgLine(NULL, &sc.RNCfg->NetConfigs[ignet_push_share]);
-
- DeleteHash(&sc.working_ignetcfg);
- DeleteHash(&sc.the_netmap);
- free_spoolcontrol_struct_members(&sc);
-
- QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>", num_spooled, target_node);
- return(num_spooled);
-}
-
-
-/*
- * Implements the NSYN command
- */
-void cmd_nsyn(char *argbuf) {
- int num_spooled;
- long len;
- char target_node[256];
-
- if (CtdlAccessCheck(ac_aide)) return;
-
- len = extract_token(target_node, argbuf, 0, '|', sizeof target_node);
- num_spooled = network_sync_to(target_node, len);
- if (num_spooled >= 0) {
- cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled);
- }
- else {
- cprintf("%d No such room/node share exists.\n", ERROR + ROOM_NOT_FOUND);
- }
-}
-
RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG)
{
int i;
struct RoomProcList *ptr;
ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
- if (ptr == NULL) return NULL;
+ if (ptr == NULL) {
+ return NULL;
+ }
ptr->namelen = strlen(qrbuf->QRname);
- if (ptr->namelen > ROOMNAMELEN)
+ if (ptr->namelen > ROOMNAMELEN) {
ptr->namelen = ROOMNAMELEN - 1;
+ }
memcpy (ptr->name, qrbuf->QRname, ptr->namelen);
ptr->name[ptr->namelen] = '\0';
ptr->lcname[ptr->namelen] = '\0';
ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
- ptr->lastsent = OneRNCFG->lastsent;
- ptr->OneRNCfg = OneRNCFG;
return ptr;
}
return 1;
}
- ptr->OneRNCfg = NULL;
begin_critical_section(S_RPLIST);
ptr->next = rplist;
rplist = ptr;
}
}
-void destroy_network_queue_room_locked (void)
-{
- begin_critical_section(S_RPLIST);
- destroy_network_queue_room(rplist);
- end_critical_section(S_RPLIST);
-}
-
/*
* network_do_queue()
*/
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;
- 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);
begin_critical_section(S_RPLIST);
RL.rplist = rplist;
rplist = NULL;
* Go ahead and run the queue
*/
if (full_processing && !server_shutting_down) {
- QNM_syslog(LOG_DEBUG, "network: loading outbound queue");
- CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL, maxRoomNetCfg);
+ 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;
}
if (ptr->namelen > 0) {
- InspectQueuedRoom(&sc,
- ptr,
- working_ignetcfg,
- the_netmap);
+ InspectQueuedRoom(&sc, ptr, working_ignetcfg, the_netmap);
}
ptr = 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 singe 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);
}
destroy_network_queue_room(RL.rplist);
- // SaveChangedConfigs(); // FIXME FOOFOO SAVE CHANGED THIS AACACACACCKK
-
-}
-
-
-void network_logout_hook(void)
-{
- CitContext *CCC = MyContext();
-
- /*
- * If we were talking to a network node, we're not anymore...
- */
- if (!IsEmptyStr(CCC->net_node)) {
- CtdlNetworkTalkingTo(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
- CCC->net_node[0] = '\0';
- }
-}
-
-
-void network_cleanup_function(void)
-{
- struct CitContext *CCC = CC;
-
- if (!IsEmptyStr(CCC->net_node)) {
- CtdlNetworkTalkingTo(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
- CCC->net_node[0] = '\0';
- }
-}
-
-
-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");
CtdlRegisterRoomHook(network_room_handler);
- CtdlRegisterCleanupHook(destroy_network_queue_room_locked);
CtdlRegisterSessionHook(network_do_queue, EVT_TIMER, PRIO_QUEUE + 10);
}
return "network";
projects / citadel.git / blobdiff