bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed zmodem timeout bug

Browse Source
This commit is contained in:
Michiel Broek
2003-09-17 19:33:34 +00:00
parent e5de4ddfa7
commit 9eadf0b143
6 changed files with 174 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mbcico/emsi.c
View File

@@ -307,28 +307,28 @@ SM_START(init)
SM_STATE(init)
Syslog('i', "RXEMSI: init");
RESETTIMERS();
SETTIMER(0, 60);
SETTIMER(1, 20);
gpt_resettimers();
gpt_settimer(0, 60);
gpt_settimer(1, 20);
SM_PROCEED(checkpkt);
SM_STATE(waitpkt)
Syslog('i', "RXEMSI: waitpkt");
standby = 0;
SETTIMER(1, 20);
gpt_settimer(1, 20);
SM_PROCEED(waitchar);
SM_STATE(waitchar)
Syslog('i', "RXEMSI: waitchar, tries=%d", tries);
if (EXPIRED(0)) {
if (gpt_expired(0)) {
Syslog('+', "EMSI receive 60 seconds timeout");
SM_ERROR;
}
if (EXPIRED(1)) {
if (gpt_expired(1)) {
Syslog('s', "20 sec timeout");
SM_PROCEED(sendnak);
}
@@ -517,8 +517,8 @@ SM_EDECL
p = buf;
memset(&buf, 0, sizeof(buf));
strncpy(buf, intro, sizeof(buf) - 1);
RESETTIMERS();
SETTIMER(0, 60);
gpt_resettimers();
gpt_settimer(0, 60);
Syslog('i', "TXEMSI: 60 seconds timer set");
SM_START(senddata)
@@ -534,7 +534,7 @@ SM_STATE(senddata)
PUTSTR(trailer);
Syslog('i', "TXEMSI: send **%s%04X", p, crc16xmodem(p, strlen(p)));
free(p);
SETTIMER(1, 20);
gpt_settimer(1, 20);
SM_PROCEED(waitpkt);
SM_STATE(waitpkt)
@@ -544,12 +544,12 @@ SM_STATE(waitpkt)
SM_STATE(waitchar)
if (EXPIRED(0)) {
if (gpt_expired(0)) {
Syslog('+', "EMSI transmit 60 seconds timeout");
SM_ERROR;
}
if (EXPIRED(1)) {
if (gpt_expired(1)) {
Syslog('i', "TXEMSI: 20 seconds timeout");
if (++tries > 19) {
Syslog('+', "too many tries sending EMSI");

24
mbcico/session.c
View File

@@ -232,8 +232,8 @@ SM_STATE(skipjunk)
Syslog('s', "tx_define_type SKIPJUNK");
while ((c = GETCHAR(1)) >= 0) /*nothing*/ ;
if (c == TIMEOUT) {
RESETTIMERS();
SETTIMER(0, 60); /* 60 second master timer */
gpt_resettimers();
gpt_settimer(0, 60); /* 60 second master timer */
SM_PROCEED(wake);
} else {
SM_ERROR;
@@ -242,7 +242,7 @@ SM_STATE(skipjunk)
SM_STATE(wake)
Syslog('s', "tx_define_type WAKE");
if (EXPIRED(0)) {
if (gpt_expired(0)) {
Syslog('+', "Remote did not respond");
SM_ERROR;
}
@@ -255,7 +255,7 @@ SM_STATE(wake)
WriteError("Error while waking remote");
SM_ERROR;
} else {
SETTIMER(0, 60);
gpt_settimer(0, 60);
Syslog('S', "Got %c wakeup", c);
SM_PROCEED(nextchar);
}
@@ -266,7 +266,7 @@ SM_STATE(waitchar)
standby = 0;
ep = ebuf;
ebuf[0] = '\0';
if (EXPIRED(0)) {
if (gpt_expired(0)) {
Syslog('+', "Too many tries waking remote");
SM_ERROR;
}
@@ -413,9 +413,9 @@ SM_EDECL
session_flags|=FTSC_XMODEM_CRC;
ebuf[0]='\0';
ep=ebuf;
RESETTIMERS();
SETTIMER(0, 60);
SETTIMER(1, 20);
gpt_resettimers();
gpt_settimer(0, 60);
gpt_settimer(1, 20);
SM_START(sendintro)
@@ -457,17 +457,17 @@ SM_STATE(sendintro)
SM_STATE(settimer)
Syslog('s', "Set 20 secs timer");
SETTIMER(1, 20);
gpt_settimer(1, 20);
SM_PROCEED(waitchar);
SM_STATE(waitchar)
if (EXPIRED(0)) {
if (gpt_expired(0)) {
Syslog('+', "Session setup timeout");
SM_ERROR;
}
if (EXPIRED(1)) {
if (gpt_expired(1)) {
Syslog('s', "20 sec timer timeout");
SM_PROCEED(sendintro);
}
@@ -535,7 +535,7 @@ SM_STATE(nextchar)
* first sendintro, send the intro again. After
* that take it easy.
*/
if (EXPIRED(1) || (count == 1)) {
if (gpt_expired(1) || (count == 1)) {
Syslog('s', "sendintro after eol char");
SM_PROCEED(sendintro);
} else {