*
*/
-/*
- * FIXME
- * Don't allow polls during network processing
- */
-
/*
* Duration of time (in seconds) after which pending list subscribe/unsubscribe
* requests that have not been confirmed will be deleted.
#include "snprintf.h"
#endif
+/* Nonzero while we are doing outbound network processing */
+static int doing_queue = 0;
/*
* When we do network processing, it's accomplished in two passes; one to
*/
struct NetMap *the_netmap = NULL;
+char *ignetcfg = NULL;
+
/*
* Keep track of what messages to reject
*/
/* Use the string tokenizer to grab one line at a time */
for (i=0; i<num_tokens(serialized_list, '\n'); ++i) {
extract_token(buf, serialized_list, i, '\n');
- nptr = (struct FilterList *) mallok(sizeof(struct FilterList));
+ nptr = (struct FilterList *) malloc(sizeof(struct FilterList));
extract(nptr->fl_user, buf, 0);
striplt(nptr->fl_user);
extract(nptr->fl_room, buf, 1);
*/
if (strlen(nptr->fl_user) + strlen(nptr->fl_room)
+ strlen(nptr->fl_node) == 0) {
- phree(nptr);
+ free(nptr);
}
else {
nptr->next = newlist;
}
}
- phree(serialized_list);
+ free(serialized_list);
return newlist;
}
void free_filter_list(struct FilterList *fl) {
if (fl == NULL) return;
free_filter_list(fl->next);
- phree(fl);
+ free(fl);
}
/* Use the string tokenizer to grab one line at a time */
for (i=0; i<num_tokens(serialized_map, '\n'); ++i) {
extract_token(buf, serialized_map, i, '\n');
- nmptr = (struct NetMap *) mallok(sizeof(struct NetMap));
+ nmptr = (struct NetMap *) malloc(sizeof(struct NetMap));
extract(nmptr->nodename, buf, 0);
nmptr->lastcontact = extract_long(buf, 1);
extract(nmptr->nexthop, buf, 2);
the_netmap = nmptr;
}
- phree(serialized_map);
+ free(serialized_map);
}
char *serialized_map = NULL;
struct NetMap *nmptr;
- serialized_map = strdoop("");
+ serialized_map = strdup("");
if (the_netmap != NULL) {
for (nmptr = the_netmap; nmptr != NULL; nmptr = nmptr->next) {
- serialized_map = reallok(serialized_map,
+ serialized_map = realloc(serialized_map,
(strlen(serialized_map)+SIZ) );
if (strlen(nmptr->nodename) > 0) {
snprintf(&serialized_map[strlen(serialized_map)],
}
CtdlPutSysConfig(IGNETMAP, serialized_map);
- phree(serialized_map);
+ free(serialized_map);
/* Now free the list */
while (the_netmap != NULL) {
nmptr = the_netmap->next;
- phree(the_netmap);
+ free(the_netmap);
the_netmap = nmptr;
}
}
* shared secret.
*/
int is_valid_node(char *nexthop, char *secret, char *node) {
- char *ignetcfg = NULL;
int i;
char linebuf[SIZ];
char buf[SIZ];
/*
* First try the neighbor nodes
*/
- ignetcfg = CtdlGetSysConfig(IGNETCFG);
if (ignetcfg == NULL) {
if (nexthop != NULL) {
strcpy(nexthop, "");
}
}
- phree(ignetcfg);
if (retval == 0) {
return(retval); /* yup, it's a direct neighbor */
}
/*
* If we get to this point, the supplied node name is bogus.
*/
- lprintf(5, "Invalid node name <%s>\n", node);
+ lprintf(CTDL_ERR, "Invalid node name <%s>\n", node);
return(-1);
}
FILE *fp;
if (CtdlAccessCheck(ac_room_aide)) return;
- assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
cprintf("%d Network settings for room #%ld <%s>\n",
LISTING_FOLLOWS,
- CC->quickroom.QRnumber, CC->quickroom.QRname);
+ CC->room.QRnumber, CC->room.QRname);
fp = fopen(filename, "r");
if (fp != NULL) {
if (CtdlAccessCheck(ac_room_aide)) return;
safestrncpy(tempfilename, tmpnam(NULL), sizeof tempfilename);
- assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
fp = fopen(tempfilename, "w");
if (fp == NULL) {
cprintf("%d Cannot open %s: %s\n",
- ERROR+INTERNAL_ERROR,
+ ERROR + INTERNAL_ERROR,
tempfilename,
strerror(errno));
}
/*
* allocate...
*/
- lprintf(9, "Generating delivery instructions\n");
- instr = mallok(instr_len);
+ lprintf(CTDL_DEBUG, "Generating delivery instructions\n");
+ instr = malloc(instr_len);
if (instr == NULL) {
- lprintf(1, "Cannot allocate %ld bytes for instr...\n",
+ lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for instr...\n",
(long)instr_len);
abort();
}
/*
* Generate a message from the instructions
*/
- imsg = mallok(sizeof(struct CtdlMessage));
+ imsg = malloc(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['A'] = strdup("Citadel");
imsg->cm_fields['M'] = instr;
/* Save delivery instructions in spoolout room */
* sending a message to another IGnet node
*/
if (msg->cm_fields['P'] == NULL) {
- msg->cm_fields['P'] = strdoop("username");
+ msg->cm_fields['P'] = strdup("username");
}
newpath_len = strlen(msg->cm_fields['P']) +
strlen(config.c_nodename) + 2;
- newpath = mallok(newpath_len);
+ newpath = malloc(newpath_len);
snprintf(newpath, newpath_len, "%s!%s",
config.c_nodename, msg->cm_fields['P']);
- phree(msg->cm_fields['P']);
+ free(msg->cm_fields['P']);
msg->cm_fields['P'] = newpath;
/*
* on the far end by setting the C field correctly
*/
if (msg->cm_fields['C'] != NULL) {
- phree(msg->cm_fields['C']);
+ free(msg->cm_fields['C']);
}
- msg->cm_fields['C'] = strdoop(CC->quickroom.QRname);
+ msg->cm_fields['C'] = strdup(CC->room.QRname);
/*
* Determine if this message is set to be deleted
/* Check for valid node name */
if (is_valid_node(NULL,NULL,nptr->name) != 0) {
- lprintf(3, "Invalid node <%s>\n",
+ lprintf(CTDL_ERR, "Invalid node <%s>\n",
nptr->name);
send = 0;
}
/* Check for split horizon */
- lprintf(9, "Path is %s\n", msg->cm_fields['P']);
+ lprintf(CTDL_DEBUG, "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);
+ free(sermsg.ser);
CtdlFreeMessage(msg);
}
}
/* Delete this message if delete-after-send is set */
if (delete_after_send) {
- CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
+ CtdlDeleteMessages(CC->room.QRname, msgnum, "");
}
}
return;
}
- msg = mallok(sizeof(struct CtdlMessage));
+ msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_format_type = FMT_RFC822;
msg->cm_anon_type = MES_NORMAL;
sprintf(buf, "%ld", time(NULL));
- msg->cm_fields['T'] = strdoop(buf);
- msg->cm_fields['A'] = strdoop(CC->quickroom.QRname);
- msg->cm_fields['U'] = strdoop(CC->quickroom.QRname);
- sprintf(buf, "room_%s@%s", CC->quickroom.QRname, config.c_fqdn);
+ msg->cm_fields['T'] = strdup(buf);
+ msg->cm_fields['A'] = strdup(CC->room.QRname);
+ msg->cm_fields['U'] = strdup(CC->room.QRname);
+ sprintf(buf, "room_%s@%s", CC->room.QRname, config.c_fqdn);
for (i=0; i<strlen(buf); ++i) {
if (isspace(buf[i])) buf[i]='_';
buf[i] = tolower(buf[i]);
}
- msg->cm_fields['F'] = strdoop(buf);
+ msg->cm_fields['F'] = strdup(buf);
fseek(sc->digestfp, 0L, SEEK_END);
msglen = ftell(sc->digestfp);
- msg->cm_fields['M'] = mallok(msglen + 1);
+ msg->cm_fields['M'] = malloc(msglen + 1);
fseek(sc->digestfp, 0L, SEEK_SET);
fread(msg->cm_fields['M'], (size_t)msglen, 1, sc->digestfp);
msg->cm_fields['M'][msglen] = 0;
/*
* allocate...
*/
- lprintf(9, "Generating delivery instructions\n");
- instr = mallok(instr_len);
+ lprintf(CTDL_DEBUG, "Generating delivery instructions\n");
+ instr = malloc(instr_len);
if (instr == NULL) {
- lprintf(1, "Cannot allocate %ld bytes for instr...\n",
+ lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for instr...\n",
(long)instr_len);
abort();
}
/*
* Generate a message from the instructions
*/
- imsg = mallok(sizeof(struct CtdlMessage));
+ imsg = malloc(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['A'] = strdup("Citadel");
imsg->cm_fields['M'] = instr;
/* Save delivery instructions in spoolout room */
char instr[SIZ];
FILE *fp;
struct SpoolControl sc;
- struct namelist *nptr;
+ struct namelist *nptr = NULL;
size_t miscsize = 0;
size_t linesize = 0;
int skipthisline = 0;
int i;
- lprintf(7, "Spooling <%s>\n", room_to_spool);
- if (getroom(&CC->quickroom, room_to_spool) != 0) {
- lprintf(1, "ERROR: cannot load <%s>\n", room_to_spool);
+ if (getroom(&CC->room, room_to_spool) != 0) {
+ lprintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
return;
}
memset(&sc, 0, sizeof(struct SpoolControl));
- assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
begin_critical_section(S_NETCONFIGS);
end_critical_section(S_NETCONFIGS);
fp = fopen(filename, "r");
if (fp == NULL) {
- lprintf(7, "Outbound batch processing skipped for <%s>\n",
- CC->quickroom.QRname);
end_critical_section(S_NETCONFIGS);
return;
}
- lprintf(5, "Outbound batch processing started for <%s>\n",
- CC->quickroom.QRname);
+ lprintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
while (fgets(buf, sizeof buf, fp) != NULL) {
buf[strlen(buf)-1] = 0;
}
else if (!strcasecmp(instr, "listrecp")) {
nptr = (struct namelist *)
- mallok(sizeof(struct namelist));
+ malloc(sizeof(struct namelist));
nptr->next = sc.listrecps;
extract(nptr->name, buf, 1);
sc.listrecps = nptr;
}
else if (!strcasecmp(instr, "digestrecp")) {
nptr = (struct namelist *)
- mallok(sizeof(struct namelist));
+ malloc(sizeof(struct namelist));
nptr->next = sc.digestrecps;
extract(nptr->name, buf, 1);
sc.digestrecps = nptr;
}
else if (!strcasecmp(instr, "ignet_push_share")) {
nptr = (struct namelist *)
- mallok(sizeof(struct namelist));
+ malloc(sizeof(struct namelist));
nptr->next = sc.ignet_push_shares;
extract(nptr->name, buf, 1);
sc.ignet_push_shares = nptr;
/* If we wrote a digest, deliver it and then close it */
snprintf(buf, sizeof buf, "room_%s@%s",
- CC->quickroom.QRname, config.c_fqdn);
+ CC->room.QRname, config.c_fqdn);
for (i=0; i<strlen(buf); ++i) {
buf[i] = tolower(buf[i]);
if (isspace(buf[i])) buf[i] = '_';
"You are subscribed to the '%s' "
"list.\n"
"To post to the list: %s\n",
- CC->quickroom.QRname, buf
+ CC->room.QRname, buf
);
network_deliver_digest(&sc); /* deliver and close */
}
/* Now rewrite the config file */
fp = fopen(filename, "w");
if (fp == NULL) {
- lprintf(1, "ERROR: cannot open %s: %s\n",
+ lprintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n",
filename, strerror(errno));
}
else {
while (sc.listrecps != NULL) {
fprintf(fp, "listrecp|%s\n", sc.listrecps->name);
nptr = sc.listrecps->next;
- phree(sc.listrecps);
+ free(sc.listrecps);
sc.listrecps = nptr;
}
/* Do the same for digestrecps */
while (sc.digestrecps != NULL) {
fprintf(fp, "digestrecp|%s\n", sc.digestrecps->name);
nptr = sc.digestrecps->next;
- phree(sc.digestrecps);
+ free(sc.digestrecps);
sc.digestrecps = nptr;
}
while (sc.ignet_push_shares != NULL) {
- fprintf(fp, "ignet_push_share|%s\n",
- sc.ignet_push_shares->name);
+ /* by checking each node's validity, we automatically
+ * purge nodes which do not exist from room network
+ * configurations at this time.
+ */
+ if (is_valid_node(NULL, NULL, nptr->name) == 0) {
+ fprintf(fp, "ignet_push_share|%s\n",
+ sc.ignet_push_shares->name);
+ }
nptr = sc.ignet_push_shares->next;
- phree(sc.ignet_push_shares);
+ free(sc.ignet_push_shares);
sc.ignet_push_shares = nptr;
}
if (sc.misc != NULL) {
fwrite(sc.misc, strlen(sc.misc), 1, fp);
}
- phree(sc.misc);
+ free(sc.misc);
fclose(fp);
}
end_critical_section(S_NETCONFIGS);
+}
+
+
+
+/*
+ * Send the *entire* contents of the current room to one specific network node,
+ * ignoring anything we know about which messages have already undergone
+ * network processing. This can be used to bring a new node into sync.
+ */
+int network_sync_to(char *target_node) {
+ struct SpoolControl sc;
+ int num_spooled = 0;
+
+ /* Concise syntax because we don't need a full linked-list */
+ memset(&sc, 0, sizeof(struct SpoolControl));
+ sc.ignet_push_shares = (struct namelist *)
+ malloc(sizeof(struct namelist));
+ sc.ignet_push_shares->next = NULL;
+ safestrncpy(sc.ignet_push_shares->name,
+ target_node,
+ sizeof sc.ignet_push_shares->name);
+
+ /* Send ALL messages */
+ num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL,
+ network_spool_msg, &sc);
- lprintf(5, "Outbound batch processing finished for <%s>\n",
- CC->quickroom.QRname);
+ /* Concise cleanup because we know there's only one node in the sc */
+ free(sc.ignet_push_shares);
+
+ lprintf(CTDL_INFO, "Synchronized %d messages to <%s>\n",
+ num_spooled, target_node);
+ return(num_spooled);
}
+/*
+ * Implements the NSYN command
+ */
+void cmd_nsyn(char *argbuf) {
+ int num_spooled;
+ char target_node[SIZ];
+
+ if (CtdlAccessCheck(ac_aide)) return;
+
+ extract(target_node, argbuf, 0);
+ num_spooled = network_sync_to(target_node);
+ cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled);
+}
+
+
+
/*
* Batch up and send all outbound traffic from the current room
*/
-void network_queue_room(struct quickroom *qrbuf, void *data) {
+void network_queue_room(struct ctdlroom *qrbuf, void *data) {
struct RoomProcList *ptr;
- ptr = (struct RoomProcList *) mallok(sizeof (struct RoomProcList));
+ ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
if (ptr == NULL) return;
safestrncpy(ptr->name, qrbuf->QRname, sizeof ptr->name);
}
/* If we got here then it's not in the map, so add it. */
- nmptr = (struct NetMap *) mallok(sizeof (struct NetMap));
+ nmptr = (struct NetMap *) malloc(sizeof (struct NetMap));
strcpy(nmptr->nodename, node);
nmptr->lastcontact = time(NULL);
extract_token(nmptr->nexthop, path, 0, '!');
static int serialnum = 0;
size_t size;
- lprintf(9, "entering network_bounce()\n");
+ lprintf(CTDL_DEBUG, "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']);
+ free(msg->cm_fields['I']);
}
snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s",
(long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
- msg->cm_fields['I'] = strdoop(buf);
+ msg->cm_fields['I'] = strdup(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']);
+ free(msg->cm_fields['M']);
}
- msg->cm_fields['M'] = strdoop(reason);
+ msg->cm_fields['M'] = strdup(reason);
msg->cm_format_type = 0;
/*
* Turn the message around
*/
if (msg->cm_fields['R'] == NULL) {
- phree(msg->cm_fields['R']);
+ free(msg->cm_fields['R']);
}
if (msg->cm_fields['D'] == NULL) {
- phree(msg->cm_fields['D']);
+ free(msg->cm_fields['D']);
}
snprintf(recipient, sizeof recipient, "%s@%s",
msg->cm_fields['A'], msg->cm_fields['N']);
if (msg->cm_fields['A'] == NULL) {
- phree(msg->cm_fields['A']);
+ free(msg->cm_fields['A']);
}
if (msg->cm_fields['N'] == NULL) {
- phree(msg->cm_fields['N']);
+ free(msg->cm_fields['N']);
}
- msg->cm_fields['A'] = strdoop(BOUNCESOURCE);
- msg->cm_fields['N'] = strdoop(config.c_nodename);
+ msg->cm_fields['A'] = strdup(BOUNCESOURCE);
+ msg->cm_fields['N'] = strdup(config.c_nodename);
/* prepend our node to the path */
msg->cm_fields['P'] = NULL;
}
else {
- oldpath = strdoop("unknown_user");
+ oldpath = strdup("unknown_user");
}
size = strlen(oldpath) + SIZ;
- msg->cm_fields['P'] = mallok(size);
+ msg->cm_fields['P'] = malloc(size);
snprintf(msg->cm_fields['P'], size, "%s!%s", config.c_nodename, oldpath);
- phree(oldpath);
+ free(oldpath);
/* Now submit the message */
valid = validate_recipients(recipient);
if (valid != NULL) if (valid->num_error > 0) {
- phree(valid);
+ free(valid);
valid = NULL;
}
if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
CtdlSubmitMsg(msg, valid, force_room);
/* Clean up */
- if (valid != NULL) phree(valid);
+ if (valid != NULL) free(valid);
CtdlFreeMessage(msg);
- lprintf(9, "leaving network_bounce()\n");
+ lprintf(CTDL_DEBUG, "leaving network_bounce()\n");
}
char *oldpath = NULL;
char filename[SIZ];
FILE *fp;
- char buf[SIZ];
+ char nexthop[SIZ];
+ unsigned char firstbyte;
+ unsigned char lastbyte;
+
+ /* Validate just a little bit. First byte should be FF and
+ * last byte should be 00.
+ */
+ memcpy(&firstbyte, &buffer[0], 1);
+ memcpy(&lastbyte, &buffer[size-1], 1);
+ if ( (firstbyte != 255) || (lastbyte != 0) ) {
+ lprintf(CTDL_ERR, "Corrupt message! Ignoring.\n");
+ return;
+ }
/* Set default target room to trash */
strcpy(target_room, TWITROOM);
/* Load the message into memory */
- msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
+ msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = buffer[1];
for (pos = 3; pos < size; ++pos) {
field = buffer[pos];
- msg->cm_fields[field] = strdoop(&buffer[pos+1]);
+ msg->cm_fields[field] = strdup(&buffer[pos+1]);
pos = pos + strlen(&buffer[(int)pos]);
}
if (strcasecmp(msg->cm_fields['D'], config.c_nodename)) {
/* route the message */
- if (is_valid_node(NULL, NULL,
+ strcpy(nexthop, "");
+ if (is_valid_node(nexthop, NULL,
msg->cm_fields['D']) == 0) {
/* prepend our node to the path */
msg->cm_fields['P'] = NULL;
}
else {
- oldpath = strdoop("unknown_user");
+ oldpath = strdup("unknown_user");
}
size = strlen(oldpath) + SIZ;
- msg->cm_fields['P'] = mallok(size);
+ msg->cm_fields['P'] = malloc(size);
snprintf(msg->cm_fields['P'], size, "%s!%s",
config.c_nodename, oldpath);
- phree(oldpath);
+ free(oldpath);
/* serialize the message */
serialize_message(&sermsg, msg);
/* now send it */
+ if (strlen(nexthop) == 0) {
+ strcpy(nexthop, msg->cm_fields['D']);
+ }
snprintf(filename, sizeof filename,
- "./network/spoolout/%s",
- msg->cm_fields['D']);
+ "./network/spoolout/%s", nexthop);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
sermsg.len, 1, fp);
fclose(fp);
}
- phree(sermsg.ser);
+ free(sermsg.ser);
CtdlFreeMessage(msg);
return;
}
}
/*
- * Check to see if we already have a copy of this message
+ * Check to see if we already have a copy of this message, and
+ * abort its processing if so. (We used to post a warning to Aide>
+ * every time this happened, but the network is now so densely
+ * connected that it's inevitable.)
*/
if (network_usetable(msg) != 0) {
- snprintf(buf, sizeof buf,
- "Loopzapper rejected message <%s> "
- "from <%s> in <%s> @ <%s>\n",
- ((msg->cm_fields['I']!=NULL)?(msg->cm_fields['I']):""),
- ((msg->cm_fields['A']!=NULL)?(msg->cm_fields['A']):""),
- ((msg->cm_fields['O']!=NULL)?(msg->cm_fields['O']):""),
- ((msg->cm_fields['N']!=NULL)?(msg->cm_fields['N']):"")
- );
- aide_message(buf);
- CtdlFreeMessage(msg);
- msg = NULL;
return;
}
"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;
- phree(recp);
+ free(recp);
return;
}
strcpy(target_room, ""); /* no target room if mail */
/* Strip out fields that are only relevant during transit */
if (msg->cm_fields['D'] != NULL) {
- phree(msg->cm_fields['D']);
+ free(msg->cm_fields['D']);
msg->cm_fields['D'] = NULL;
}
if (msg->cm_fields['C'] != NULL) {
- phree(msg->cm_fields['C']);
+ free(msg->cm_fields['C']);
msg->cm_fields['C'] = NULL;
}
CtdlSubmitMsg(msg, recp, target_room);
}
CtdlFreeMessage(msg);
- phree(recp);
+ free(recp);
}
hold_pos = ftell(fp);
size = msgend - msgstart + 1;
- buffer = mallok(size);
+ buffer = malloc(size);
if (buffer != NULL) {
fseek(fp, msgstart, SEEK_SET);
fread(buffer, size, 1, fp);
network_process_buffer(buffer, size);
- phree(buffer);
+ free(buffer);
}
fseek(fp, hold_pos, SEEK_SET);
long msgcur = 0L;
int ch;
- lprintf(7, "network: processing <%s>\n", filename);
fp = fopen(filename, "rb");
if (fp == NULL) {
- lprintf(5, "Error opening %s: %s\n",
+ lprintf(CTDL_CRIT, "Error opening %s: %s\n",
filename, strerror(errno));
return;
}
+ lprintf(CTDL_INFO, "network: processing <%s>\n", filename);
+
/* Look for messages in the data stream and break them out */
while (ch = getc(fp), ch >= 0) {
if (dp == NULL) return;
while (d = readdir(dp), d != NULL) {
- snprintf(filename, sizeof filename, "./network/spoolin/%s", d->d_name);
+ snprintf(filename, sizeof filename,
+ "./network/spoolin/%s", d->d_name);
network_process_file(filename);
}
}
+/*
+ * Delete any files in the outbound queue that were intended
+ * to be sent to nodes which no nlonger exist.
+ */
+void network_purge_spoolout(void) {
+ DIR *dp;
+ struct dirent *d;
+ char filename[SIZ];
+ char nexthop[SIZ];
+ int i;
+
+ dp = opendir("./network/spoolout");
+ if (dp == NULL) return;
+
+ while (d = readdir(dp), d != NULL) {
+ snprintf(filename, sizeof filename,
+ "./network/spoolout/%s", d->d_name);
+
+ strcpy(nexthop, "");
+ i = is_valid_node(nexthop, NULL, d->d_name);
+
+ if ( (i != 0) || (strlen(nexthop) > 0) ) {
+ unlink(filename);
+ }
+ }
+
+
+ closedir(dp);
+}
strcpy(tempfilename, tmpnam(NULL));
if (sock_puts(sock, "NDOP") < 0) return;
if (sock_gets(sock, buf) < 0) return;
- lprintf(9, "<%s\n", buf);
+ lprintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] != '2') {
return;
}
bytes_received = 0L;
fp = fopen(tempfilename, "w");
if (fp == NULL) {
- lprintf(9, "cannot open download file locally: %s\n",
+ lprintf(CTDL_CRIT, "cannot open download file locally: %s\n",
strerror(errno));
return;
}
unlink(tempfilename);
return;
}
- lprintf(9, "%s\n", buf);
+ lprintf(CTDL_DEBUG, "%s\n", buf);
snprintf(buf, sizeof buf, "mv %s ./network/spoolin/%s.%ld",
tempfilename, remote_nodename, (long) getpid());
system(buf);
if (sock_puts(sock, "NUOP") < 0) return;
if (sock_gets(sock, buf) < 0) return;
- lprintf(9, "<%s\n", buf);
+ lprintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] != '2') {
return;
}
fd = open(sfname, O_RDONLY);
if (fd < 0) {
if (errno == ENOENT) {
- lprintf(9, "Nothing to send.\n");
+ lprintf(CTDL_INFO, "Nothing to send.\n");
} else {
- lprintf(5, "cannot open upload file locally: %s\n",
+ lprintf(CTDL_CRIT, "cannot open upload file locally: %s\n",
strerror(errno));
}
return;
close(fd);
if (sock_puts(sock, "UCLS 1") < 0) return;
if (sock_gets(sock, buf) < 0) return;
- lprintf(9, "<%s\n", buf);
+ lprintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] == '2') {
unlink(sfname);
}
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);
+ lprintf(CTDL_INFO, "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));
+ lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
network_talking_to(node, NTT_REMOVE);
return;
}
- lprintf(9, "Connected!\n");
+ lprintf(CTDL_DEBUG, "Connected!\n");
/* Read the server greeting */
if (sock_gets(sock, buf) < 0) goto bail;
- lprintf(9, ">%s\n", buf);
+ lprintf(CTDL_DEBUG, ">%s\n", buf);
/* Identify ourselves */
snprintf(buf, sizeof buf, "NETP %s|%s", config.c_nodename, secret);
- lprintf(9, "<%s\n", buf);
+ lprintf(CTDL_DEBUG, "<%s\n", buf);
if (sock_puts(sock, buf) <0) goto bail;
if (sock_gets(sock, buf) < 0) goto bail;
- lprintf(9, ">%s\n", buf);
+ lprintf(CTDL_DEBUG, ">%s\n", buf);
if (buf[0] != '2') goto bail;
/* At this point we are authenticated. */
/*
* Poll other Citadel nodes and transfer inbound/outbound network data.
+ * Set "full" to nonzero to force a poll of every node, or to zero to poll
+ * only nodes to which we have data to send.
*/
-void network_poll_other_citadel_nodes(void) {
- char *ignetcfg = NULL;
+void network_poll_other_citadel_nodes(int full_poll) {
int i;
char linebuf[SIZ];
char node[SIZ];
char host[SIZ];
char port[SIZ];
char secret[SIZ];
+ int poll = 0;
+ char spoolfile[SIZ];
- ignetcfg = CtdlGetSysConfig(IGNETCFG);
if (ignetcfg == NULL) return; /* no nodes defined */
/* Use the string tokenizer to grab one line at a time */
extract(port, linebuf, 3);
if ( (strlen(node) > 0) && (strlen(secret) > 0)
&& (strlen(host) > 0) && strlen(port) > 0) {
- network_poll_node(node, secret, host, port);
+ poll = full_poll;
+ if (poll == 0) {
+ sprintf(spoolfile, "./network/spoolout/%s",
+ node);
+ if (access(spoolfile, R_OK) == 0) {
+ poll = 1;
+ }
+ }
+ if (poll) {
+ network_poll_node(node, secret, host, port);
+ }
}
}
- phree(ignetcfg);
}
* Run through the rooms doing various types of network stuff.
*/
void network_do_queue(void) {
- static int doing_queue = 0;
static time_t last_run = 0L;
struct RoomProcList *ptr;
+ int full_processing = 1;
/*
- * Run no more frequently than once every n seconds
+ * Run the full set of processing tasks no more frequently
+ * than once every n seconds
*/
- if ( (time(NULL) - last_run) < config.c_net_freq ) return;
+ if ( (time(NULL) - last_run) < config.c_net_freq ) {
+ full_processing = 0;
+ }
/*
* This is a simple concurrency check to make sure only one queue run
*/
if (doing_queue) return;
doing_queue = 1;
- last_run = time(NULL);
+
+ /* Load the IGnet Configuration into memory */
+ if (ignetcfg == NULL) {
+ ignetcfg = CtdlGetSysConfig(IGNETCFG);
+ }
/*
- * Poll other Citadel nodes.
+ * Poll other Citadel nodes. Maybe. If "full_processing" is set
+ * then we poll everyone. Otherwise we only poll nodes we have stuff
+ * to send to.
*/
- network_poll_other_citadel_nodes();
+ network_poll_other_citadel_nodes(full_processing);
/*
* Load the network map and filter list into memory.
/*
* Go ahead and run the queue
*/
- lprintf(7, "network: loading outbound queue\n");
- ForEachRoom(network_queue_room, NULL);
-
- lprintf(7, "network: running outbound queue\n");
- while (rplist != NULL) {
- network_spoolout_room(rplist->name);
- ptr = rplist;
- rplist = rplist->next;
- phree(ptr);
+ if (full_processing) {
+ lprintf(CTDL_INFO, "network: loading outbound queue\n");
+ ForEachRoom(network_queue_room, NULL);
+
+ lprintf(CTDL_INFO, "network: running outbound queue\n");
+ while (rplist != NULL) {
+ network_spoolout_room(rplist->name);
+ ptr = rplist;
+ rplist = rplist->next;
+ free(ptr);
+ }
}
- lprintf(7, "network: processing inbound queue\n");
+ lprintf(CTDL_INFO, "network: processing inbound queue\n");
network_do_spoolin();
/* Save the network map back to disk */
free_filter_list(filterlist);
filterlist = NULL;
- lprintf(7, "network: queue run completed\n");
+ network_purge_spoolout();
+
+ lprintf(CTDL_INFO, "network: queue run completed\n");
+
+ if (full_processing) {
+ last_run = time(NULL);
+ }
+
doing_queue = 0;
}
char secret[SIZ];
char nexthop[SIZ];
+ if (doing_queue) {
+ cprintf("%d spooling - try again in a few minutes\n", ERROR + RESOURCE_BUSY);
+ return;
+ }
+
extract(node, cmdbuf, 0);
extract(pass, cmdbuf, 1);
if (is_valid_node(nexthop, secret, node) != 0) {
- cprintf("%d authentication failed\n", ERROR);
+ cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
return;
}
if (strcasecmp(pass, secret)) {
- cprintf("%d authentication failed\n", ERROR);
+ cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
return;
}
if (network_talking_to(node, NTT_CHECK)) {
- cprintf("%d Already talking to %s right now\n", ERROR, node);
+ cprintf("%d Already talking to %s right now\n", ERROR + RESOURCE_BUSY, node);
return;
}
}
+/*
+ * This handler detects changes being made to the system's IGnet
+ * configuration.
+ */
+int netconfig_aftersave(struct CtdlMessage *msg) {
+ char *ptr;
+ int linelen;
+
+ /* If this isn't the configuration room, or if this isn't a MIME
+ * message, don't bother.
+ */
+ if (strcasecmp(msg->cm_fields['O'], SYSCONFIGROOM)) return(0);
+ if (msg->cm_format_type != 4) return(0);
+
+ ptr = msg->cm_fields['M'];
+ while (ptr != NULL) {
+
+ linelen = strcspn(ptr, "\n");
+ if (linelen == 0) return(0); /* end of headers */
+
+ if (!strncasecmp(ptr, "Content-type: ", 14)) {
+ if (!strncasecmp(&ptr[14], IGNETCFG,
+ strlen(IGNETCFG))) {
+ if (ignetcfg != NULL) free(ignetcfg);
+ ignetcfg = NULL;
+ }
+ }
+
+ ptr = strchr((char *)ptr, '\n');
+ if (ptr != NULL) ++ptr;
+ }
+
+ return(0);
+}
+
CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
CtdlRegisterProtoHook(cmd_snet, "SNET", "Set network config");
CtdlRegisterProtoHook(cmd_netp, "NETP", "Identify as network poller");
+ CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
CtdlRegisterSessionHook(network_do_queue, EVT_TIMER);
+ CtdlRegisterMessageHook(netconfig_aftersave, EVT_AFTERSAVE);
return "$Id$";
}
projects / citadel.git / blobdiff