From 8dcb98e8fa10229bc6ea16d607bd5b2e965f2385 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Mon, 12 Jul 2004 20:00:52 +0000 Subject: [PATCH] Changed to use direct instead of immediate mail. --- ChangeLog | 6 ++++++ mbcico/outstat.c | 2 +- mbcico/scanout.c | 6 +++++- mbtask/outstat.c | 4 ++-- mbtask/scanout.c | 4 ++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b126991d..066d308e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,12 @@ v0.61.2 11-Jul-2004 with other mailers. Russell?? If you only use mbcico there will be no problems. + mbout: + Changed to use direct instead of immediate mail. + + mbtask: + Changed to use direct instead of immediate mail. + v0.61.1 20-Jun-2004 - 11-Jul-2004 diff --git a/mbcico/outstat.c b/mbcico/outstat.c index 3a106b3d..8ec0a3fd 100644 --- a/mbcico/outstat.c +++ b/mbcico/outstat.c @@ -357,7 +357,7 @@ int each(faddr *addr, char flavor, int isflo, char *fname) if ((isflo == OUT_FLO) || (isflo == OUT_PKT)) switch (flavor) { case '?': break; - case 'i': (*tmp)->flavors |= F_IMM; break; + case 'd': (*tmp)->flavors |= F_IMM; break; case 'o': (*tmp)->flavors |= F_NORMAL; break; case 'c': (*tmp)->flavors |= F_CRASH; break; case 'h': (*tmp)->flavors |= F_HOLD; break; diff --git a/mbcico/scanout.c b/mbcico/scanout.c index fa6113ae..ab0bbc0b 100644 --- a/mbcico/scanout.c +++ b/mbcico/scanout.c @@ -87,6 +87,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo (strcasecmp(de->d_name+8,".cut") == 0) || (strcasecmp(de->d_name+8,".hut") == 0) || (strcasecmp(de->d_name+8,".iut") == 0) || + (strcasecmp(de->d_name+8,".dut") == 0) || (strcasecmp(de->d_name+8,".opk") == 0) || (strcasecmp(de->d_name+8,".cpk") == 0) || (strcasecmp(de->d_name+8,".hpk") == 0) || @@ -95,6 +96,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo (strcasecmp(de->d_name+8,".clo") == 0) || (strcasecmp(de->d_name+8,".hlo") == 0) || (strcasecmp(de->d_name+8,".ilo") == 0) || + (strcasecmp(de->d_name+8,".dlo") == 0) || (strcasecmp(de->d_name+8,".req") == 0) || (strcasecmp(de->d_name+8,".pol") == 0)) { if (ispoint) @@ -103,7 +105,9 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo sscanf(de->d_name,"%04x%04x", &addr.net,&addr.node); flavor = tolower(de->d_name[9]); if (flavor == 'f') - flavor='o'; + flavor = 'o'; + if (flavor == 'i') + flavor = 'd'; if (strcasecmp(de->d_name+10,"ut") == 0) isflo=OUT_PKT; else if (strcasecmp(de->d_name+10,"pk") == 0) diff --git a/mbtask/outstat.c b/mbtask/outstat.c index ffb63ce6..c4982228 100644 --- a/mbtask/outstat.c +++ b/mbtask/outstat.c @@ -542,7 +542,7 @@ int outstat() * Immediate Mail check */ if ((tmp->flavors) & F_IMM) { - flstr[0]='I'; + flstr[0]='D'; /* * Immediate mail, send if node is CM or is in a Txx window or is in ZMH. */ @@ -791,7 +791,7 @@ int each(faddr *addr, char flavor, int isflo, char *fname) if ((isflo == OUT_FLO) || (isflo == OUT_PKT) || (isflo == OUT_FIL)) switch (flavor) { case '?': break; - case 'i': (*tmp)->flavors |= F_IMM; break; + case 'd': (*tmp)->flavors |= F_IMM; break; case 'o': (*tmp)->flavors |= F_NORMAL; break; case 'c': (*tmp)->flavors |= F_CRASH; break; case 'h': (*tmp)->flavors |= F_HOLD; break; diff --git a/mbtask/scanout.c b/mbtask/scanout.c index ebf9dd92..ba3bcb3e 100644 --- a/mbtask/scanout.c +++ b/mbtask/scanout.c @@ -90,6 +90,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo (strcasecmp(de->d_name+8,".cut") == 0) || (strcasecmp(de->d_name+8,".hut") == 0) || (strcasecmp(de->d_name+8,".iut") == 0) || + (strcasecmp(de->d_name+8,".dut") == 0) || (strcasecmp(de->d_name+8,".opk") == 0) || (strcasecmp(de->d_name+8,".cpk") == 0) || (strcasecmp(de->d_name+8,".hpk") == 0) || @@ -98,6 +99,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo (strcasecmp(de->d_name+8,".clo") == 0) || (strcasecmp(de->d_name+8,".hlo") == 0) || (strcasecmp(de->d_name+8,".ilo") == 0) || + (strcasecmp(de->d_name+8,".dlo") == 0) || (strcasecmp(de->d_name+8,".req") == 0) || (strcasecmp(de->d_name+8,".pol") == 0)) { if (ispoint) @@ -107,6 +109,8 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo flavor = tolower(de->d_name[9]); if (flavor == 'f') flavor='o'; + if (flavor == 'i') + flavor='d'; if (strcasecmp(de->d_name+10,"ut") == 0) isflo=OUT_PKT; else if (strcasecmp(de->d_name+10,"pk") == 0)