/*
* $Id$
*
- * This module will eventually replace netproc and some of its utilities. In
- * the meantime, it serves as a mailing list manager.
+ * This module handles shared rooms, inter-Citadel mail, and outbound
+ * mailing list processing.
*
* Copyright (C) 2000-2001 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
*/
+/*
+ * FIXME
+ * Don't allow polls during network processing
+ * Use table isn't saving properly across sessions
+ */
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include "tools.h"
#include "internet_addressing.h"
#include "serv_network.h"
+#include "clientsocket.h"
+#include "file_ops.h"
/*
* is global; this process *only* runs as part of the housekeeping loop and
* therefore only one will run at a time.
*/
-struct RoomProcList {
- struct RoomProcList *next;
- char name[ROOMNAMELEN];
-};
-
struct RoomProcList *rplist = NULL;
+/*
+ * We build a map of network nodes during processing.
+ */
+struct NetMap *the_netmap = NULL;
+
/*
- * We build a map of the Citadel network during network runs.
+ * Manage the use table. This is a list of messages which have recently
+ * arrived on the system. It is maintained and queried to prevent the same
+ * message from being entered into the database multiple times if it happens
+ * to arrive multiple times by accident.
*/
-struct NetMap {
- struct NetMap *next;
- char nodename[SIZ];
- time_t lastcontact;
- char nexthop[SIZ];
-};
+int network_usetable(int operation, struct CtdlMessage *msg) {
-struct NetMap *the_netmap = NULL;
+ static struct UseTable *ut = NULL;
+ struct UseTable *uptr = NULL;
+ char *serialized_table = NULL;
+ char msgid[SIZ];
+ char buf[SIZ];
+ int i;
+ size_t stlen = 0;
+
+ switch(operation) {
+
+ case UT_LOAD:
+ serialized_table = CtdlGetSysConfig(USETABLE);
+ if (serialized_table == NULL) return(0);
+
+ for (i=0; i<num_tokens(serialized_table, '\n'); ++i) {
+ extract_token(buf, serialized_table, i, '\n');
+ uptr = (struct UseTable *)
+ mallok(sizeof(struct UseTable));
+ if (uptr != NULL) {
+ uptr->next = ut;
+ extract(msgid, buf, 0);
+ uptr->message_id = strdoop(msgid);
+ uptr->timestamp = extract_long(buf, 1);
+ ut = uptr;
+ }
+ }
+
+ phree(serialized_table);
+ serialized_table = NULL;
+ return(0);
+
+ case UT_INSERT:
+ /* Bail out if we can't generate a message ID */
+ if (msg == NULL) {
+ return(0);
+ }
+ if (msg->cm_fields['I'] == NULL) {
+ return(0);
+ }
+ if (strlen(msg->cm_fields['I']) == 0) {
+ return(0);
+ }
+
+ /* Generate the message ID */
+ strcpy(msgid, msg->cm_fields['I']);
+ if (haschar(msgid, '@') == 0) {
+ strcat(msgid, "@");
+ if (msg->cm_fields['N'] != NULL) {
+ strcat(msgid, msg->cm_fields['N']);
+ }
+ else {
+ return(0);
+ }
+ }
+ /* Compare to the existing list */
+ for (uptr = ut; uptr != NULL; uptr = uptr->next) {
+ if (!strcasecmp(msgid, uptr->message_id)) {
+ return(1);
+ }
+ }
+
+ /* If we got to this point, it's unique: add it. */
+ uptr = (struct UseTable *)
+ mallok(sizeof(struct UseTable));
+ if (uptr == NULL) return(0);
+ uptr->next = ut;
+ uptr->message_id = strdoop(msgid);
+ uptr->timestamp = time(NULL);
+ ut = uptr;
+ return(0);
+
+ case UT_SAVE:
+ /* Figure out how big the serialized buffer should be */
+ stlen = 0;
+ for (uptr = ut; uptr != NULL; uptr = uptr->next) {
+ stlen = stlen + strlen(uptr->message_id) + 20;
+ }
+ serialized_table = mallok(stlen);
+
+ while (ut != NULL) {
+ if (serialized_table != NULL) {
+ sprintf(&serialized_table[strlen(
+ serialized_table)], "%s|%ld\n",
+ ut->message_id,
+ ut->timestamp);
+ }
+
+ /* Now free the memory */
+ uptr = ut;
+ ut = ut->next;
+ phree(uptr->message_id);
+ phree(uptr);
+ }
+
+ /* Write to disk */
+ CtdlPutSysConfig(USETABLE, serialized_table);
+ phree(serialized_table);
+ return(0);
+
+ }
+
+ /* should never get here unless illegal operation specified */
+ return(2);
+}
/*
/*
* Check the network map and determine whether the supplied node name is
* valid. If it is not a neighbor node, supply the name of a neighbor node
- * which is the next hop.
+ * which is the next hop. If it *is* a neighbor node, we also fill in the
+ * shared secret.
*/
-int is_valid_node(char *nexthop, char *node) {
+int is_valid_node(char *nexthop, char *secret, char *node) {
char *ignetcfg = NULL;
int i;
char linebuf[SIZ];
if (nexthop != NULL) {
strcpy(nexthop, "");
}
+ if (secret != NULL) {
+ extract(secret, linebuf, 1);
+ }
retval = 0;
}
}
char *instr = NULL;
char *newpath = NULL;
size_t instr_len = SIZ;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct CtdlMessage *imsg;
struct ser_ret sermsg;
FILE *fp;
* 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;
send = 1;
/* Check for valid node name */
- if (is_valid_node(NULL, nptr->name) != 0) {
+ if (is_valid_node(NULL,NULL,nptr->name) != 0) {
lprintf(3, "Invalid node <%s>\n",
nptr->name);
send = 0;
}
/* Check for split horizon */
+ lprintf(9, "Path is %s\n", msg->cm_fields['P']);
bang = num_tokens(msg->cm_fields['P'], '!');
if (bang > 1) for (i=0; i<(bang-1); ++i) {
extract_token(buf, msg->cm_fields['P'],
}
}
}
+ phree(sermsg.ser);
+ CtdlFreeMessage(msg);
}
}
+
+/*
+ * Bounce a message back to the sender
+ */
+void network_bounce(struct CtdlMessage *msg, char *reason) {
+ static int serialnum = 0;
+ FILE *fp;
+ char filename[SIZ];
+ struct ser_ret sermsg;
+ char *oldpath = NULL;
+ char buf[SIZ];
+
+ lprintf(9, "entering network_bounce()\n");
+
+ if (msg == NULL) return;
+
+ /*
+ * Give it a fresh message ID
+ */
+ if (msg->cm_fields['I'] != NULL) {
+ phree(msg->cm_fields['I']);
+ }
+ sprintf(buf, "%ld.%04x.%04x@%s",
+ time(NULL), getpid(), ++serialnum, config.c_fqdn);
+ msg->cm_fields['I'] = strdoop(buf);
+
+ /*
+ * FIXME ... right now we're just sending a bounce; we really want to
+ * include the text of the bounced message.
+ */
+ if (msg->cm_fields['M'] != NULL) {
+ phree(msg->cm_fields['M']);
+ }
+ msg->cm_fields['M'] = strdoop(reason);
+ msg->cm_format_type = 0;
+
+ /*
+ * Turn the message around
+ */
+ if (msg->cm_fields['R'] == NULL) {
+ phree(msg->cm_fields['R']);
+ }
+
+ if (msg->cm_fields['D'] == NULL) {
+ phree(msg->cm_fields['D']);
+ }
+
+ msg->cm_fields['R'] = msg->cm_fields['A'];
+ msg->cm_fields['D'] = msg->cm_fields['N'];
+ msg->cm_fields['A'] = strdoop(BOUNCESOURCE);
+ msg->cm_fields['N'] = strdoop(config.c_nodename);
+
+ if (!strcasecmp(msg->cm_fields['D'], config.c_nodename)) {
+ phree(msg->cm_fields['D']);
+ }
+
+ /*
+ * If this is a bounce of a bounce, send it to the Aide> room
+ * instead of looping around forever
+ */
+ if (msg->cm_fields['D'] == NULL) if (msg->cm_fields['R'] != NULL)
+ if (!strcasecmp(msg->cm_fields['R'], BOUNCESOURCE)) {
+ phree(msg->cm_fields['R']);
+ if (msg->cm_fields['C'] != NULL) {
+ phree(msg->cm_fields['C']);
+ }
+ msg->cm_fields['C'] = strdoop(AIDEROOM);
+ }
+
+ /* prepend our node to the path */
+ if (msg->cm_fields['P'] != NULL) {
+ oldpath = msg->cm_fields['P'];
+ msg->cm_fields['P'] = NULL;
+ }
+ else {
+ oldpath = strdoop("unknown_user");
+ }
+ msg->cm_fields['P'] = mallok(strlen(oldpath) + SIZ);
+ sprintf(msg->cm_fields['P'], "%s!%s", config.c_nodename, oldpath);
+ phree(oldpath);
+
+ /* serialize the message */
+ serialize_message(&sermsg, msg);
+
+ /* now send it */
+ sprintf(filename, "./network/spoolin/bounce.%04x.%04x",
+ getpid(), serialnum);
+
+ fp = fopen(filename, "ab");
+ if (fp != NULL) {
+ fwrite(sermsg.ser,
+ sermsg.len, 1, fp);
+ fclose(fp);
+ }
+ phree(sermsg.ser);
+ CtdlFreeMessage(msg);
+ lprintf(9, "leaving network_bounce()\n");
+}
+
+
+
+
/*
* Process a buffer containing a single message from a single file
* from the inbound queue
struct usersupp tempUS;
char recp[SIZ];
char target_room[ROOMNAMELEN];
+ struct ser_ret sermsg;
+ char *oldpath = NULL;
+ char filename[SIZ];
+ FILE *fp;
/* Set default target room to trash */
strcpy(target_room, TWITROOM);
if (msg->cm_fields['D'] != NULL) {
if (strcasecmp(msg->cm_fields['D'], config.c_nodename)) {
- if (is_valid_node(NULL, msg->cm_fields['D']) == 0) {
-
- /* FIXME route the message, stupid */
-
+ /* route the message */
+ if (is_valid_node(NULL, NULL,
+ msg->cm_fields['D']) == 0) {
+ /* prepend our node to the path */
+ if (msg->cm_fields['P'] != NULL) {
+ oldpath = msg->cm_fields['P'];
+ msg->cm_fields['P'] = NULL;
+ }
+ else {
+ oldpath = strdoop("unknown_user");
+ }
+ msg->cm_fields['P'] =
+ mallok(strlen(oldpath) + SIZ);
+ sprintf(msg->cm_fields['P'], "%s!%s",
+ config.c_nodename, oldpath);
+ phree(oldpath);
+
+ /* serialize the message */
+ serialize_message(&sermsg, msg);
+
+ /* now send it */
+ sprintf(filename,
+ "./network/spoolout/%s",
+ msg->cm_fields['D']);
+ fp = fopen(filename, "ab");
+ if (fp != NULL) {
+ fwrite(sermsg.ser,
+ sermsg.len, 1, fp);
+ fclose(fp);
+ }
+ phree(sermsg.ser);
+ CtdlFreeMessage(msg);
+ return;
}
else { /* invalid destination node name */
- /* FIXME bounce the msg */
+ network_bounce(msg,
+"A message you sent could not be delivered due to an invalid destination node"
+" name. Please check the address and try sending the message again.\n");
+ msg = NULL;
+ return;
}
}
}
- /* FIXME check to see if we already have this message */
+ /*
+ * Check to see if we already have a copy of this message
+ */
+ if (network_usetable(UT_INSERT, msg) != 0) {
+ /* FIXME - post a msg in Aide> telling us what happened */
+ CtdlFreeMessage(msg);
+ msg = NULL;
+ return;
+ }
/* Learn network topology from the path */
if ((msg->cm_fields['N'] != NULL) && (msg->cm_fields['P'] != NULL)) {
e = alias(recp); /* alias and mail type */
if ((recp[0] == 0) || (e == MES_ERROR)) {
- /* FIXME bounce the msg */
+ network_bounce(msg,
+"A message you sent could not be delivered due to an invalid address.\n"
+"Please check the address and try sending the message again.\n");
+ msg = NULL;
+ return;
}
else if (e == MES_LOCAL) {
a = getuser(&tempUS, recp);
if (a != 0) {
- /* FIXME bounce the msg */
+
+ network_bounce(msg,
+"A message you sent could not be delivered because the user does not exist\n"
+"on this system. Please check the address and try again.\n");
+ msg = NULL;
+ return;
+
}
else {
MailboxName(target_room, &tempUS, MAILROOM);
}
+
+
+
+/*
+ * receive network spool from the remote system
+ */
+void receive_spool(int sock, char *remote_nodename) {
+ long download_len;
+ long bytes_received;
+ char buf[SIZ];
+ static char pbuf[IGNET_PACKET_SIZE];
+ char tempfilename[PATH_MAX];
+ long plen;
+ FILE *fp;
+
+ strcpy(tempfilename, tmpnam(NULL));
+ if (sock_puts(sock, "NDOP") < 0) return;
+ if (sock_gets(sock, buf) < 0) return;
+ lprintf(9, "<%s\n", buf);
+ if (buf[0] != '2') {
+ return;
+ }
+ download_len = extract_long(&buf[4], 0);
+
+ bytes_received = 0L;
+ fp = fopen(tempfilename, "w");
+ if (fp == NULL) {
+ lprintf(9, "cannot open download file locally: %s\n",
+ strerror(errno));
+ return;
+ }
+
+ while (bytes_received < download_len) {
+ sprintf(buf, "READ %ld|%ld",
+ bytes_received,
+ ((download_len - bytes_received > IGNET_PACKET_SIZE)
+ ? IGNET_PACKET_SIZE : (download_len - bytes_received)));
+ if (sock_puts(sock, buf) < 0) {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
+ if (sock_gets(sock, buf) < 0) {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
+ if (buf[0] == '6') {
+ plen = extract_long(&buf[4], 0);
+ if (sock_read(sock, pbuf, plen) < 0) {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
+ fwrite((char *) pbuf, plen, 1, fp);
+ bytes_received = bytes_received + plen;
+ }
+ }
+
+ fclose(fp);
+ if (sock_puts(sock, "CLOS") < 0) {
+ unlink(tempfilename);
+ return;
+ }
+ if (sock_gets(sock, buf) < 0) {
+ unlink(tempfilename);
+ return;
+ }
+ lprintf(9, "%s\n", buf);
+ sprintf(buf, "mv %s ./network/spoolin/%s.%ld",
+ tempfilename, remote_nodename, (long) getpid());
+ system(buf);
+}
+
+
+
+/*
+ * transmit network spool to the remote system
+ */
+void transmit_spool(int sock, char *remote_nodename)
+{
+ char buf[SIZ];
+ char pbuf[4096];
+ long plen;
+ long bytes_to_write, thisblock;
+ int fd;
+ char sfname[128];
+
+ if (sock_puts(sock, "NUOP") < 0) return;
+ if (sock_gets(sock, buf) < 0) return;
+ lprintf(9, "<%s\n", buf);
+ if (buf[0] != '2') {
+ return;
+ }
+
+ sprintf(sfname, "./network/spoolout/%s", remote_nodename);
+ fd = open(sfname, O_RDONLY);
+ if (fd < 0) {
+ if (errno == ENOENT) {
+ lprintf(9, "Nothing to send.\n");
+ } else {
+ lprintf(5, "cannot open upload file locally: %s\n",
+ strerror(errno));
+ }
+ return;
+ }
+ while (plen = (long) read(fd, pbuf, IGNET_PACKET_SIZE), plen > 0L) {
+ bytes_to_write = plen;
+ while (bytes_to_write > 0L) {
+ sprintf(buf, "WRIT %ld", bytes_to_write);
+ if (sock_puts(sock, buf) < 0) {
+ close(fd);
+ return;
+ }
+ if (sock_gets(sock, buf) < 0) {
+ close(fd);
+ return;
+ }
+ thisblock = atol(&buf[4]);
+ if (buf[0] == '7') {
+ if (sock_write(sock, pbuf,
+ (int) thisblock) < 0) {
+ close(fd);
+ return;
+ }
+ bytes_to_write = bytes_to_write - thisblock;
+ } else {
+ goto ABORTUPL;
+ }
+ }
+ }
+
+ABORTUPL:
+ close(fd);
+ if (sock_puts(sock, "UCLS 1") < 0) return;
+ if (sock_gets(sock, buf) < 0) return;
+ lprintf(9, "<%s\n", buf);
+ if (buf[0] == '2') {
+ unlink(sfname);
+ }
+}
+
+
+
+/*
+ * Poll one Citadel node (called by network_poll_other_citadel_nodes() below)
+ */
+void network_poll_node(char *node, char *secret, char *host, char *port) {
+ int sock;
+ char buf[SIZ];
+
+ if (network_talking_to(node, NTT_CHECK)) return;
+ network_talking_to(node, NTT_ADD);
+ lprintf(5, "Polling node <%s> at %s:%s\n", node, host, port);
+
+ sock = sock_connect(host, port, "tcp");
+ if (sock < 0) {
+ lprintf(7, "Could not connect: %s\n", strerror(errno));
+ network_talking_to(node, NTT_REMOVE);
+ return;
+ }
+
+ lprintf(9, "Connected!\n");
+
+ /* Read the server greeting */
+ if (sock_gets(sock, buf) < 0) goto bail;
+ lprintf(9, ">%s\n", buf);
+
+ /* Identify ourselves */
+ sprintf(buf, "NETP %s|%s", config.c_nodename, secret);
+ lprintf(9, "<%s\n", buf);
+ if (sock_puts(sock, buf) <0) goto bail;
+ if (sock_gets(sock, buf) < 0) goto bail;
+ lprintf(9, ">%s\n", buf);
+ if (buf[0] != '2') goto bail;
+
+ /* At this point we are authenticated. */
+ receive_spool(sock, node);
+ transmit_spool(sock, node);
+
+ sock_puts(sock, "QUIT");
+bail: sock_close(sock);
+ network_talking_to(node, NTT_REMOVE);
+}
+
+
+
+/*
+ * Poll other Citadel nodes and transfer inbound/outbound network data.
+ */
+void network_poll_other_citadel_nodes(void) {
+ char *ignetcfg = NULL;
+ int i;
+ char linebuf[SIZ];
+ char node[SIZ];
+ char host[SIZ];
+ char port[SIZ];
+ char secret[SIZ];
+
+ ignetcfg = CtdlGetSysConfig(IGNETCFG);
+ if (ignetcfg == NULL) return; /* no nodes defined */
+
+ /* Use the string tokenizer to grab one line at a time */
+ for (i=0; i<num_tokens(ignetcfg, '\n'); ++i) {
+ extract_token(linebuf, ignetcfg, i, '\n');
+ extract(node, linebuf, 0);
+ extract(secret, linebuf, 1);
+ extract(host, linebuf, 2);
+ extract(port, linebuf, 3);
+ if ( (strlen(node) > 0) && (strlen(secret) > 0)
+ && (strlen(host) > 0) && strlen(port) > 0) {
+ network_poll_node(node, secret, host, port);
+ }
+ }
+
+ phree(ignetcfg);
+}
+
+
+
+
+
+
+
/*
* network_do_queue()
*
doing_queue = 1;
last_run = time(NULL);
+ /*
+ * Poll other Citadel nodes.
+ */
+ network_poll_other_citadel_nodes();
+
+ /*
+ * Load the network map and use table into memory.
+ */
read_network_map();
+ network_usetable(UT_LOAD, NULL);
/*
* Go ahead and run the queue
lprintf(7, "network: processing inbound queue\n");
network_do_spoolin();
+ /* Save the usetable and network map back to disk */
+ network_usetable(UT_SAVE, NULL);
write_network_map();
lprintf(7, "network: queue run completed\n");
}
+
+/*
+ * cmd_netp() - authenticate to the server as another Citadel node polling
+ * for network traffic
+ */
+void cmd_netp(char *cmdbuf)
+{
+ char node[SIZ];
+ char pass[SIZ];
+
+ char secret[SIZ];
+ char nexthop[SIZ];
+
+ extract(node, cmdbuf, 0);
+ extract(pass, cmdbuf, 1);
+
+ if (is_valid_node(nexthop, secret, node) != 0) {
+ cprintf("%d authentication failed\n", ERROR);
+ return;
+ }
+
+ if (strcasecmp(pass, secret)) {
+ cprintf("%d authentication failed\n", ERROR);
+ return;
+ }
+
+ if (network_talking_to(node, NTT_CHECK)) {
+ cprintf("%d Already talking to %s right now\n", ERROR);
+ return;
+ }
+
+ safestrncpy(CC->net_node, node, sizeof CC->net_node);
+ network_talking_to(node, NTT_ADD);
+ cprintf("%d authenticated as network node '%s'\n", OK,
+ CC->net_node);
+}
+
+
+
/*
* Module entry point
*/
{
CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
CtdlRegisterProtoHook(cmd_snet, "SNET", "Get network config");
+ CtdlRegisterProtoHook(cmd_netp, "NETP", "Identify as network poller");
CtdlRegisterSessionHook(network_do_queue, EVT_TIMER);
return "$Id$";
}