* Began the migration of netproc into part of the serv_network.c module instead

  of a standalone program.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4543ca7265dc1c6144bf1583bd0e648b85e666ad..065f18e499396c788aa267c22621939be74c348b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 580.24  2001/08/14 02:41:57  ajc
+ * Began the migration of netproc into part of the serv_network.c module instead
+   of a standalone program.
+
  Revision 580.23  2001/08/11 22:35:40  nbryant
  updated citadel-with-berkeley-db.txt.
   - updated build instructions
@@ -2677,4 +2681,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index 8eeb9b804e14ca38a8cb3637bf201082d9334d9f..611b4a8b2e5c78ce938099e9ca7f1260025e769b 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -133,67 +133,131 @@ void network_spool_msg(long msgnum, void *userdata) {
        struct namelist *nptr;
        int err;
        char *instr = NULL;
+       char *newpath = NULL;
        size_t instr_len = SIZ;
+       struct CtdlMessage *msg;
        struct CtdlMessage *imsg;
+       struct ser_ret sermsg;
+       FILE *fp;
+       char filename[SIZ];
 
        sc = (struct SpoolControl *)userdata;
 
-       /* If no recipients, bail out now.
-        * (May need to tweak this when we add other types of targets)
+       /*
+        * Process mailing list recipients
         */
-       if (sc->listrecps == NULL) return;
+       if (sc->listrecps != NULL) {
        
-       /* First, copy it to the spoolout room */
-       err = CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, msgnum, 0);
-       if (err != 0) return;
-
-       /* 
-        * Figure out how big a buffer we need to allocate
-        */
-       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-               instr_len = instr_len + strlen(nptr->name);
+               /* First, copy it to the spoolout room */
+               err = CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, msgnum, 0);
+               if (err != 0) return;
+
+               /* 
+                * Figure out how big a buffer we need to allocate
+                */
+               for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
+                       instr_len = instr_len + strlen(nptr->name);
+               }
+       
+               /*
+                * allocate...
+                */
+               lprintf(9, "Generating delivery instructions\n");
+               instr = mallok(instr_len);
+               if (instr == NULL) {
+                       lprintf(1, "Cannot allocate %d bytes for instr...\n",
+                               instr_len);
+                       abort();
+               }
+               sprintf(instr,
+                       "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+                       "bounceto|postmaster@%s\n" ,
+                       SPOOLMIME, msgnum, time(NULL), config.c_fqdn );
+       
+               /* Generate delivery instructions for each recipient */
+               for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
+                       sprintf(&instr[strlen(instr)], "remote|%s|0||\n",
+                               nptr->name);
+               }
+       
+               /*
+                * Generate a message from the instructions
+                */
+                       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;
+       
+               /* Save delivery instructions in spoolout room */
+               CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL);
+               CtdlFreeMessage(imsg);
        }
-
+       
        /*
-        * allocate...
+        * Process IGnet push shares
         */
