*/
struct NetMap *the_netmap = NULL;
-
/*
- * 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.
+ * Keep track of what messages to reject
*/
-int network_usetable(int operation, struct CtdlMessage *msg) {
-
- static struct UseTable *ut = NULL;
- struct UseTable *uptr = NULL;
- char *serialized_table = NULL;
- char *ptr;
- char msgid[SIZ];
- char buf[SIZ];
+struct FilterList *load_filter_list(void) {
+ char *serialized_list = NULL;
int i;
- size_t stlen = 0;
+ char buf[SIZ];
+ struct FilterList *newlist = NULL;
+ struct FilterList *nptr;
- switch(operation) {
-
- case UT_LOAD:
- serialized_table = CtdlGetSysConfig(USETABLE);
- if (serialized_table == NULL) return(0);
-
- ptr = serialized_table;
- i = 0;
- buf[0] = 0;
- while (ptr[0] != 0) {
- buf[i] = *ptr;
-
- if (buf[i]=='\n') {
- buf[i] = 0;
- if (strlen(buf) > 0) {
-
- 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;
- }
- }
+ serialized_list = CtdlGetSysConfig(FILTERLIST);
+ if (serialized_list == NULL) return(NULL); /* if null, no entries */
- i = 0;
- buf[0] = 0;
- }
- else {
- ++i;
- }
- ++ptr;
- }
+ /* 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));
+ extract(nptr->fl_user, buf, 0);
+ striplt(nptr->fl_user);
+ extract(nptr->fl_room, buf, 1);
+ striplt(nptr->fl_room);
+ extract(nptr->fl_node, buf, 2);
+ striplt(nptr->fl_node);
+
+ /* Cowardly refuse to add an any/any/any entry that would
+ * end up filtering every single message.
+ */
+ if (strlen(nptr->fl_user) + strlen(nptr->fl_room)
+ + strlen(nptr->fl_node) == 0) {
+ phree(nptr);
+ }
+ else {
+ nptr->next = newlist;
+ newlist = nptr;
+ }
+ }
- phree(serialized_table);
- serialized_table = NULL;
- return(0);
+ phree(serialized_list);
+ return newlist;
+}
- 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);
- }
- }
+void free_filter_list(struct FilterList *fl) {
+ if (fl == NULL) return;
+ free_filter_list(fl->next);
+ phree(fl);
+}
- /* 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);
- memset(serialized_table, 0, stlen);
-
- while (ut != NULL) {
- if ( (serialized_table != NULL)
- && ( (ut->timestamp - time(NULL)) <
- USETABLE_RETAIN) ) {
- sprintf(&serialized_table[strlen(
- serialized_table)], "%s|%ld\n",
- ut->message_id,
- (long)ut->timestamp);
- }
+/*
+ * Check 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.
+ */
+int network_usetable(struct CtdlMessage *msg) {
- /* Now free the memory */
- uptr = ut;
- ut = ut->next;
- phree(uptr->message_id);
- phree(uptr);
- }
+ char msgid[SIZ];
+ struct cdbdata *cdbut;
+ struct UseTable ut;
- /* Write to disk */
- CtdlPutSysConfig(USETABLE, serialized_table);
- phree(serialized_table);
+ /* 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);
+ }
+ }
+ cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid));
+ if (cdbut != NULL) {
+ cdb_free(cdbut);
+ return(1);
}
- /* should never get here unless illegal operation specified */
- return(2);
+ /* If we got to this point, it's unique: add it. */
+ strcpy(ut.ut_msgid, msgid);
+ ut.ut_timestamp = time(NULL);
+ cdb_store(CDB_USETABLE, msgid, strlen(msgid),
+ &ut, sizeof(struct UseTable) );
+ return(0);
}
serialized_map = reallok(serialized_map,
(strlen(serialized_map)+SIZ) );
if (strlen(nmptr->nodename) > 0) {
- sprintf(&serialized_map[strlen(serialized_map)],
+ snprintf(&serialized_map[strlen(serialized_map)],
+ SIZ,
"%s|%ld|%s\n",
nmptr->nodename,
(long)nmptr->lastcontact,
FILE *fp;
if (CtdlAccessCheck(ac_room_aide)) return;
- assoc_file_name(filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
cprintf("%d Network settings for room #%ld <%s>\n",
LISTING_FOLLOWS,
CC->quickroom.QRnumber, CC->quickroom.QRname);
if (CtdlAccessCheck(ac_room_aide)) return;
safestrncpy(tempfilename, tmpnam(NULL), sizeof tempfilename);
- assoc_file_name(filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
fp = fopen(tempfilename, "w");
if (fp == NULL) {
(long)instr_len);
abort();
}
- sprintf(instr,
+ snprintf(instr, instr_len,
"Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
"bounceto|postmaster@%s\n" ,
SPOOLMIME, msgnum, (long)time(NULL), config.c_fqdn );
/* Generate delivery instructions for each recipient */
for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
- sprintf(&instr[strlen(instr)], "remote|%s|0||\n",
- nptr->name);
+ size_t tmp = strlen(instr);
+ snprintf(&instr[tmp], instr_len - tmp,
+ "remote|%s|0||\n", nptr->name);
}
/*
msg = CtdlFetchMessage(msgnum);
if (msg != NULL) {
+ size_t newpath_len;
/* Prepend our node name to the Path field whenever
* sending a message to another IGnet node
if (msg->cm_fields['P'] == NULL) {
msg->cm_fields['P'] = strdoop("username");
}
- newpath = mallok(strlen(msg->cm_fields['P']) +
- strlen(config.c_nodename) + 2);
- sprintf(newpath, "%s!%s", config.c_nodename,
- msg->cm_fields['P']);
+ newpath_len = strlen(msg->cm_fields['P']) +
+ strlen(config.c_nodename) + 2;
+ newpath = mallok(newpath_len);
+ snprintf(newpath, newpath_len, "%s!%s",
+ config.c_nodename, msg->cm_fields['P']);
phree(msg->cm_fields['P']);
msg->cm_fields['P'] = newpath;
/* Send the message */
if (send == 1) {
- sprintf(filename,
+ snprintf(filename, sizeof filename,
"./network/spoolout/%s",
nptr->name);
fp = fopen(filename, "ab");
}
memset(&sc, 0, sizeof(struct SpoolControl));
- assoc_file_name(filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
fp = fopen(filename, "r");
if (fp == NULL) {
struct recptypes *valid = NULL;
char force_room[ROOMNAMELEN];
static int serialnum = 0;
+ size_t size;
lprintf(9, "entering network_bounce()\n");
if (msg == NULL) return;
- sprintf(bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename);
+ snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename);
/*
* Give it a fresh message ID
if (msg->cm_fields['I'] != NULL) {
phree(msg->cm_fields['I']);
}
- sprintf(buf, "%ld.%04x.%04x@%s",
- (long)time(NULL), getpid(), ++serialnum, config.c_fqdn);
+ snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s",
+ (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
msg->cm_fields['I'] = strdoop(buf);
/*
else {
oldpath = strdoop("unknown_user");
}
- msg->cm_fields['P'] = mallok(strlen(oldpath) + SIZ);
- sprintf(msg->cm_fields['P'], "%s!%s", config.c_nodename, oldpath);
+ size = strlen(oldpath) + SIZ;
+ msg->cm_fields['P'] = mallok(size);
+ snprintf(msg->cm_fields['P'], size, "%s!%s", config.c_nodename, oldpath);
phree(oldpath);
/* Now submit the message */
else {
oldpath = strdoop("unknown_user");
}
- msg->cm_fields['P'] =
- mallok(strlen(oldpath) + SIZ);
- sprintf(msg->cm_fields['P'], "%s!%s",
+ size = strlen(oldpath) + SIZ;
+ msg->cm_fields['P'] = mallok(size);
+ snprintf(msg->cm_fields['P'], size, "%s!%s",
config.c_nodename, oldpath);
phree(oldpath);
serialize_message(&sermsg, msg);
/* now send it */
- sprintf(filename,
+ snprintf(filename, sizeof filename,
"./network/spoolout/%s",
msg->cm_fields['D']);
fp = fopen(filename, "ab");
/*
* Check to see if we already have a copy of this message
*/
- if (network_usetable(UT_INSERT, msg) != 0) {
- sprintf(buf,
+ 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']):""),
if (dp == NULL) return;
while (d = readdir(dp), d != NULL) {
- sprintf(filename, "./network/spoolin/%s", d->d_name);
+ snprintf(filename, sizeof filename, "./network/spoolin/%s", d->d_name);
network_process_file(filename);
}
}
while (bytes_received < download_len) {
- sprintf(buf, "READ %ld|%ld",
+ snprintf(buf, sizeof buf, "READ %ld|%ld",
bytes_received,
((download_len - bytes_received > IGNET_PACKET_SIZE)
? IGNET_PACKET_SIZE : (download_len - bytes_received)));
return;
}
lprintf(9, "%s\n", buf);
- sprintf(buf, "mv %s ./network/spoolin/%s.%ld",
+ snprintf(buf, sizeof buf, "mv %s ./network/spoolin/%s.%ld",
tempfilename, remote_nodename, (long) getpid());
system(buf);
}
return;
}
- sprintf(sfname, "./network/spoolout/%s", remote_nodename);
+ snprintf(sfname, sizeof sfname, "./network/spoolout/%s", remote_nodename);
fd = open(sfname, O_RDONLY);
if (fd < 0) {
if (errno == ENOENT) {
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);
+ snprintf(buf, sizeof buf, "WRIT %ld", bytes_to_write);
if (sock_puts(sock, buf) < 0) {
close(fd);
return;
lprintf(9, ">%s\n", buf);
/* Identify ourselves */
- sprintf(buf, "NETP %s|%s", config.c_nodename, secret);
+ snprintf(buf, sizeof 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;
network_poll_other_citadel_nodes();
/*
- * Load the network map and use table into memory.
+ * Load the network map and filter list into memory.
*/
read_network_map();
- network_usetable(UT_LOAD, NULL);
+ filterlist = load_filter_list();
/*
* 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);
+ /* Save the network map back to disk */
write_network_map();
+ /* Free the filter list in memory */
+ free_filter_list(filterlist);
+ filterlist = NULL;
+
lprintf(7, "network: queue run completed\n");
doing_queue = 0;
}
-
/*
* cmd_netp() - authenticate to the server as another Citadel node polling
* for network traffic
safestrncpy(CC->net_node, node, sizeof CC->net_node);
network_talking_to(node, NTT_ADD);
- cprintf("%d authenticated as network node '%s'\n", OK,
+ cprintf("%d authenticated as network node '%s'\n", CIT_OK,
CC->net_node);
}
+
+
/*
* Module entry point
*/
projects / citadel.git / blobdiff