Removed all of the SYS_ user contexts, they aren't needed anymore
[citadel.git] / citadel / modules / network / serv_network.c
index 3c8df1e8c2c31ecabcd4e6a65252172f7c1ba508..1f610f258f67f2bcb41ddc73d04b04f6a93a6f1c 100644 (file)
@@ -1,8 +1,7 @@
 /*
- * 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-2017 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, version 3.
@@ -78,9 +77,6 @@
 #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);
 
@@ -96,98 +92,6 @@ typedef struct __roomlists {
  */
 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);
-
-       syslog(LOG_NOTICE, "network: 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;
@@ -321,7 +225,6 @@ void network_do_queue(void)
                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;
@@ -387,13 +290,6 @@ void network_do_queue(void)
                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) {
@@ -403,9 +299,6 @@ void network_do_queue(void)
                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);
@@ -421,124 +314,13 @@ void network_do_queue(void)
 }
 
 
-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) {
-                                               syslog(LOG_EMERG, "network: 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);