* More license declarations

[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 b71d95a5f8d81f40454c1f0dd4ceb1556f00d9e8..d8227a8815cb31f3530ec381fdfceef34db64731 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -4,8 +4,21 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (C) 2000-2005 by Art Cancro and others.
- * This code is released under the terms of the GNU General Public License.
+ * Copyright (c) 2000-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * ** NOTE **   A word on the S_NETCONFIGS semaphore:
  * This is a fairly high-level type of critical section.  It ensures that no
@@ -452,6 +465,7 @@ void network_deliver_digest(SpoolControl *sc) {
        size_t recps_len = SIZ;
        struct recptypes *valid;
        namelist *nptr;
+       char bounce_to[256];
 
        if (sc->num_msgs_spooled < 1) {
                fclose(sc->digestfp);
@@ -527,10 +541,17 @@ void network_deliver_digest(SpoolControl *sc) {
                strcat(recps, nptr->name);
        }
 
+       /* Where do we want bounces and other noise to be heard?  Surely not the list members! */
+       snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+
        /* Now submit the message */
        valid = validate_recipients(recps, NULL, 0);
        free(recps);
-       CtdlSubmitMsg(msg, valid, NULL, 0);
+       if (valid != NULL) {
+               valid->bounce_to = strdup(bounce_to);
+               valid->envelope_from = strdup(bounce_to);
+               CtdlSubmitMsg(msg, valid, NULL, 0);
+       }
        CtdlFreeMessage(msg);
        free_recipients(valid);
 }
@@ -544,6 +565,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) {
        size_t recps_len = SIZ;
        struct recptypes *valid;
        namelist *nptr;
+       char bounce_to[256];
 
        /* Don't do this if there were no recipients! */
        if (sc->listrecps == NULL) return;
@@ -574,11 +596,18 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) {
                strcat(recps, nptr->name);
        }
 
+       /* Where do we want bounces and other noise to be heard?  Surely not the list members! */
+       snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+
        /* Now submit the message */
        valid = validate_recipients(recps, NULL, 0);
        free(recps);
-       CtdlSubmitMsg(msg, valid, NULL, 0);
-       free_recipients(valid);
+       if (valid != NULL) {
+               valid->bounce_to = strdup(bounce_to);
+               valid->envelope_from = strdup(bounce_to);
+               CtdlSubmitMsg(msg, valid, NULL, 0);
+               free_recipients(valid);
+       }
        /* Do not call CtdlFreeMessage(msg) here; the caller will free it. */
 }
 
@@ -2222,9 +2251,8 @@ void cmd_netp(char *cmdbuf)
        extract_token(pass, cmdbuf, 1, '|', sizeof pass);
 
        if (doing_queue) {
-               CtdlLogPrintf(CTDL_WARNING, "Network node <%s> refused - spooling", node);
-               cprintf("%d spooling - try again in a few minutes\n",
-                       ERROR + RESOURCE_BUSY);
+               CtdlLogPrintf(CTDL_WARNING, "Network node <%s> refused - spooling\n", node);
+               cprintf("%d spooling - try again in a few minutes\n", ERROR + RESOURCE_BUSY);
                return;
        }
 
@@ -2233,16 +2261,21 @@ void cmd_netp(char *cmdbuf)
        v = is_valid_node(nexthop, secret, node);
 
        if (v != 0) {
-               snprintf (err_buf, sizeof(err_buf), "Unknown node <%s>\n", node);
+               snprintf(err_buf, sizeof err_buf,
+                       "An unknown Citadel server called \"%s\" attempted to connect from %s [%s].\n",
+                       node, CC->cs_host, CC->cs_addr
+               );
                CtdlLogPrintf(CTDL_WARNING, err_buf);
-               cprintf("%d authentication failed\n",
-                       ERROR + PASSWORD_REQUIRED);
+               cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
                aide_message(err_buf, "IGNet Networking.");
                return;
        }
 
        if (strcasecmp(pass, secret)) {
-               snprintf (err_buf, sizeof(err_buf), "Bad password for network node <%s>", node);
+               snprintf(err_buf, sizeof err_buf,
+                       "A Citadel server at %s [%s] failed to authenticate as network node \"%s\".\n",
+                       CC->cs_host, CC->cs_addr, node
+               );
                CtdlLogPrintf(CTDL_WARNING, err_buf);
                cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
                aide_message(err_buf, "IGNet Networking.");
@@ -2257,17 +2290,20 @@ void cmd_netp(char *cmdbuf)
 
        safestrncpy(CC->net_node, node, sizeof CC->net_node);
        network_talking_to(node, NTT_ADD);
-       CtdlLogPrintf(CTDL_NOTICE, "Network node <%s> logged in\n", CC->net_node);
-       cprintf("%d authenticated as network node '%s'\n", CIT_OK,
-               CC->net_node);
+       CtdlLogPrintf(CTDL_NOTICE, "Network node <%s> logged in from %s [%s]\n",
+               CC->net_node, CC->cs_host, CC->cs_addr
+       );
+       cprintf("%d authenticated as network node '%s'\n", CIT_OK, CC->net_node);
 }
 
+
 int network_room_handler (struct ctdlroom *room)
 {
        network_queue_room(room, NULL);
        return 0;
 }
 
+
 /*
  * Module entry point
  */