Binkp timer updates

This commit is contained in:
Michiel Broek 2004-01-26 15:22:17 +00:00
parent 5d9a8b1ad9
commit 1a3c67356c
3 changed files with 8 additions and 6 deletions

View File

@ -9,8 +9,6 @@ Michiel Broek mbroek@users.sourceforge.net 2:280/2802
Ken Bowley kbowley@users.sourceforge.net, 1:114/485@fidonet Ken Bowley kbowley@users.sourceforge.net, 1:114/485@fidonet
Redy Rodriguez redy@users.sourceforge.net 2:283/613.6 Redy Rodriguez redy@users.sourceforge.net 2:283/613.6
Scott Street sstreet98@users.sourceforge.net, 1:2600/135@fidonet Scott Street sstreet98@users.sourceforge.net, 1:2600/135@fidonet
Phil Kimble kimerud@users.sourceforge.net 1:14/200@fidonet
David Gonzalez skynetbbs@007mundo.com 4:930/1@fidonet
All following people have contributed to the MBSE BBS project. I'm sure that All following people have contributed to the MBSE BBS project. I'm sure that
@ -50,4 +48,6 @@ Serge Terekhov 2:5000/13@fidonet
Vadim Kurland vadim@gu.kiev.ua Vadim Kurland vadim@gu.kiev.ua
Vadim Zaliva lord@crocodile.kiev.ua Vadim Zaliva lord@crocodile.kiev.ua
Przemyslaw Kwiatkowski 2:480/127@fidonet Przemyslaw Kwiatkowski 2:480/127@fidonet
Phil Kimble kimerud@users.sourceforge.net 1:14/200@fidonet
David Gonzalez skynetbbs@007mundo.com 4:930/1@fidonet

View File

@ -8,12 +8,14 @@ v0.39.8 26-Jan-2004
mbcico: mbcico:
Fixed binkp file resync. Fixed binkp file resync.
Binkp now only tries to compress data frames. Binkp now only tries to compress data frames.
Fixed binkp master timer reset points, this should make session
timeout work.
v0.39.7 14-Jan-2004 - 26-Jan-2004 v0.39.7 14-Jan-2004 - 26-Jan-2004
remark: remark:
Calling points is availbale now, but I know in the past that I Calling points is available now, but I know in the past that I
changed it to allways call the boss. That was from the time changed it to allways call the boss. That was from the time
that mbtask didn't exist. It is possible that something is that mbtask didn't exist. It is possible that something is
broken now, please report such situations. broken now, please report such situations.

View File

@ -937,7 +937,6 @@ int file_transfer(void)
case Receive: Trc = binkp_receiver(); case Receive: Trc = binkp_receiver();
if (Trc == Ok) { if (Trc == Ok) {
binkp_settimer(BINKP_TIMEOUT);
if (bp.local_EOB && bp.remote_EOB) if (bp.local_EOB && bp.remote_EOB)
bp.FtState = Transmit; bp.FtState = Transmit;
else else
@ -951,7 +950,6 @@ int file_transfer(void)
case Transmit: Trc = binkp_transmitter(); case Transmit: Trc = binkp_transmitter();
if (Trc == Ok) { if (Trc == Ok) {
binkp_settimer(BINKP_TIMEOUT);
bp.FtState = Switch; bp.FtState = Switch;
} else if (Trc == Failure) { } else if (Trc == Failure) {
Syslog('+', "Binkp: transmitter failure"); Syslog('+', "Binkp: transmitter failure");
@ -1731,7 +1729,7 @@ int binkp_expired(void)
now = time(NULL); now = time(NULL);
if (now >= Timer) if (now >= Timer)
Syslog('+', "Binkp: timeout"); Syslog('+', "Binkp: session timeout");
return (now >= Timer); return (now >= Timer);
} }
@ -1797,6 +1795,7 @@ int binkp_recv_command(char *buf, unsigned long *len, int *cmd)
buf[*len] = '\0'; buf[*len] = '\0';
if (tty_status) if (tty_status)
goto to; goto to;
binkp_settimer(BINKP_TIMEOUT);
to: to:
if (tty_status) if (tty_status)
@ -1978,6 +1977,7 @@ int binkp_poll_frame(void)
} else { } else {
Syslog('b', "Binkp: rcvd data (%d)", bp.rxlen -1); Syslog('b', "Binkp: rcvd data (%d)", bp.rxlen -1);
} }
binkp_settimer(BINKP_TIMEOUT);
rc = 1; rc = 1;
break; break;
} }