#include "clientsocket.h"
#include "file_ops.h"
#include "citadel_dirs.h"
+#include "threads.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
* First try the neighbor nodes
*/
if (working_ignetcfg == NULL) {
- lprintf(CTDL_ERR, "working_ignetcfg is NULL!\n");
+ CtdlLogPrintf(CTDL_ERR, "working_ignetcfg is NULL!\n");
if (nexthop != NULL) {
strcpy(nexthop, "");
}
/*
* If we get to this point, the supplied node name is bogus.
*/
- lprintf(CTDL_ERR, "Invalid node name <%s>\n", node);
+ CtdlLogPrintf(CTDL_ERR, "Invalid node name <%s>\n", node);
return(-1);
}
recps = malloc(recps_len);
if (recps == NULL) {
- lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
+ CtdlLogPrintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
abort();
}
}
/* Now submit the message */
- valid = validate_recipients(recps);
+ valid = validate_recipients(recps, NULL, 0);
free(recps);
CtdlSubmitMsg(msg, valid, NULL);
CtdlFreeMessage(msg);
recps = malloc(recps_len);
if (recps == NULL) {
- lprintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
+ CtdlLogPrintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
abort();
}
}
/* Now submit the message */
- valid = validate_recipients(recps);
+ valid = validate_recipients(recps, NULL, 0);
free(recps);
CtdlSubmitMsg(msg, valid, NULL);
free_recipients(valid);
}
msg->cm_fields['R'] = strdup(nptr->name);
- valid = validate_recipients(nptr->name);
+ valid = validate_recipients(nptr->name, NULL, 0);
CtdlSubmitMsg(msg, valid, "");
free_recipients(valid);
}
/* Check for valid node name */
if (is_valid_node(NULL, NULL, mptr->remote_nodename) != 0) {
- lprintf(CTDL_ERR, "Invalid node <%s>\n",
- mptr->remote_nodename);
+ CtdlLogPrintf(CTDL_ERR, "Invalid node <%s>\n", mptr->remote_nodename);
send = 0;
}
/* Check for split horizon */
- lprintf(CTDL_DEBUG, "Path is %s\n", msg->cm_fields['P']);
+ CtdlLogPrintf(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'],
snprintf(filename, sizeof filename,"%s/%s",
ctdl_netout_dir,
mptr->remote_nodename);
- lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
+ CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
fclose(fp);
}
else {
- lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
+ CtdlLogPrintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
}
/* free the serialized version */
char buf[SIZ];
char nodename[256];
char roomname[ROOMNAMELEN];
- char nexthop[256];
size_t miscsize = 0;
size_t linesize = 0;
int skipthisline = 0;
sc->digestrecps = nptr;
}
else if (!strcasecmp(instr, "ignet_push_share")) {
- /* by checking each node's validity, we automatically
- * purge nodes which do not exist from room network
- * configurations at this time.
- */
extract_token(nodename, buf, 1, '|', sizeof nodename);
extract_token(roomname, buf, 2, '|', sizeof roomname);
- strcpy(nexthop, "xxx");
- if (is_valid_node(nexthop, NULL, nodename) == 0) {
- if (IsEmptyStr(nexthop)) {
- mptr = (maplist *)
- malloc(sizeof(maplist));
- mptr->next = sc->ignet_push_shares;
- strcpy(mptr->remote_nodename, nodename);
- strcpy(mptr->remote_roomname, roomname);
- sc->ignet_push_shares = mptr;
- }
- }
+ mptr = (maplist *) malloc(sizeof(maplist));
+ mptr->next = sc->ignet_push_shares;
+ strcpy(mptr->remote_nodename, nodename);
+ strcpy(mptr->remote_roomname, roomname);
+ sc->ignet_push_shares = mptr;
}
else {
/* Preserve 'other' lines ... *unless* they happen to
sc = *scc;
fp = fopen(filename, "w");
if (fp == NULL) {
- lprintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n",
+ CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n",
filename, strerror(errno));
free_spoolcontrol_struct(scc);
}
sc->participates = nptr;
}
while (sc->ignet_push_shares != NULL) {
- /* 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, sc->ignet_push_shares->remote_nodename) == 0) {
- }
- fprintf(fp, "ignet_push_share|%s",
- sc->ignet_push_shares->remote_nodename);
+ fprintf(fp, "ignet_push_share|%s", sc->ignet_push_shares->remote_nodename);
if (!IsEmptyStr(sc->ignet_push_shares->remote_roomname)) {
fprintf(fp, "|%s", sc->ignet_push_shares->remote_roomname);
}
}
return 1;
}
-int is_recipient(SpoolControl *sc, char *Name)
+int is_recipient(SpoolControl *sc, const char *Name)
{
namelist *nptr;
+ size_t len;
+ len = strlen(Name);
nptr = sc->listrecps;
while (nptr != NULL) {
- if (strcmp(Name, nptr->name)==0)
+ if (strncmp(Name, nptr->name, len)==0)
return 1;
nptr = nptr->next;
}
/* Do the same for digestrecps */
nptr = sc->digestrecps;
while (nptr != NULL) {
- if (strcmp(Name, nptr->name)==0)
+ if (strncmp(Name, nptr->name, len)==0)
return 1;
nptr = nptr->next;
}
/* Do the same for participates */
nptr = sc->participates;
while (nptr != NULL) {
- if (strcmp(Name, nptr->name)==0)
+ if (strncmp(Name, nptr->name, len)==0)
return 1;
nptr = nptr->next;
}
* queued for networking and then deleted before it can happen.
*/
if (getroom(&CC->room, room_to_spool) != 0) {
- lprintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
+ CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
return;
}
assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
- lprintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
+ CtdlLogPrintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
begin_critical_section(S_NETCONFIGS);
/* Only do net processing for rooms that have netconfigs */
/* Concise cleanup because we know there's only one node in the sc */
free(sc.ignet_push_shares);
- lprintf(CTDL_NOTICE, "Synchronized %d messages to <%s>\n",
+ CtdlLogPrintf(CTDL_NOTICE, "Synchronized %d messages to <%s>\n",
num_spooled, target_node);
return(num_spooled);
}
static int serialnum = 0;
size_t size;
- lprintf(CTDL_DEBUG, "entering network_bounce()\n");
+ CtdlLogPrintf(CTDL_DEBUG, "entering network_bounce()\n");
if (msg == NULL) return;
free(oldpath);
/* Now submit the message */
- valid = validate_recipients(recipient);
+ valid = validate_recipients(recipient, NULL, 0);
if (valid != NULL) if (valid->num_error != 0) {
free_recipients(valid);
valid = NULL;
/* Clean up */
if (valid != NULL) free_recipients(valid);
CtdlFreeMessage(msg);
- lprintf(CTDL_DEBUG, "leaving network_bounce()\n");
+ CtdlLogPrintf(CTDL_DEBUG, "leaving network_bounce()\n");
}
firstbyte = buffer[0];
lastbyte = buffer[size-1];
if ( (firstbyte != 255) || (lastbyte != 0) ) {
- lprintf(CTDL_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n",
+ CtdlLogPrintf(CTDL_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n",
size, firstbyte, lastbyte);
return;
}
/* route the message */
strcpy(nexthop, "");
- if (is_valid_node(nexthop, NULL,
- msg->cm_fields['D']) == 0) {
-
+ if (is_valid_node(nexthop, NULL, msg->cm_fields['D']) == 0) {
/* prepend our node to the path */
if (msg->cm_fields['P'] != NULL) {
oldpath = msg->cm_fields['P'];
"%s/%s",
ctdl_netout_dir,
nexthop);
- lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
+ CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
fclose(fp);
}
else {
- lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
+ CtdlLogPrintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
}
free(sermsg.ser);
CtdlFreeMessage(msg);
/* Otherwise, does it have a recipient? If so, validate it... */
else if (msg->cm_fields['R'] != NULL) {
- recp = validate_recipients(msg->cm_fields['R']);
+ recp = validate_recipients(msg->cm_fields['R'], NULL, 0);
if (recp != NULL) if (recp->num_error != 0) {
network_bounce(msg,
"A message you sent could not be delivered due to an invalid address.\n"
fp = fopen(filename, "rb");
if (fp == NULL) {
- lprintf(CTDL_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
+ CtdlLogPrintf(CTDL_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
return;
}
fseek(fp, 0L, SEEK_END);
- lprintf(CTDL_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename);
+ CtdlLogPrintf(CTDL_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename);
rewind(fp);
/* Look for messages in the data stream and break them out */
*/
if (stat(ctdl_netin_dir, &statbuf)) return;
if (statbuf.st_mtime == last_spoolin_mtime) {
- lprintf(CTDL_DEBUG, "network: nothing in inbound queue\n");
+ CtdlLogPrintf(CTDL_DEBUG, "network: nothing in inbound queue\n");
return;
}
last_spoolin_mtime = statbuf.st_mtime;
- lprintf(CTDL_DEBUG, "network: processing inbound queue\n");
+ CtdlLogPrintf(CTDL_DEBUG, "network: processing inbound queue\n");
/*
* Ok, there's something interesting in there, so scan it.
CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
if (sock_puts(sock, "NDOP") < 0) return;
if (sock_getln(sock, buf, sizeof buf) < 0) return;
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] != '2') {
return;
}
bytes_received = 0L;
fp = fopen(tempfilename, "w");
if (fp == NULL) {
- lprintf(CTDL_CRIT, "cannot open download file locally: %s\n",
+ CtdlLogPrintf(CTDL_CRIT, "cannot open download file locally: %s\n",
strerror(errno));
return;
}
while (bytes_received < download_len) {
+ /**
+ * If shutting down we can exit here and unlink the temp file.
+ * this shouldn't loose us any messages.
+ */
+ if (CtdlThreadCheckStop())
+ {
+ fclose(fp);
+ unlink(tempfilename);
+ return;
+ }
snprintf(buf, sizeof buf, "READ %ld|%ld",
bytes_received,
((download_len - bytes_received > IGNET_PACKET_SIZE)
}
fclose(fp);
+ /** Last chance for shutdown exit */
+ if (CtdlThreadCheckStop())
+ {
+ unlink(tempfilename);
+ return;
+ }
if (sock_puts(sock, "CLOS") < 0) {
unlink(tempfilename);
return;
}
+ /**
+ * From here on we must complete or messages will get lost
+ */
if (sock_getln(sock, buf, sizeof buf) < 0) {
unlink(tempfilename);
return;
}
if (download_len > 0) {
- lprintf(CTDL_NOTICE, "Received %ld octets from <%s>\n", download_len, remote_nodename);
+ CtdlLogPrintf(CTDL_NOTICE, "Received %ld octets from <%s>\n", download_len, remote_nodename);
}
- lprintf(CTDL_DEBUG, "%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, "%s\n", buf);
/* Now copy the temp file to its permanent location.
* (We copy instead of link because they may be on different filesystems)
if (sock_puts(sock, "NUOP") < 0) return;
if (sock_getln(sock, buf, sizeof buf) < 0) return;
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] != '2') {
return;
}
fd = open(sfname, O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
- lprintf(CTDL_CRIT, "cannot open upload file locally: %s\n",
+ CtdlLogPrintf(CTDL_CRIT, "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) {
+ /** Exit if shutting down */
+ if (CtdlThreadCheckStop())
+ {
+ close(fd);
+ return;
+ }
+
snprintf(buf, sizeof buf, "WRIT %ld", bytes_to_write);
if (sock_puts(sock, buf) < 0) {
close(fd);
ABORTUPL:
close(fd);
+ /** Last chance for shutdown exit */
+ if(CtdlThreadCheckStop())
+ return;
+
if (sock_puts(sock, "UCLS 1") < 0) return;
+ /**
+ * From here on we must complete or messages will get lost
+ */
if (sock_getln(sock, buf, sizeof buf) < 0) return;
- lprintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n",
+ CtdlLogPrintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n",
bytes_written, remote_nodename);
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] == '2') {
- lprintf(CTDL_DEBUG, "Removing <%s>\n", sfname);
+ CtdlLogPrintf(CTDL_DEBUG, "Removing <%s>\n", sfname);
unlink(sfname);
}
}
if (network_talking_to(node, NTT_CHECK)) return;
network_talking_to(node, NTT_ADD);
- lprintf(CTDL_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port);
+ CtdlLogPrintf(CTDL_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port);
sock = sock_connect(host, port, "tcp");
if (sock < 0) {
- lprintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
+ CtdlLogPrintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
network_talking_to(node, NTT_REMOVE);
return;
}
- lprintf(CTDL_DEBUG, "Connected!\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
/* Read the server greeting */
if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
- lprintf(CTDL_DEBUG, ">%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
/* Identify ourselves */
snprintf(buf, sizeof buf, "NETP %s|%s", config.c_nodename, secret);
- lprintf(CTDL_DEBUG, "<%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
if (sock_puts(sock, buf) <0) goto bail;
if (sock_getln(sock, buf, sizeof buf) < 0) goto bail;
- lprintf(CTDL_DEBUG, ">%s\n", buf);
+ CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
if (buf[0] != '2') goto bail;
/* At this point we are authenticated. */
- receive_spool(sock, node);
- transmit_spool(sock, node);
+ if (!CtdlThreadCheckStop())
+ receive_spool(sock, node);
+ if (!CtdlThreadCheckStop())
+ transmit_spool(sock, node);
sock_puts(sock, "QUIT");
bail: sock_close(sock);
char spoolfile[256];
if (working_ignetcfg == NULL) {
- lprintf(CTDL_DEBUG, "No nodes defined - not polling\n");
+ CtdlLogPrintf(CTDL_DEBUG, "No nodes defined - not polling\n");
return;
}
/* Use the string tokenizer to grab one line at a time */
for (i=0; i<num_tokens(working_ignetcfg, '\n'); ++i) {
+ if(CtdlThreadCheckStop())
+ return;
extract_token(linebuf, working_ignetcfg, i, '\n', sizeof linebuf);
extract_token(node, linebuf, 0, '|', sizeof node);
extract_token(secret, linebuf, 1, '|', sizeof secret);
static time_t last_run = 0L;
struct RoomProcList *ptr;
int full_processing = 1;
+ struct CitContext networkerCC;
+
+ /* Give the networker its own private CitContext */
+ memset(&networkerCC, 0, sizeof(struct CitContext));
+ networkerCC.internal_pgm = 1;
+ networkerCC.cs_pid = 0;
+ pthread_setspecific(MyConKey, (void *)&networkerCC );
/*
* Run the full set of processing tasks no more frequently
/*
* Go ahead and run the queue
*/
- if (full_processing) {
- lprintf(CTDL_DEBUG, "network: loading outbound queue\n");
+ if (full_processing && !CtdlThreadCheckStop()) {
+ CtdlLogPrintf(CTDL_DEBUG, "network: loading outbound queue\n");
ForEachRoom(network_queue_room, NULL);
}
if (rplist != NULL) {
- lprintf(CTDL_DEBUG, "network: running outbound queue\n");
- while (rplist != NULL) {
+ CtdlLogPrintf(CTDL_DEBUG, "network: running outbound queue\n");
+ while (rplist != NULL && !CtdlThreadCheckStop()) {
char spoolroomname[ROOMNAMELEN];
safestrncpy(spoolroomname, rplist->name, sizeof spoolroomname);
begin_critical_section(S_RPLIST);
}
/* If there is anything in the inbound queue, process it */
- network_do_spoolin();
+ if (!CtdlThreadCheckStop())
+ network_do_spoolin();
/* Save the network map back to disk */
write_network_map();
network_purge_spoolout();
- lprintf(CTDL_DEBUG, "network: queue run completed\n");
+ CtdlLogPrintf(CTDL_DEBUG, "network: queue run completed\n");
if (full_processing) {
last_run = time(NULL);
}
doing_queue = 0;
- CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, time(NULL) + 60);
+ if (!CtdlThreadCheckStop()) // Only reschedule if system is not stopping
+ CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, time(NULL) + 60);
+ else
+ CtdlLogPrintf(CTDL_DEBUG, "network: Task STOPPED.\n");
return NULL;
}
extract_token(pass, cmdbuf, 1, '|', sizeof pass);
if (doing_queue) {
- lprintf(CTDL_WARNING, "Network node <%s> refused - spooling", node);
+ CtdlLogPrintf(CTDL_WARNING, "Network node <%s> refused - spooling", node);
cprintf("%d spooling - try again in a few minutes\n",
ERROR + RESOURCE_BUSY);
return;
v = is_valid_node(nexthop, secret, node);
if (v != 0) {
- lprintf(CTDL_WARNING, "Unknown node <%s>\n", node);
+ CtdlLogPrintf(CTDL_WARNING, "Unknown node <%s>\n", node);
cprintf("%d authentication failed\n",
ERROR + PASSWORD_REQUIRED);
return;
}
if (strcasecmp(pass, secret)) {
- lprintf(CTDL_WARNING, "Bad password for network node <%s>", node);
+ CtdlLogPrintf(CTDL_WARNING, "Bad password for network node <%s>", node);
cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
return;
}
if (network_talking_to(node, NTT_CHECK)) {
- lprintf(CTDL_WARNING, "Duplicate session for network node <%s>", node);
+ CtdlLogPrintf(CTDL_WARNING, "Duplicate session for network node <%s>", node);
cprintf("%d Already talking to %s right now\n", ERROR + RESOURCE_BUSY, node);
return;
}
safestrncpy(CC->net_node, node, sizeof CC->net_node);
network_talking_to(node, NTT_ADD);
- lprintf(CTDL_NOTICE, "Network node <%s> logged in\n", CC->net_node);
+ 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);
}
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);
CtdlRegisterRoomHook(network_room_handler);
CtdlRegisterCleanupHook(destroy_network_queue_room);
}
projects / citadel.git / blobdiff