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

Fixes for stopping mbtask

Browse Source
This commit is contained in:
Michiel Broek
2003-12-06 16:59:24 +00:00
parent 08f0ae7711
commit df0e9ee03f
7 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mbtask/ping.c
View File

@@ -337,6 +337,7 @@ void *ping_thread(void)
static int pingnr, pingresult[2];
static char pingaddress[41];
static time_t pingsend;
time_t now;
Syslog('+', "Starting ping thread with pid %d", (int)getpid());
pingresult[1] = pingresult[2] = FALSE;
@@ -371,7 +372,13 @@ void *ping_thread(void)
if (icmp_errs++ < ICMP_MAX_ERRS)
Syslog('?', "ping: to %s rc=%d", pingaddress, rc);
pingresult[pingnr] = FALSE;
sleep(10);
now = time(NULL) + 10;
while ((! T_Shutdown) && (time(NULL) < now)) {
sleep(1);
}
if (T_Shutdown)
break;
} else {
pingsend = time(NULL);
@@ -398,10 +405,10 @@ void *ping_thread(void)
if (rc > 5)
Syslog('+', "Ping: slow reply after %d seconds", rc);
pingresult[pingnr] = TRUE;
if (rc < 20)
sleep(20 - rc);
else
now = time(NULL) + 20 - rc;
while ((! T_Shutdown) && (time(NULL) < now)) {
sleep(1);
}
break;
} else {
if (rc != -6) {
@@ -415,9 +422,15 @@ void *ping_thread(void)
} else {
if (icmp_errs++ < ICMP_MAX_ERRS)
Syslog('?', "Ping address %d is invalid \"%s\"", pingnr, pingaddress);
sleep(10);
now = time(NULL) + 10;
while ((! T_Shutdown) && (time(NULL) < now)) {
sleep(1);
}
}
if (T_Shutdown)
break;
/*
* Evaluate the result of the ping test
*/