X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=1f610f258f67f2bcb41ddc73d04b04f6a93a6f1c;hb=c71df26b9d35c07eb9c1322a7e83caa86337ad82;hp=7ac84729c331241d482c5d63b5232a30c6be600d;hpb=9caef44a2f42ab81b2489ae19859f1bbc25d4430;p=citadel.git diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index 7ac84729c..1f610f258 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -1,22 +1,15 @@ /* - * 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-2011 by the citadel.org team + * Copyright (c) 2000-2019 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 by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. * - * 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 + * 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. * * ** NOTE ** A word on the S_NETCONFIGS semaphore: * This is a fairly high-level type of critical section. It ensures that no @@ -24,7 +17,6 @@ * so many things inside these, here are the rules: * 1. begin_critical_section(S_NETCONFIGS) *before* begin_ any others. * 2. Do *not* perform any I/O with the client during these sections. - * */ /* @@ -78,27 +70,21 @@ #include "internet_addressing.h" #include "serv_network.h" #include "clientsocket.h" -#include "file_ops.h" #include "citadel_dirs.h" #include "threads.h" - -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif - #include "context.h" -#include "netconfig.h" +#include "ctdl_module.h" #include "netspool.h" #include "netmail.h" -#include "ctdl_module.h" /* comes from lookup3.c from libcitadel... */ extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); typedef struct __roomlists { RoomProcList *rplist; - HashList *RoomsInterestedIn; -}roomlists; +} roomlists; + + /* * When we do network processing, it's accomplished in two passes; one to * gather a list of rooms and one to actually do them. It's ok that rplist @@ -106,251 +92,90 @@ typedef struct __roomlists { */ struct RoomProcList *rplist = NULL; -int GetNetworkedRoomNumbers(const char *DirName, HashList *DirList) +RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG) { - DIR *filedir = NULL; - struct dirent *d; - struct dirent *filedir_entry; - long RoomNR; - long Count = 0; - - filedir = opendir (DirName); - if (filedir == NULL) { - return 0; - } - - d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1); - if (d == NULL) { - return 0; - } - - while ((readdir_r(filedir, d, &filedir_entry) == 0) && - (filedir_entry != NULL)) - { - RoomNR = atol(filedir_entry->d_name); - if (RoomNR != 0) { - Count++; - Put(DirList, LKEY(RoomNR), &Count, reference_free_handler); - } - } - free(d); - closedir(filedir); - return Count; -} - - - - -/* - * Check the use table. This is a list of messages which have recently - * arrived on the system. It is maintained and queried to prevent the same - * message from being entered into the database multiple times if it happens - * to arrive multiple times by accident. - */ -int network_usetable(struct CtdlMessage *msg) { - - char msgid[SIZ]; - struct cdbdata *cdbut; - struct UseTable ut; - - /* Bail out if we can't generate a message ID */ - if (msg == NULL) { - return(0); - } - if (msg->cm_fields['I'] == NULL) { - return(0); - } - if (IsEmptyStr(msg->cm_fields['I'])) { - return(0); - } + int i; + struct RoomProcList *ptr; - /* Generate the message ID */ - strcpy(msgid, msg->cm_fields['I']); - if (haschar(msgid, '@') == 0) { - strcat(msgid, "@"); - if (msg->cm_fields['N'] != NULL) { - strcat(msgid, msg->cm_fields['N']); - } - else { - return(0); - } + ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList)); + if (ptr == NULL) { + return NULL; } - cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid)); - if (cdbut != NULL) { - cdb_free(cdbut); - syslog(LOG_DEBUG, "network_usetable() : we already have %s\n", msgid); - return(1); + ptr->namelen = strlen(qrbuf->QRname); + if (ptr->namelen > ROOMNAMELEN) { + ptr->namelen = ROOMNAMELEN - 1; } - /* If we got to this point, it's unique: add it. */ - strcpy(ut.ut_msgid, msgid); - ut.ut_timestamp = time(NULL); - cdb_store(CDB_USETABLE, msgid, strlen(msgid), &ut, sizeof(struct UseTable) ); - return(0); -} - - - - - - - - - + memcpy (ptr->name, qrbuf->QRname, ptr->namelen); + ptr->name[ptr->namelen] = '\0'; + ptr->QRNum = qrbuf->QRnumber; -/* - * 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) { - SpoolControl sc; - int num_spooled = 0; - int found_node = 0; - char buf[256]; - char sc_type[256]; - char sc_node[256]; - char sc_room[256]; - char filename[PATH_MAX]; - FILE *fp; - - /* Grab the configuration line we're looking for */ - assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir); - begin_critical_section(S_NETCONFIGS); - fp = fopen(filename, "r"); - if (fp == NULL) { - end_critical_section(S_NETCONFIGS); - return(-1); - } - while (fgets(buf, sizeof buf, fp) != NULL) { - buf[strlen(buf)-1] = 0; - extract_token(sc_type, buf, 0, '|', sizeof sc_type); - extract_token(sc_node, buf, 1, '|', sizeof sc_node); - extract_token(sc_room, buf, 2, '|', sizeof sc_room); - if ( (!strcasecmp(sc_type, "ignet_push_share")) - && (!strcasecmp(sc_node, target_node)) ) { - found_node = 1; - - /* Concise syntax because we don't need a full linked-list */ - memset(&sc, 0, sizeof(SpoolControl)); - sc.ignet_push_shares = (maplist *) - malloc(sizeof(maplist)); - sc.ignet_push_shares->next = NULL; - safestrncpy(sc.ignet_push_shares->remote_nodename, - sc_node, - sizeof sc.ignet_push_shares->remote_nodename); - safestrncpy(sc.ignet_push_shares->remote_roomname, - sc_room, - sizeof sc.ignet_push_shares->remote_roomname); - } + for (i = 0; i < ptr->namelen; i++) + { + ptr->lcname[i] = tolower(ptr->name[i]); } - fclose(fp); - end_critical_section(S_NETCONFIGS); - - if (!found_node) return(-1); - - /* 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 */ - free(sc.ignet_push_shares); - - syslog(LOG_NOTICE, "Synchronized %d messages to <%s>\n", - num_spooled, target_node); - return(num_spooled); -} - -/* - * Implements the NSYN command - */ -void cmd_nsyn(char *argbuf) { - int num_spooled; - char target_node[256]; - - if (CtdlAccessCheck(ac_aide)) return; - - extract_token(target_node, argbuf, 0, '|', sizeof target_node); - num_spooled = network_sync_to(target_node); - 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); - } + ptr->lcname[ptr->namelen] = '\0'; + ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345); + return ptr; } - - /* * Batch up and send all outbound traffic from the current room */ -void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data) { - int i; +void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCfg) +{ struct RoomProcList *ptr; - long QRNum = qrbuf->QRnumber; - void *v; roomlists *RP = (roomlists*) data; - if (!GetHash(RP->RoomsInterestedIn, LKEY(QRNum), &v)) + if (!HaveSpoolConfig(OneRNCfg)) { return; + } - ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList)); - if (ptr == NULL) return; - - ptr->namelen = strlen(qrbuf->QRname); - if (ptr->namelen > ROOMNAMELEN) - ptr->namelen = ROOMNAMELEN - 1; - - memcpy (ptr->name, qrbuf->QRname, ptr->namelen); - ptr->name[ptr->namelen] = '\0'; - ptr->QRNum = qrbuf->QRnumber; + ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg); - for (i = 0; i < ptr->namelen; i++) + if (ptr != NULL) { - ptr->lcname[i] = tolower(ptr->name[i]); + ptr->next = RP->rplist; + RP->rplist = ptr; } - - ptr->lcname[ptr->namelen] = '\0'; - ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345); - ptr->next = RP->rplist; - RP->rplist = ptr; } /* * Batch up and send all outbound traffic from the current room */ -void network_queue_room(struct ctdlroom *qrbuf, void *data) { - int i; +int network_room_handler(struct ctdlroom *qrbuf) +{ struct RoomProcList *ptr; + OneRoomNetCfg *RNCfg; - if (qrbuf->QRdefaultview == VIEW_QUEUE) - return; - ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList)); - if (ptr == NULL) return; + if (qrbuf->QRdefaultview == VIEW_QUEUE) { + return 1; + } - ptr->namelen = strlen(qrbuf->QRname); - if (ptr->namelen > ROOMNAMELEN) - ptr->namelen = ROOMNAMELEN - 1; + RNCfg = CtdlGetNetCfgForRoom(qrbuf->QRnumber); + if (RNCfg == NULL) { + return 1; + } - memcpy (ptr->name, qrbuf->QRname, ptr->namelen); - ptr->name[ptr->namelen] = '\0'; - ptr->QRNum = qrbuf->QRnumber; + if (!HaveSpoolConfig(RNCfg)) { + FreeRoomNetworkStruct(&RNCfg); + return 1; + } - for (i = 0; i < ptr->namelen; i++) - { - ptr->lcname[i] = tolower(ptr->name[i]); + ptr = CreateRoomProcListEntry(qrbuf, RNCfg); + if (ptr == NULL) { + FreeRoomNetworkStruct(&RNCfg); + return 1; } - ptr->lcname[ptr->namelen] = '\0'; - ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345); begin_critical_section(S_RPLIST); ptr->next = rplist; rplist = ptr; end_critical_section(S_RPLIST); + FreeRoomNetworkStruct(&RNCfg); + return 1; } void destroy_network_queue_room(RoomProcList *rplist) @@ -374,195 +199,64 @@ void destroy_network_queue_room_locked (void) } - -/* - * Bounce a message back to the sender - */ -void network_bounce(struct CtdlMessage *msg, char *reason) { - char *oldpath = NULL; - char buf[SIZ]; - char bouncesource[SIZ]; - char recipient[SIZ]; - struct recptypes *valid = NULL; - char force_room[ROOMNAMELEN]; - static int serialnum = 0; - size_t size; - - syslog(LOG_DEBUG, "entering network_bounce()\n"); - - if (msg == NULL) return; - - snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename); - - /* - * Give it a fresh message ID - */ - if (msg->cm_fields['I'] != NULL) { - free(msg->cm_fields['I']); - } - snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s", - (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn); - msg->cm_fields['I'] = strdup(buf); - - /* - * FIXME ... right now we're just sending a bounce; we really want to - * include the text of the bounced message. - */ - if (msg->cm_fields['M'] != NULL) { - free(msg->cm_fields['M']); - } - msg->cm_fields['M'] = strdup(reason); - msg->cm_format_type = 0; - - /* - * Turn the message around - */ - if (msg->cm_fields['R'] == NULL) { - free(msg->cm_fields['R']); - } - - if (msg->cm_fields['D'] == NULL) { - free(msg->cm_fields['D']); - } - - snprintf(recipient, sizeof recipient, "%s@%s", - msg->cm_fields['A'], msg->cm_fields['N']); - - if (msg->cm_fields['A'] == NULL) { - free(msg->cm_fields['A']); - } - - if (msg->cm_fields['N'] == NULL) { - free(msg->cm_fields['N']); - } - - if (msg->cm_fields['U'] == NULL) { - free(msg->cm_fields['U']); - } - - msg->cm_fields['A'] = strdup(BOUNCESOURCE); - msg->cm_fields['N'] = strdup(config.c_nodename); - msg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)"); - - /* prepend our node to the path */ - if (msg->cm_fields['P'] != NULL) { - oldpath = msg->cm_fields['P']; - msg->cm_fields['P'] = NULL; - } - else { - oldpath = strdup("unknown_user"); - } - size = strlen(oldpath) + SIZ; - msg->cm_fields['P'] = malloc(size); - snprintf(msg->cm_fields['P'], size, "%s!%s", config.c_nodename, oldpath); - free(oldpath); - - /* Now submit the message */ - valid = validate_recipients(recipient, NULL, 0); - if (valid != NULL) if (valid->num_error != 0) { - free_recipients(valid); - valid = NULL; - } - if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) { - strcpy(force_room, config.c_aideroom); - } - else { - strcpy(force_room, ""); - } - if ( (valid == NULL) && IsEmptyStr(force_room) ) { - strcpy(force_room, config.c_aideroom); - } - CtdlSubmitMsg(msg, valid, force_room, 0); - - /* Clean up */ - if (valid != NULL) free_recipients(valid); - CtdlFreeMessage(msg); - syslog(LOG_DEBUG, "leaving network_bounce()\n"); -} - - - - - - - /* * network_do_queue() * * Run through the rooms doing various types of network stuff. */ -void network_do_queue(void) { - static int doing_queue = 0; +void network_do_queue(void) +{ static time_t last_run = 0L; int full_processing = 1; - char *working_ignetcfg; - NetMap *the_netmap = NULL; + HashList *working_ignetcfg; + HashList *the_netmap = NULL; int netmap_changed = 0; roomlists RL; + SpoolControl *sc = NULL; + SpoolControl *pSC; /* * Run the full set of processing tasks no more frequently * than once every n seconds */ - if ( (time(NULL) - last_run) < config.c_net_freq ) { + if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") ) + { full_processing = 0; - syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n", - config.c_net_freq - (time(NULL)- last_run) - ); + syslog(LOG_DEBUG, "network: full processing in %ld seconds.", CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)); } - /* - * 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; - begin_critical_section(S_RPLIST); RL.rplist = rplist; rplist = NULL; end_critical_section(S_RPLIST); - RL.RoomsInterestedIn = NewHash(1, lFlathash); - if (full_processing && - (GetNetworkedRoomNumbers(ctdl_netcfg_dir, RL.RoomsInterestedIn)==0)) - { - doing_queue = 0; - DeleteHash(&RL.RoomsInterestedIn); - if (RL.rplist == NULL) - return; - } + // TODO hm, check whether we have a config at all here? /* Load the IGnet Configuration into memory */ - working_ignetcfg = load_working_ignetcfg(); + working_ignetcfg = CtdlLoadIgNetCfg(); /* * Load the network map and filter list into memory. */ - if (!server_shutting_down) - the_netmap = read_network_map(); - if (!server_shutting_down) - load_network_filter_list(); + if (!server_shutting_down) { + the_netmap = CtdlReadNetworkMap(); + } /* * Go ahead and run the queue */ if (full_processing && !server_shutting_down) { - syslog(LOG_DEBUG, "network: loading outbound queue\n"); - CtdlForEachRoom(network_queue_interesting_rooms, &RL); + 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; - syslog(LOG_DEBUG, "network: running outbound queue\n"); + syslog(LOG_DEBUG, "network: running outbound queue"); while (ptr != NULL && !server_shutting_down) { cmp = ptr->next; - + /* filter duplicates from the list... */ while (cmp != NULL) { if ((cmp->namelen > 0) && (cmp->key == ptr->key) && @@ -575,137 +269,61 @@ void network_do_queue(void) { } if (ptr->namelen > 0) { - network_spoolout_room(ptr, - working_ignetcfg, - the_netmap); + InspectQueuedRoom(&sc, ptr, working_ignetcfg, the_netmap); } ptr = ptr->next; } } - /* If there is anything in the inbound queue, process it */ - if (!server_shutting_down) { - network_do_spoolin(working_ignetcfg, - &the_netmap, - &netmap_changed); + + pSC = sc; + while (pSC != NULL) + { + network_spoolout_room(pSC); + pSC = pSC->next; + } + + pSC = sc; + while (pSC != NULL) + { + sc = pSC->next; + free_spoolcontrol_struct(&pSC); + pSC = sc; } /* Save the network map back to disk */ - write_network_map(the_netmap, netmap_changed); + if (netmap_changed) { + StrBuf *MapStr = CtdlSerializeNetworkMap(the_netmap); + char *pMapStr = SmashStrBuf(&MapStr); + CtdlPutSysConfig(IGNETMAP, pMapStr); + free(pMapStr); + } + + /* shut down. */ - /* Free the filter list in memory */ - free_netfilter_list(); + DeleteHash(&the_netmap); - network_consolidate_spoolout(working_ignetcfg, the_netmap); - free(working_ignetcfg); + DeleteHash(&working_ignetcfg); - syslog(LOG_DEBUG, "network: queue run completed\n"); + syslog(LOG_DEBUG, "network: queue run completed"); if (full_processing) { last_run = time(NULL); } - DeleteHash(&RL.RoomsInterestedIn); destroy_network_queue_room(RL.rplist); - doing_queue = 0; } - - -int network_room_handler (struct ctdlroom *room) -{ - network_queue_room(room, NULL); - return 0; -} - -int NTTDebugEnabled = 0; - -/* - * network_talking_to() -- concurrency checker - */ -static HashList *nttlist = NULL; -int network_talking_to(const char *nodename, long len, int operation) { - - int retval = 0; - HashPos *Pos = NULL; - void *vdata; - - begin_critical_section(S_NTTLIST); - - switch(operation) { - - case NTT_ADD: - if (nttlist == NULL) - nttlist = NewHash(1, NULL); - Put(nttlist, nodename, len, NewStrBufPlain(nodename, len), HFreeStrBuf); - if (NTTDebugEnabled) syslog(LOG_DEBUG, "nttlist: added <%s>\n", nodename); - break; - case NTT_REMOVE: - if ((nttlist == NULL) || - (GetCount(nttlist) == 0)) - break; - Pos = GetNewHashPos(nttlist, 1); - if (GetHashPosFromKey (nttlist, nodename, len, Pos)) - DeleteEntryFromHash(nttlist, Pos); - DeleteHashPos(&Pos); - if (NTTDebugEnabled) syslog(LOG_DEBUG, "nttlist: removed <%s>\n", nodename); - - break; - - case NTT_CHECK: - if ((nttlist == NULL) || - (GetCount(nttlist) == 0)) - break; - if (GetHash(nttlist, nodename, len, &vdata)) - retval ++; - if (NTTDebugEnabled) syslog(LOG_DEBUG, "nttlist: have [%d] <%s>\n", retval, nodename); - break; - } - - end_critical_section(S_NTTLIST); - return(retval); -} - -void cleanup_nttlist(void) -{ - begin_critical_section(S_NTTLIST); - DeleteHash(&nttlist); - end_critical_section(S_NTTLIST); -} - - - -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)) { - network_talking_to(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE); - } -} - /* * Module entry point */ -void SetNTTDebugEnabled(const int n) -{ - NTTDebugEnabled = n; -} - CTDL_MODULE_INIT(network) { if (!threading) { - CtdlRegisterDebugFlagHook(HKEY("networktalkingto"), SetNTTDebugEnabled, &NTTDebugEnabled); - CtdlRegisterCleanupHook(cleanup_nttlist); - CtdlRegisterSessionHook(network_logout_hook, EVT_LOGOUT); - CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node"); CtdlRegisterRoomHook(network_room_handler); CtdlRegisterCleanupHook(destroy_network_queue_room_locked); - CtdlRegisterSessionHook(network_do_queue, EVT_TIMER); + CtdlRegisterSessionHook(network_do_queue, EVT_TIMER, PRIO_QUEUE + 10); } return "network"; }