X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_network.c;h=d36660e4b03cbda332f703a3820567949c431812;hb=924b8cd997f56b68e16fa1dfc1be55722596f5d8;hp=b2b296ef8bae2510ac99513535abe49b8943ccfb;hpb=848934c1722edc208c4df49c571586b72c3fc486;p=citadel.git diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c index b2b296ef8..d36660e4b 100644 --- a/citadel/modules/network/serv_network.c +++ b/citadel/modules/network/serv_network.c @@ -2,15 +2,15 @@ * This module handles shared rooms, inter-Citadel mail, and outbound * mailing list processing. * - * Copyright (c) 2000-2012 by the citadel.org team + * Copyright (c) 2000-2016 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. + * 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. + * 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 @@ -18,7 +18,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. - * */ /* @@ -72,7 +71,6 @@ #include "internet_addressing.h" #include "serv_network.h" #include "clientsocket.h" -#include "file_ops.h" #include "citadel_dirs.h" #include "threads.h" #include "context.h" @@ -88,7 +86,9 @@ extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval); typedef struct __roomlists { RoomProcList *rplist; -}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 @@ -97,54 +97,6 @@ typedef struct __roomlists { struct RoomProcList *rplist = NULL; - -/* - * 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) -{ - StrBuf *msgid; - struct CitContext *CCC = CC; - time_t now; - - /* Bail out if we can't generate a message ID */ - if ((msg == NULL) || (msg->cm_fields[emessageId] == NULL) || (IsEmptyStr(msg->cm_fields[emessageId]))) - { - return(0); - } - - /* Generate the message ID */ - msgid = NewStrBufPlain(msg->cm_fields[emessageId], -1); - if (haschar(ChrPtr(msgid), '@') == 0) { - StrBufAppendBufPlain(msgid, HKEY("@"), 0); - if (msg->cm_fields[eNodeName] != NULL) { - StrBufAppendBufPlain(msgid, msg->cm_fields[eNodeName], -1, 0); - } - else { - FreeStrBuf(&msgid); - return(0); - } - } - now = time(NULL); - if (CheckIfAlreadySeen("Networker Import", - msgid, - now, 0, - eCheckUpdate, - CCC->cs_pid, 0) != 0) - { - FreeStrBuf(&msgid); - return(1); - } - FreeStrBuf(&msgid); - - return(0); -} - - - /* * Send the *entire* contents of the current room to one specific network node, * ignoring anything we know about which messages have already undergone @@ -159,64 +111,59 @@ int network_sync_to(char *target_node, long len) SpoolControl sc; int num_spooled = 0; - /* Grab the configuration line we're looking for */ - begin_critical_section(S_NETCONFIGS); + /* Load the netconfig for this room */ pRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber); - if ((pRNCFG == NULL) || - (pRNCFG->NetConfigs[ignet_push_share] == NULL)) + if (pRNCFG == NULL) { // no netconfig at all? + return -1; + } + if (pRNCFG->NetConfigs[ignet_push_share] == NULL) // no ignet push shares? { + FreeRoomNetworkStruct(&pRNCFG); return -1; } - pCfgLine = pRNCFG->NetConfigs[ignet_push_share]; - while (pCfgLine != NULL) + /* 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; - pCfgLine = pCfgLine->next; } + + /* 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); + 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); + 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/*TODO*/, &sc.RNCfg->NetConfigs[ignet_push_share]); + 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>\n", - num_spooled, target_node); + QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>", num_spooled, target_node); return(num_spooled); } @@ -237,8 +184,7 @@ void cmd_nsyn(char *argbuf) { cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled); } else { - cprintf("%d No such room/node share exists.\n", - ERROR + ROOM_NOT_FOUND); + cprintf("%d No such room/node share exists.\n", ERROR + ROOM_NOT_FOUND); } } @@ -248,11 +194,14 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One 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'; @@ -265,8 +214,6 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One ptr->lcname[ptr->namelen] = '\0'; ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345); - ptr->lastsent = OneRNCFG->lastsent; - ptr->OneRNCfg = OneRNCFG; return ptr; } @@ -278,8 +225,9 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoom struct RoomProcList *ptr; roomlists *RP = (roomlists*) data; - if (!HaveSpoolConfig(OneRNCfg)) + if (!HaveSpoolConfig(OneRNCfg)) { return; + } ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg); @@ -293,30 +241,36 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoom /* * Batch up and send all outbound traffic from the current room */ -int network_room_handler (struct ctdlroom *qrbuf) +int network_room_handler(struct ctdlroom *qrbuf) { struct RoomProcList *ptr; - OneRoomNetCfg* RNCfg; + OneRoomNetCfg *RNCfg; - if (qrbuf->QRdefaultview == VIEW_QUEUE) + if (qrbuf->QRdefaultview == VIEW_QUEUE) { return 1; + } RNCfg = CtdlGetNetCfgForRoom(qrbuf->QRnumber); - if (RNCfg == NULL) + if (RNCfg == NULL) { return 1; + } - if (!HaveSpoolConfig(RNCfg)) + if (!HaveSpoolConfig(RNCfg)) { + FreeRoomNetworkStruct(&RNCfg); return 1; + } ptr = CreateRoomProcListEntry(qrbuf, RNCfg); - if (ptr == NULL) + if (ptr == NULL) { + FreeRoomNetworkStruct(&RNCfg); return 1; + } - ptr->OneRNCfg = NULL; begin_critical_section(S_RPLIST); ptr->next = rplist; rplist = ptr; end_critical_section(S_RPLIST); + FreeRoomNetworkStruct(&RNCfg); return 1; } @@ -341,87 +295,6 @@ void destroy_network_queue_room_locked (void) } - -/* - * Bounce a message back to the sender - */ -void network_bounce(struct CtdlMessage *msg, char *reason) -{ - struct CitContext *CCC = CC; - char buf[SIZ]; - char bouncesource[SIZ]; - char recipient[SIZ]; - struct recptypes *valid = NULL; - char force_room[ROOMNAMELEN]; - static int serialnum = 0; - long len; - - QNM_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 - */ - len = snprintf(buf, sizeof(buf), - "%ld.%04lx.%04x@%s", - (long)time(NULL), - (long)getpid(), - ++serialnum, - config.c_fqdn); - - CM_SetField(msg, emessageId, buf, len); - - /* - * FIXME ... right now we're just sending a bounce; we really want to - * include the text of the bounced message. - */ - CM_SetField(msg, eMesageText, reason, strlen(reason)); - msg->cm_format_type = 0; - - /* - * Turn the message around - */ - CM_FlushField(msg, eRecipient); - CM_FlushField(msg, eDestination); - - len = snprintf(recipient, sizeof(recipient), "%s@%s", - msg->cm_fields[eAuthor], - msg->cm_fields[eNodeName]); - - CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE)); - CM_SetField(msg, eNodeName, config.c_nodename, strlen(config.c_nodename)); - CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)")); - - Netmap_AddMe(msg, HKEY("unknown_user")); - - /* 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); - QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n"); -} - - - /* * network_do_queue() * @@ -443,10 +316,11 @@ void network_do_queue(void) * 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) ); } @@ -455,21 +329,17 @@ void network_do_queue(void) RL.rplist = rplist; rplist = NULL; end_critical_section(S_RPLIST); -///TODO hm, check whether we have a config at all here? + + // TODO hm, check whether we have a config at all here? /* Load the IGnet Configuration into memory */ working_ignetcfg = CtdlLoadIgNetCfg(); /* * Load the network map and filter list into memory. */ - if (!server_shutting_down) + if (!server_shutting_down) { the_netmap = CtdlReadNetworkMap(); -#if 0 - /* filterlist isn't supported anymore - if (!server_shutting_down) - load_network_filter_list(); - */ -#endif + } /* * Go ahead and run the queue @@ -499,10 +369,7 @@ void network_do_queue(void) } if (ptr->namelen > 0) { - InspectQueuedRoom(&sc, - ptr, - working_ignetcfg, - the_netmap); + InspectQueuedRoom(&sc, ptr, working_ignetcfg, the_netmap); } ptr = ptr->next; } @@ -541,7 +408,7 @@ void network_do_queue(void) free(pMapStr); } - /* combine singe message files into one spool entry per remote node. */ + /* combine single message files into one spool entry per remote node. */ network_consolidate_spoolout(working_ignetcfg, the_netmap); /* shut down. */ @@ -556,17 +423,9 @@ void network_do_queue(void) last_run = time(NULL); } destroy_network_queue_room(RL.rplist); - SaveChangedConfigs(); - } - - - - - - void network_logout_hook(void) { CitContext *CCC = MyContext(); @@ -579,6 +438,8 @@ void network_logout_hook(void) CCC->net_node[0] = '\0'; } } + + void network_cleanup_function(void) { struct CitContext *CCC = CC; @@ -590,6 +451,79 @@ void network_cleanup_function(void) } +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; irecp_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 */ @@ -599,10 +533,13 @@ 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);