#define UUDECODE "/usr/bin/uudecode"
/* Files used by the networker */
-#define ZAPLIST "./network/zaplist"
#define MAILSYSINFO "./network/mail.sysinfo"
/* Uncomment the DEBUG def to see noisy traces */
struct filterlist *filter = NULL;
struct syslist *slist = NULL;
+struct msglist *purgelist = NULL;
struct config config;
extern char bbs_home_directory[];
-/*
- * Delete any messages on the zapped list
- */
-void process_zaplist(void) {
- FILE *zaplist;
- char curr_rm[ROOMNAMELEN];
- char buf[256];
- char room[256];
- char id[256];
- char node[256];
-
- zaplist = fopen(ZAPLIST, "r");
- if (zaplist == NULL) {
- syslog(LOG_ERR, "cannot open %s: %s\n",
- ZAPLIST, strerror(errno));
- return;
- }
-
- strcpy(curr_rm, "_nothing_");
-
- while (fgets(buf, 256, zaplist) != NULL) {
- buf[strlen(buf) - 1] = 0;
-
- extract(room, buf, 0);
- extract(id, buf, 1);
- extract(node, buf, 2);
-
- /* Change rooms if we have to */
- if (strcasecmp(curr_rm, room)) {
- sprintf(buf, "GOTO %s", room);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '2') {
- extract(curr_rm, &buf[4], 0);
- } else {
- syslog(LOG_ERR, "%s", buf);
- }
- }
-
- /* And only do the zap if we succeeded */
- if (!strcasecmp(curr_rm, room)) {
-
-
-
- /* FIX not finished */
-
-
- }
-
- }
-
- fclose(zaplist);
-
-}
-
-
-
/*
*/
void inprocess(void)
{
- FILE *fp, *message, *testfp, *ls, *duplist, *zaplist;
+ FILE *fp, *message, *testfp, *ls, *duplist;
static struct minfo minfo;
struct recentmsg recentmsg;
char tname[128], aaa[1024], iname[256], sfilename[256], pfilename[256];
char buf[256];
long msglen;
int bloklen;
+ int valid_msg;
/* temp file names */
sprintf(tname, tmpnam(NULL));
/* temporary file to contain a log of rejected dups */
duplist = tmpfile();
- /* Open the zapped-list for appending */
- zaplist = fopen(ZAPLIST, "a");
-
/* Let the shell do the dirty work. Get all data from spoolin */
do {
sprintf(aaa, "cd %s/network/spoolin; ls", bbs_home_directory);
goto ENDSTR;
/* This crates the temporary file. */
+ valid_msg = 1;
message = fopen(tname, "wb");
if (message == NULL) {
syslog(LOG_ERR, "error creating %s: %s",
a = getc(fp);
putc(a, message); /* mode */
do {
- FieldID = getc(fp); /* Header field ID */
- putc(FieldID, message);
- do {
- a = getc(fp);
- putc(a, message);
- } while (a > 0);
+ FieldID = getc(fp); /* Header field ID */
+ if (isalpha(FieldID)) {
+ putc(FieldID, message);
+ do {
+ a = getc(fp);
+ if (a < 127) putc(a, message);
+ } while (a > 0);
+ if (a != 0) putc(0, message);
+ }
+ else { /* Invalid field ID; flush it */
+ do {
+ a = getc(fp);
+ } while (a > 0);
+ valid_msg = 0;
+ }
} while ((FieldID != 'M') && (a >= 0));
/* M is always last */
+ if (FieldID != 'M') valid_msg = 0;
msglen = ftell(message);
fclose(message);
+ if (!valid_msg) {
+ unlink(tname);
+ goto NXMSG;
+ }
+
/* process the individual mesage */
msgfind(tname, &minfo);
strncpy(recentmsg.RMnodename, minfo.N, 9);
fclose(message);
- /* If this message supersedes an existing one,
- * add it to the zap list
- */
- if (strlen(minfo.Z) > 0) {
- if (strlen(minfo.C) > 0) {
- fprintf(zaplist, "%s", minfo.C);
- } else {
- fprintf(zaplist, "%s", minfo.O);
- }
- extract_token(buf, minfo.Z, 0, '@');
- fprintf(zaplist, "|%s", minfo.Z);
- extract_token(buf, minfo.Z, 1, '@');
- fprintf(zaplist, "|%s\n", minfo.Z);
- }
}
unlink(tname);
fclose(duplist);
-
- /* Now delete any messages which were zapped (superseded) by
- * other incoming messages.
- */
- fclose(zaplist);
- process_zaplist();
}
+
+/*
+ * Add a message to the list of messages to be deleted off the local server
+ * at the end of this run.
+ */
+void delete_locally(long msgid, char *roomname) {
+ struct msglist *mptr;
+
+ mptr = (struct msglist *) malloc(sizeof(struct msglist));
+ mptr->next = purgelist;
+ mptr->m_num = msgid;
+ strcpy(mptr->m_rmname, roomname);
+ purgelist = mptr;
+}
+
+
+
+/*
+ * Delete all messages on the purge list from the local server.
+ */
+void process_purgelist(void) {
+ char curr_rm[ROOMNAMELEN];
+ char buf[256];
+ struct msglist *mptr;
+
+
+ strcpy(curr_rm, "__nothing__");
+ while (purgelist != NULL) {
+ if (strcasecmp(curr_rm, purgelist->m_rmname)) {
+ sprintf(buf, "GOTO %s", purgelist->m_rmname);
+ serv_puts(buf);
+ serv_gets(buf);
+ if (buf[0] == '2') extract(curr_rm, &buf[4], 0);
+ }
+ if (strcasecmp(curr_rm, purgelist->m_rmname)) {
+ sprintf(buf, "DELE %ld", purgelist->m_num);
+ serv_puts(buf);
+ serv_gets(buf);
+ }
+ mptr = purgelist->next;
+ free(purgelist);
+ purgelist = mptr;
+ }
+}
+
+
+
+
/* spool list of messages to a file */
/* returns # of msgs spooled */
int spool_out(struct msglist *cmlist, FILE * destfp, char *sysname)
fprintf(destfp, "%s!", NODENAME);
if (a != 'C')
fwrite(fbuf, strlen(fbuf) + 1, 1, destfp);
+ if (a == 'S') if (!strcasecmp(fbuf, "CANCEL")) {
+ delete_locally(cmptr->m_num, cmptr->m_rmname);
+ }
}
if (a == 'M') {
fprintf(destfp, "C%s%c",
/* Update mail.sysinfo with new information we learned */
rewrite_syslist();
+ /* Delete any messages which need to be purged locally */
+ process_purgelist();
+
/* Close the use table */
purge_use_table(use_table);
gdbm_close(use_table);
projects / citadel.git / blobdiff