-       lprintf(9, "Generating delivery instructions\n");
-       instr = mallok(instr_len);
-       if (instr == NULL) {
-               lprintf(1, "Cannot allocate %d bytes for instr...\n",
-                       instr_len);
-               abort();
-       }
-       sprintf(instr,
-               "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
-               "bounceto|postmaster@%s\n" ,
-               SPOOLMIME, msgnum, time(NULL), config.c_fqdn );
-
-       /* Generate delivery instructions for each recipient */
-       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-               sprintf(&instr[strlen(instr)], "remote|%s|0||\n",
-                       nptr->name);
-       }
+       if (sc->ignet_push_shares != NULL) {
+       
+               msg = CtdlFetchMessage(msgnum);
+               if (msg != NULL) {
+
+                       /* Prepend our node name to the Path field whenever
+                        * sending a message to another IGnet node
+                        */
+                       if (msg->cm_fields['P'] == NULL) {
+                               msg->cm_fields['P'] = strdoop("username");
+                       }
+                       newpath = mallok(strlen(msg->cm_fields['P']) + 
+                                       strlen(config.c_nodename) + 2);
+                       sprintf(newpath, "%s!%s", config.c_nodename,
+                                       msg->cm_fields['P']);
+                       phree(msg->cm_fields['P']);
+                       msg->cm_fields['P'] = newpath;
+
+                       /*
+                        * Force the message to appear in the correct room
+                        * on the far end by setting the C field correctly
+                        */
+                       if (msg->cm_fields['C'] != NULL) {
+                               phree(msg->cm_fields['C']);
+                       }
+                       msg->cm_fields['C'] = strdoop(CC->quickroom.QRname);
+
+                       /* 
+                        * Now serialize it for transmission
+                        */
+                       serialize_message(&sermsg, msg);
+                       CtdlFreeMessage(msg);
+
+                       /* Now send it to every node */
+                       for (nptr = sc->ignet_push_shares; nptr != NULL;
+                           nptr = nptr->next) {
+
+                               /* FIXME check for valid node name */
+                               /* FIXME check for split horizon */
+
+                               /* Send the message */
+                               sprintf(filename, "./network/spoolout/%s",
+                                       nptr->name);
+                               fp = fopen(filename, "ab");
+                               if (fp != NULL) {
+                                       fwrite(sermsg.ser, sermsg.len, 1, fp);
+                                       fclose(fp);
+                               }
+                       }
 
-       /*
-        * Generate a message from the instructions
-        */
-               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;
-
-       /* Save delivery instructions in spoolout room */
-       CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL);
-       CtdlFreeMessage(imsg);
+
+               }
+
+       }
 
        /* update lastsent */
        sc->lastsent = msgnum;
 }
-
+       
 
 
 
@@ -242,6 +306,13 @@ void network_spoolout_room(char *room_to_spool) {
                        extract(nptr->name, buf, 1);
                        sc.listrecps = nptr;
                }
+               else if (!strcasecmp(instr, "ignet_push_share")) {
+                       nptr = (struct namelist *)
+                               mallok(sizeof(struct namelist));
+                       nptr->next = sc.ignet_push_shares;
+                       extract(nptr->name, buf, 1);
+                       sc.ignet_push_shares = nptr;
+               }
 
 
        }
@@ -271,6 +342,13 @@ void network_spoolout_room(char *room_to_spool) {
                        phree(sc.listrecps);
                        sc.listrecps = nptr;
                }
+               while (sc.ignet_push_shares != NULL) {
+                       fprintf(fp, "ignet_push_share|%s\n",
+                               sc.ignet_push_shares->name);
+                       nptr = sc.ignet_push_shares->next;
+                       phree(sc.ignet_push_shares);
+                       sc.ignet_push_shares = nptr;
+               }
 
                fclose(fp);
        }

diff --git a/citadel/serv_network.h b/citadel/serv_network.h
index d01639db9deeca0d662c73543737291c770b06be..60ebce1e589d69a296e86fb9dbd59010e320a534 100644 (file)
--- a/citadel/serv_network.h
+++ b/citadel/serv_network.h
@@ -6,4 +6,5 @@ struct namelist {
 struct SpoolControl {
        long lastsent;
        struct namelist *listrecps;
+       struct namelist *ignet_push_shares;
 };

diff --git a/citadel/techdoc/netconfigs.txt b/citadel/techdoc/netconfigs.txt
index 9b611aca55df5003842dca3804c5bff9e2425cf9..e555b6d23d4e4ed4bd75423a56d511e211687f81 100644 (file)
--- a/citadel/techdoc/netconfigs.txt
+++ b/citadel/techdoc/netconfigs.txt
@@ -26,3 +26,14 @@ out messages should do stuff.
  DESCRIPTION:
     Defines a recipient to whom all messages in this room should be sent.  This
 is used for "list serve" applications.
+ 
+ 
+ INSTRUCTION:  ignet_push_share
+ SYNTAX:       ignet_push_share|uncnsrd
+ DESCRIPTION:
+    Specifies that the second argument is the name of a neighboring node on an
+IGnet (Citadel/UX networking) network, to which this room should be pushed
+(spooled).  Conceptually, this node will have a corresponding record pushing
+data in the other direction.
+ 
+