more sprintf removals

[citadel.git] / citadel / serv_network.c

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 717c95815117d1cabe1c8b59c835daa2787e71d2..164e890c9d9ecd75078c42785b279741f7e25326 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -74,6 +74,55 @@ struct RoomProcList *rplist = NULL;
  */
 struct NetMap *the_netmap = NULL;
 
+/*
+ * Keep track of what messages to reject
+ */
+struct FilterList *load_filter_list(void) {
+       char *serialized_list = NULL;
+       int i;
+       char buf[SIZ];
+       struct FilterList *newlist = NULL;
+       struct FilterList *nptr;
+
+       serialized_list = CtdlGetSysConfig(FILTERLIST);
+       if (serialized_list == NULL) return(NULL); /* if null, no entries */
+
+       /* Use the string tokenizer to grab one line at a time */
+       for (i=0; i<num_tokens(serialized_list, '\n'); ++i) {
+               extract_token(buf, serialized_list, i, '\n');
+               nptr = (struct FilterList *) mallok(sizeof(struct FilterList));
+               extract(nptr->fl_user, buf, 0);
+               striplt(nptr->fl_user);
+               extract(nptr->fl_room, buf, 1);
+               striplt(nptr->fl_room);
+               extract(nptr->fl_node, buf, 2);
+               striplt(nptr->fl_node);
+
+               /* Cowardly refuse to add an any/any/any entry that would
+                * end up filtering every single message.
+                */
+               if (strlen(nptr->fl_user) + strlen(nptr->fl_room)
+                  + strlen(nptr->fl_node) == 0) {
+                       phree(nptr);
+               }
+               else {
+                       nptr->next = newlist;
+                       newlist = nptr;
+               }
+       }
+
+       phree(serialized_list);
+       return newlist;
+}
+
+
+void free_filter_list(struct FilterList *fl) {
+       if (fl == NULL) return;
+       free_filter_list(fl->next);
+       phree(fl);
+}
+
+
 
 /*
  * Check the use table.  This is a list of messages which have recently
@@ -85,7 +134,7 @@ int network_usetable(struct CtdlMessage *msg) {
 
        char msgid[SIZ];
        struct cdbdata *cdbut;
-       time_t timestamp;
+       struct UseTable ut;
 
        /* Bail out if we can't generate a message ID */
        if (msg == NULL) {
@@ -117,9 +166,10 @@ int network_usetable(struct CtdlMessage *msg) {
        }
 
        /* If we got to this point, it's unique: add it. */
-       timestamp = time(NULL);
+       strcpy(ut.ut_msgid, msgid);
+       ut.ut_timestamp = time(NULL);
        cdb_store(CDB_USETABLE, msgid, strlen(msgid),
-               &timestamp, sizeof(timestamp) );
+               &ut, sizeof(struct UseTable) );
        return(0);
 }
 
@@ -272,7 +322,7 @@ void cmd_gnet(char *argbuf) {
        FILE *fp;
 
        if (CtdlAccessCheck(ac_room_aide)) return;
-       assoc_file_name(filename, &CC->quickroom, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
        cprintf("%d Network settings for room #%ld <%s>\n",
                LISTING_FOLLOWS,
                CC->quickroom.QRnumber, CC->quickroom.QRname);
@@ -298,7 +348,7 @@ void cmd_snet(char *argbuf) {
 
        if (CtdlAccessCheck(ac_room_aide)) return;
        safestrncpy(tempfilename, tmpnam(NULL), sizeof tempfilename);
-       assoc_file_name(filename, &CC->quickroom, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
 
        fp = fopen(tempfilename, "w");
        if (fp == NULL) {
@@ -521,7 +571,7 @@ void network_spoolout_room(char *room_to_spool) {
        }
 
        memset(&sc, 0, sizeof(struct SpoolControl));
-       assoc_file_name(filename, &CC->quickroom, "netconfigs");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
 
        fp = fopen(filename, "r");
        if (fp == NULL) {
@@ -668,8 +718,8 @@ void network_bounce(struct CtdlMessage *msg, char *reason) {
        if (msg->cm_fields['I'] != NULL) {
                phree(msg->cm_fields['I']);
        }
-       sprintf(buf, "%ld.%04x.%04x@%s",
-               (long)time(NULL), getpid(), ++serialnum, config.c_fqdn);
+       sprintf(buf, "%ld.%04lx.%04x@%s",
+               (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
        msg->cm_fields['I'] = strdoop(buf);
 
        /*
@@ -1241,9 +1291,10 @@ void network_do_queue(void) {
        network_poll_other_citadel_nodes();
 
        /*
-        * Load the network map into memory.
+        * Load the network map and filter list into memory.
         */
        read_network_map();
+       filterlist = load_filter_list();
 
        /* 
         * Go ahead and run the queue
@@ -1265,12 +1316,15 @@ void network_do_queue(void) {
        /* Save the network map back to disk */
        write_network_map();
 
+       /* Free the filter list in memory */
+       free_filter_list(filterlist);
+       filterlist = NULL;
+
        lprintf(7, "network: queue run completed\n");
        doing_queue = 0;
 }
 
 
-
 /*
  * cmd_netp() - authenticate to the server as another Citadel node polling
  *              for network traffic
@@ -1309,6 +1363,8 @@ void cmd_netp(char *cmdbuf)
 
 
 
+
+
 /*
  * Module entry point
  */