diff --git a/ChangeLog b/ChangeLog index bafd291b..35514ad4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ $Id$ v0.83.16 13-Mar-2006 + mbfido: + If sending crash to a node not in the setup, a default + archiver is now set to ZIP. + + v0.83.15 05-Mar-2006 - 13-Mar-2006 mbsebbs: diff --git a/mbfido/queue.c b/mbfido/queue.c index ea19279e..243f9a78 100644 --- a/mbfido/queue.c +++ b/mbfido/queue.c @@ -107,7 +107,7 @@ void flush_dir(char *ndir) if (!SearchNode(nodenr)) { /* - * Node not known, blank noderecord and fill in some details + * Node not in setup, blank noderecord and fill in some details * so that we are able to send mail crash or immediate. */ Syslog('+', "Node %s not in setup, using default settings", aka2str(nodenr)); @@ -116,6 +116,7 @@ void flush_dir(char *ndir) nodes.Aka[0].net = noden.net; nodes.Aka[0].node = noden.node; nodes.Aka[0].point = noden.point; + snprintf(nodes.Archiver, 6, (char *)"ZIP"); } /* diff --git a/mbsebbs/openport.c b/mbsebbs/openport.c index 0b4394b7..944438e1 100644 --- a/mbsebbs/openport.c +++ b/mbsebbs/openport.c @@ -195,7 +195,7 @@ int io_mode(int fd, int n) tty.c_iflag = 0; /* Transparant input */ tty.c_oflag = 0; /* Transparent output */ - tty.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD); /* Disable parity and all character sizes */ + tty.c_cflag &= ~( CSIZE | CSTOPB | PARENB | PARODD); /* Disable parity and all character sizes */ tty.c_cflag |= CS8 | CREAD | HUPCL | CLOCAL; tty.c_lflag = 0; tty.c_cc[VMIN] = 1; @@ -318,7 +318,7 @@ int io_mode(int fd, int n) tty.c_iflag = IGNBRK; if (n == 3) { /* with flow control */ tty.c_iflag |= IXOFF; /* Enable XON/XOFF flow control on input */ -// tty.c_cflag |= CRTSCTS; /* hardware flowcontrol */ + tty.c_cflag |= CRTSCTS; /* hardware flowcontrol */ } @@ -329,7 +329,7 @@ int io_mode(int fd, int n) */ tty.c_lflag = 0; /* Transparant input */ tty.c_oflag = 0; /* Transparent output */ - tty.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD); /* Same baud rate, disable parity */ + tty.c_cflag &= ~( CSIZE | CSTOPB | PARENB | PARODD); /* Same baud rate, disable parity */ tty.c_cflag |= CS8 | CREAD | HUPCL | CLOCAL; tty.c_cc[VMIN] = 1; /* This many chars satisfies reads */ tty.c_cc[VTIME] = 0; diff --git a/mbsebbs/zmsend.c b/mbsebbs/zmsend.c index 08afc6bf..28255dd9 100644 --- a/mbsebbs/zmsend.c +++ b/mbsebbs/zmsend.c @@ -132,7 +132,7 @@ int zmsndfiles(down_list *lst, int try8) free(txbuf); txbuf = NULL; del_frame_buffer(); - io_mode(0, 1); +// io_mode(0, 1); Syslog('z', "Zmodem: send rc=%d", maxrc); return (maxrc < 2)?0:maxrc; @@ -144,7 +144,7 @@ static int initsend(void) { Syslog('z', "Zmodem: initsend"); - io_mode(0, 1); +// io_mode(0, 1); PUTSTR((char *)"rz\r"); stohdr(0L); zshhdr(ZRQINIT, Txhdr); @@ -259,6 +259,9 @@ int getzrxinit(void) continue; case ZCOMMAND: /* They didn't see out ZRQINIT */ /* A receiver cannot send a command */ + Syslog('z', "getzrxinit got ZCOMMAND"); + stohdr(0L); + zshhdr(ZACK, Txhdr); continue; case ZRINIT: Rxflags = 0377 & Rxhdr[ZF0]; @@ -275,7 +278,7 @@ int getzrxinit(void) if ( !(Rxflags & CANFDX)) Txwindow = 0; Syslog('z', "Zmodem: Remote allowed Rxbuflen=%d", Rxbuflen); - io_mode(0, 2); /* Set cbreak, XON/XOFF, etc. */ +// io_mode(0, 2); /* Set cbreak, XON/XOFF, etc. */ /* Set initial subpacket length */ if (blklen < 1024) { /* Command line override? */ @@ -333,6 +336,7 @@ int sendzsinit(void) Txhdr[ZF0] |= TESCCTL; zshhdr(ZSINIT, Txhdr); } else zsbhdr(ZSINIT, Txhdr); + Syslog('z', "sendzsinit Myattn \"%s\"", printable(Myattn, 0)); zsdata(Myattn, 1 + strlen(Myattn), ZCRCW); c = zgethdr(Rxhdr); switch (c) { @@ -480,7 +484,8 @@ gotack: return ZSKIP; case ZSKIP: fclose(in); return c; - case ZACK: break; // Possible bug, added 23-08-99 + case ZACK: Syslog('z', "zmsend: got ZACK"); + break; // Possible bug, added 23-08-99 case ZRPOS: blklen = ((blklen >> 2) > 64) ? (blklen >> 2) : 64; goodblks = 0; goodneeded = ((goodneeded << 1) > 16) ? 16 : goodneeded << 1;