SEEN-Database: refactor database interface for remembering whether we already aggrega...

[citadel.git] / citadel / modules / network / serv_network.c

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 65645d9abe89b8b2e3ca50ad6ec0788de74276b4..fb5476cc913f479187a7f73d5f84ff5724f0a619 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -106,10 +106,9 @@ struct RoomProcList *rplist = NULL;
  */
 int network_usetable(struct CtdlMessage *msg)
 {
+       StrBuf *msgid;
        struct CitContext *CCC = CC;
-       char msgid[SIZ];
-       struct cdbdata *cdbut;
-       struct UseTable ut;
+       time_t now;
 
        /* Bail out if we can't generate a message ID */
        if (msg == NULL) {
@@ -123,28 +122,29 @@ int network_usetable(struct CtdlMessage *msg)
        }
 
        /* Generate the message ID */
-       strcpy(msgid, msg->cm_fields['I']);
-       if (haschar(msgid, '@') == 0) {
-               strcat(msgid, "@");
+       msgid = NewStrBufPlain(msg->cm_fields['I'], -1);
+       if (haschar(ChrPtr(msgid), '@') == 0) {
+               StrBufAppendBufPlain(msgid, HKEY("@"), 0);
                if (msg->cm_fields['N'] != NULL) {
-                       strcat(msgid, msg->cm_fields['N']);
+                       StrBufAppendBufPlain(msgid, msg->cm_fields['N'], -1, 0);
                }
                else {
+                       FreeStrBuf(&msgid);
                        return(0);
                }
        }
-
-       cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid));
-       if (cdbut != NULL) {
-               cdb_free(cdbut);
-               QN_syslog(LOG_DEBUG, "network_usetable() : we already have %s\n", msgid);
+       now = time(NULL);
+       if (CheckIfAlreadySeen("Networker Import",
+                              msgid,
+                              now, 0,
+                              eCheckUpdate,
+                              CCC->cs_pid, 0) != 0)
+       {
+               FreeStrBuf(&msgid);
                return(1);
        }
+       FreeStrBuf(&msgid);
 
-       /* 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);
 }
 
@@ -176,7 +176,7 @@ int network_sync_to(char *target_node, long len)
        pCfgLine = pRNCFG->NetConfigs[ignet_push_share];
        while (pCfgLine != NULL)
        {
-               if (strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
+               if (!strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
                        break;
                pCfgLine = pCfgLine->next;
        }
@@ -184,10 +184,25 @@ int network_sync_to(char *target_node, long len)
        {
                return -1;
        }
+
        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);
 
@@ -203,6 +218,7 @@ int network_sync_to(char *target_node, long len)
 
        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);
@@ -231,7 +247,7 @@ void cmd_nsyn(char *argbuf) {
        }
 }
 
-RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCfg *OneRNCFG)
+RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG)
 {
        int i;
        struct RoomProcList *ptr;
@@ -254,6 +270,7 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCf
 
        ptr->lcname[ptr->namelen] = '\0';
        ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
+       ptr->lastsent = OneRNCFG->lastsent;
        ptr->OneRNCfg = OneRNCFG;
        return ptr;
 }
@@ -261,15 +278,21 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, const OneRoomNetCf
 /*
  * Batch up and send all outbound traffic from the current room
  */
-void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, const OneRoomNetCfg *OneRNCfg)
+void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCfg)
 {
        struct RoomProcList *ptr;
        roomlists *RP = (roomlists*) data;
 
+       if (!HaveSpoolConfig(OneRNCfg))
+               return;
+
        ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg);
 
-       ptr->next = RP->rplist;
-       RP->rplist = ptr;
+       if (ptr != NULL)
+       {
+               ptr->next = RP->rplist;
+               RP->rplist = ptr;
+       }
 }
 
 /*
@@ -278,7 +301,7 @@ void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, const O
 int network_room_handler (struct ctdlroom *qrbuf)
 {
        struct RoomProcList *ptr;
-       const OneRoomNetCfg* RNCfg;
+       OneRoomNetCfg* RNCfg;
 
        if (qrbuf->QRdefaultview == VIEW_QUEUE)
                return 1;
@@ -287,10 +310,14 @@ int network_room_handler (struct ctdlroom *qrbuf)
        if (RNCfg == NULL)
                return 1;
 
+       if (!HaveSpoolConfig(RNCfg))
+               return 1;
+
        ptr = CreateRoomProcListEntry(qrbuf, RNCfg);
        if (ptr == NULL)
                return 1;
 
+       ptr->OneRNCfg = NULL;
        begin_critical_section(S_RPLIST);
        ptr->next = rplist;
        rplist = ptr;
@@ -429,10 +456,6 @@ void network_bounce(struct CtdlMessage *msg, char *reason)
 
 
 
-
-
-
-
 /*
  * network_do_queue()
  * 
@@ -447,6 +470,8 @@ void network_do_queue(void)
        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
@@ -508,14 +533,30 @@ 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;
                }
        }
 
+
+       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;
+       }
        /* If there is anything in the inbound queue, process it */
        if (!server_shutting_down) {
                network_do_spoolin(working_ignetcfg, 
@@ -529,7 +570,9 @@ void network_do_queue(void)
        /* Save the network map back to disk */
        if (netmap_changed) {
                StrBuf *MapStr = CtdlSerializeNetworkMap(the_netmap);
-               CtdlPutSysConfig(IGNETMAP, SmashStrBuf(&MapStr));
+               char *pMapStr = SmashStrBuf(&MapStr);
+               CtdlPutSysConfig(IGNETMAP, pMapStr);
+               free(pMapStr);
        }
 
        /* combine singe message files into one spool entry per remote node. */
@@ -547,6 +590,8 @@ void network_do_queue(void)
                last_run = time(NULL);
        }
        destroy_network_queue_room(RL.rplist);
+       SaveChangedConfigs();
+
 }