* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / serv_network.c

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 87bc6f1a318334dea469c4494e74cce66a990af7..9f7382bb25c00245ef0599a9829639f482fcdf32 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -7,14 +7,6 @@
  *
  */
 
-
-/* FIXME
-
-there's stuff in here that makes the assumption that /tmp is on the same
-filesystem as Citadel, and makes calls to link() on that basis.  fix this.
-
-*/
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -47,8 +39,8 @@ filesystem as Citadel, and makes calls to link() on that basis.  fix this.
 
 
 void cmd_gnet(char *argbuf) {
-       char filename[256];
-       char buf[256];
+       char filename[SIZ];
+       char buf[SIZ];
        FILE *fp;
 
        if (CtdlAccessCheck(ac_room_aide)) return;
@@ -71,9 +63,9 @@ void cmd_gnet(char *argbuf) {
 
 
 void cmd_snet(char *argbuf) {
-       char tempfilename[256];
-       char filename[256];
-       char buf[256];
+       char tempfilename[SIZ];
+       char filename[SIZ];
+       char buf[SIZ];
        FILE *fp;
 
        if (CtdlAccessCheck(ac_room_aide)) return;
@@ -94,10 +86,71 @@ void cmd_snet(char *argbuf) {
        }
        fclose(fp);
 
-       /* Now that we've got the whole file, put it in place */
+       /* Now copy the temp file to its permanent location
+        * (We use /bin/mv instead of link() because they may be on
+        * different filesystems)
+        */
        unlink(filename);
-       link(tempfilename, filename);
-       unlink(tempfilename);
+       snprintf(buf, sizeof buf, "/bin/mv %s %s", tempfilename, filename);
+       system(buf);
+}
+
+
+
+/*
+ * Spools out one message from the list.
+ */
+void network_spool_msg(long msgnum, void *userdata) {
+       struct SpoolControl *sc;
+       struct namelist *nptr;
+       int err;
+       char *instr = NULL;
+       int instr_len = 0;
+       struct CtdlMessage *imsg;
+
+       sc = (struct SpoolControl *)userdata;
+
+       /* If no recipients, bail out now.
+        * (May need to tweak this when we add other types of targets)
+        */
+       if (sc->listrecps == NULL) return;
+       
+       /* First, copy it to the spoolout room */
+       err = CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, msgnum, 0);
+       if (err != 0) return;
+
+       lprintf(9, "Generating delivery instructions\n");
+       instr_len = 4096;
+       instr = mallok(instr_len);
+       sprintf(instr,
+               "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+               "bounceto|postmaster@%s\n" ,
+               SPOOLMIME, msgnum, time(NULL), config.c_fqdn );
+
+               imsg = mallok(sizeof(struct CtdlMessage));
+       memset(imsg, 0, sizeof(struct CtdlMessage));
+       imsg->cm_magic = CTDLMESSAGE_MAGIC;
+       imsg->cm_anon_type = MES_NORMAL;
+       imsg->cm_format_type = FMT_RFC822;
+       imsg->cm_fields['A'] = strdoop("Citadel");
+       imsg->cm_fields['M'] = instr;
+
+       /* Generate delivery instructions for each recipient */
+       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
+               if (instr_len - strlen(instr) < SIZ) {
+                       instr_len = instr_len * 2;
+                       instr = reallok(instr, instr_len);
+               }
+               sprintf(&instr[strlen(instr)], "remote|%s|0||\n",
+                       nptr->name);
+       }
+
+       /* Save delivery instructions in spoolout room */
+       CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL);
+       CtdlFreeMessage(imsg);
+
+       /* update lastsent */
+       sc->lastsent = msgnum;
 }
 
 
@@ -107,15 +160,15 @@ void cmd_snet(char *argbuf) {
  * Batch up and send all outbound traffic from the current room
  */
 void network_spoolout_current_room(void) {
-       char filename[256];
-       char buf[256];
-       char instr[256];
+       char filename[SIZ];
+       char buf[SIZ];
+       char instr[SIZ];
        FILE *fp;
-       long lastsent = 0L;
-       struct namelist *listrecps = NULL;
+       struct SpoolControl sc;
        /* struct namelist *digestrecps = NULL; */
        struct namelist *nptr;
 
+       memset(&sc, 0, sizeof(struct SpoolControl));
        assoc_file_name(filename, &CC->quickroom, "netconfigs");
 
        fp = fopen(filename, "r");
@@ -133,14 +186,14 @@ void network_spoolout_current_room(void) {
 
                extract(instr, buf, 0);
                if (!strcasecmp(instr, "lastsent")) {
-                       lastsent = extract_long(buf, 1);
+                       sc.lastsent = extract_long(buf, 1);
                }
                else if (!strcasecmp(instr, "listrecp")) {
                        nptr = (struct namelist *)
                                mallok(sizeof(struct namelist));
-                       nptr->next = listrecps;
+                       nptr->next = sc.listrecps;
                        extract(nptr->name, buf, 1);
-                       listrecps = nptr;
+                       sc.listrecps = nptr;
                }
 
 
@@ -149,11 +202,8 @@ void network_spoolout_current_room(void) {
 
 
        /* Do something useful */
-
-
-
-
-
+       CtdlForEachMessage(MSGS_GT, sc.lastsent, (-63), NULL, NULL,
+               network_spool_msg, &sc);
 
 
        /* Now rewrite the config file */
@@ -163,16 +213,16 @@ void network_spoolout_current_room(void) {
                        filename, strerror(errno));
        }
        else {
-               fprintf(fp, "lastsent|%ld\n", lastsent);
+               fprintf(fp, "lastsent|%ld\n", sc.lastsent);
 
                /* Write out the listrecps while freeing from memory at the
                 * same time.  Am I clever or what?  :)
                 */
-               while (listrecps != NULL) {
-                       fprintf(fp, "listrecp|%s\n", listrecps->name);
-                       nptr = listrecps->next;
-                       phree(listrecps);
-                       listrecps = nptr;
+               while (sc.listrecps != NULL) {
+                       fprintf(fp, "listrecp|%s\n", sc.listrecps->name);
+                       nptr = sc.listrecps->next;
+                       phree(sc.listrecps);
+                       sc.listrecps = nptr;
                }
 
                fclose(fp);
@@ -190,7 +240,7 @@ void cmd_batc(char *argbuf) {
 
        network_spoolout_current_room();
 
-       cprintf("%d ok\n", OK);
+       cprintf("%d FIXME cmd_batc() ok\n", OK);
 }