* Added split horizon and delete-after-spool to the new networker

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 065f18e499396c788aa267c22621939be74c348b..d3baacd9cf2247a355093f105854729b15607c3f 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 580.25  2001/08/15 04:26:02  ajc
+ * Added split horizon and delete-after-spool to the new networker
+
  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.
@@ -2681,3 +2684,4 @@ 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 611b4a8b2e5c78ce938099e9ca7f1260025e769b..77326bd231ae2cacf931036e587e9f205da3622d 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -132,6 +132,7 @@ void network_spool_msg(long msgnum, void *userdata) {
        struct SpoolControl *sc;
        struct namelist *nptr;
        int err;
+       int i;
        char *instr = NULL;
        char *newpath = NULL;
        size_t instr_len = SIZ;
@@ -140,6 +141,10 @@ void network_spool_msg(long msgnum, void *userdata) {
        struct ser_ret sermsg;
        FILE *fp;
        char filename[SIZ];
+       char buf[SIZ];
+       int bang = 0;
+       int send = 1;
+       int delete_after_send = 0;      /* Set to 1 to delete after spooling */
 
        sc = (struct SpoolControl *)userdata;
 
@@ -226,6 +231,17 @@ void network_spool_msg(long msgnum, void *userdata) {
                        }
                        msg->cm_fields['C'] = strdoop(CC->quickroom.QRname);
 
+                       /*
+                        * Determine if this message is set to be deleted
+                        * after sending out on the network
+                        */
+                       if (msg->cm_fields['S'] != NULL) {
+                               if (!strcasecmp(msg->cm_fields['S'],
+                                  "CANCEL")) {
+                                       delete_after_send = 1;
+                               }
+                       }
+
                        /* 
                         * Now serialize it for transmission
                         */
@@ -236,26 +252,44 @@ void network_spool_msg(long msgnum, void *userdata) {
                        for (nptr = sc->ignet_push_shares; nptr != NULL;
                            nptr = nptr->next) {
 
+                               send = 1;
+
                                /* FIXME check for valid node name */
-                               /* FIXME check for split horizon */
+
+                               /* Check for split horizon */
+                               bang = num_tokens(msg->cm_fields['P'], '!');
+                               if (bang > 1) for (i=0; i<(bang-1); ++i) {
+                                       extract_token(buf, msg->cm_fields['P'],
+                                               i, '!');
+                                       if (!strcasecmp(buf, nptr->name)) {
+                                               send = 0;
+                                       }
+                               }
 
                                /* 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);
+                               if (send == 1) {
+                                       sprintf(filename,
+                                               "./network/spoolout/%s",
+                                               nptr->name);
+                                       fp = fopen(filename, "ab");
+                                       if (fp != NULL) {
+                                               fwrite(sermsg.ser,
+                                                       sermsg.len, 1, fp);
+                                               fclose(fp);
+                                       }
                                }
                        }
-
-
                }
-
        }
 
        /* update lastsent */
        sc->lastsent = msgnum;
+
+       /* Delete this message if delete-after-send is set */
+       if (delete_after_send) {
+               CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
+       }
+
 }