diff --git a/ChangeLog b/ChangeLog index 54962003..18b59565 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4692,6 +4692,7 @@ v0.33.20 10-Feb-2002 with that node, mbcico stopts the binkp session with an error. Remove some obsolete code that is handled by mbtask. Added some debug logmessages in ttyio. + Disabled creation of .spl files dusing mail sessions for test. mbout: The status display has now 9 digits for the outbound size. diff --git a/mbcico/call.c b/mbcico/call.c index 49bc7f0b..f08d6d75 100644 --- a/mbcico/call.c +++ b/mbcico/call.c @@ -55,17 +55,6 @@ extern char *forcedline; extern char *inetaddr; -int checkretry(callstat *); -int checkretry(callstat *st) -{ - Syslog('d', "Checkretry nr %d status %d", st->tryno, st->trystat); - if (st->tryno > 30) - return 2; - return 0; - /* check retries and time; rc=1 - not reached, rc=2 - undialable */ -} - - int portopen(faddr *addr) { @@ -111,7 +100,6 @@ int portopen(faddr *addr) int call(faddr *addr) { int i, rc = 1; - callstat *st; struct hostent *he; /* @@ -128,11 +116,11 @@ int call(faddr *addr) putstatus(addr, 0, ST_LOCKED); return ST_LOCKED; } - nodeulock(addr); if ((nlent = getnlent(addr)) == NULL) { WriteError("Cannot call %s: fatal in nodelist lookup", ascfnode(addr, 0x1f)); putstatus(addr,0,ST_LOOKUP); + nodeulock(addr); return ST_LOOKUP; } @@ -228,23 +216,6 @@ int call(faddr *addr) Syslog('?', "Warning: calling MO system outside ZMH"); } - st = getstatus(addr); - if ((rc = checkretry(st))) { - Syslog('+', "Cannot call %s: %s", ascfnode(addr,0x1f), (rc == 1)?"retry time not reached":"node undialable"); - return 5; - } - - /* - * Over TCP/IP we don't do a delay because the node we are - * connecting can't be busy. Also forced calls don't delay. - */ - - if (nodelock(addr)) { - Syslog('+', "System %s is locked", ascfnode(addr, 0x1f)); - putstatus(addr, 0, ST_LOCKED); - return ST_LOCKED; - } - if (inbound) free(inbound); inbound = xstrcpy(CFG.pinbound); /* master sessions are secure */ diff --git a/mbcico/filelist.c b/mbcico/filelist.c index adae2c1c..c1ea1ad4 100644 --- a/mbcico/filelist.c +++ b/mbcico/filelist.c @@ -243,13 +243,13 @@ file_list *create_filelist(fa_list *al, char *fl, int create) /* * Check spool files. */ - if (strchr(fl, 'o')) { - nm=splname(tmpa->addr); - if ((fp=fopen(nm,"w"))) - fclose(fp); - if ((nm != NULL) && (stat(nm,&stbuf) == 0)) - add_list(&st,nm,NULL,DSF,0L,NULL,1); - } +// if (strchr(fl, 'o')) { +// nm=splname(tmpa->addr); +// if ((fp=fopen(nm,"w"))) +// fclose(fp); +// if ((nm != NULL) && (stat(nm,&stbuf) == 0)) +// add_list(&st,nm,NULL,DSF,0L,NULL,1); +// } /* * Check .pol files