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

Some more changes to the ping state machine

Browse Source
This commit is contained in:
Michiel Broek 2002-06-06 20:11:53 +00:00
parent 80442cbec3
commit 5ebd99269b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mbtask/ping.c
View File

@ -322,7 +322,8 @@ void check_ping(void)
case P_WAIT: // tasklog('p', "WAIT:"); case P_WAIT: // tasklog('p', "WAIT:");
if (time(NULL) >= pingtime) { if (time(NULL) >= pingtime) {
pingstate = P_ERROR; pingstate = P_ERROR;
tasklog('p', "timeout"); if (icmp_errs < ICMP_MAX_ERRS)
tasklog('?', "ping: to %s timeout", pingaddress);
} else { } else {
/* /*
* Quickly eat all packets not for us, we only want our * Quickly eat all packets not for us, we only want our
@ -333,7 +334,9 @@ void check_ping(void)
/* /*
* Reply received. * Reply received.
*/ */
tasklog('p', "Reply after %d", time(NULL) - (pingtime - 20)); rc = time(NULL) - (pingtime - 20);
if (rc != 1)
tasklog('p', "ping: reply after %d seconds", rc);
pingresult[pingnr] = TRUE; pingresult[pingnr] = TRUE;
if (pingresult[1] || pingresult[2]) { if (pingresult[1] || pingresult[2]) {
if (!internet) { if (!internet) {
@ -356,7 +359,7 @@ void check_ping(void)
} }
break; break;
case P_SENT: tasklog('p', "SENT:"); case P_SENT: // tasklog('p', "SENT:");
pingtime = time(NULL) + 10; // 10 secs timeout for pause. pingtime = time(NULL) + 10; // 10 secs timeout for pause.
if (pingnr == 1) { if (pingnr == 1) {
pingnr = 2; pingnr = 2;
@ -378,7 +381,7 @@ void check_ping(void)
} }
} }
pingtime = time(NULL) + 20; // 20 secs timeout for a real ping pingtime = time(NULL) + 20; // 20 secs timeout for a real ping
tasklog('p', "nr %d address %s", pingnr, pingaddress); // tasklog('p', "nr %d address %s", pingnr, pingaddress);
if (inet_aton(pingaddress, &paddr)) { if (inet_aton(pingaddress, &paddr)) {
rc = ping_send(paddr); rc = ping_send(paddr);
if (rc) { if (rc) {
@ -396,7 +399,7 @@ void check_ping(void)
} }
break; break;
case P_ERROR: tasklog('p', "ERROR:"); case P_ERROR: // tasklog('p', "ERROR:");
pingresult[pingnr] = FALSE; pingresult[pingnr] = FALSE;
if (pingresult[1] == FALSE && pingresult[2] == FALSE) { if (pingresult[1] == FALSE && pingresult[2] == FALSE) {
icmp_errs++; icmp_errs++;