Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv30628
Modified Files:
Tag: rel-1_0
main.c
Log Message:
dont accidently pass a negative timeout to select()
Index: main.c
===================================================================
RCS file: /cvsroot/srvx/services/src/main.c,v
retrieving revision 1.94.2.14
retrieving revision 1.94.2.15
diff -C2 -r1.94.2.14 -r1.94.2.15
*** main.c 2001/09/05 04:04:01 1.94.2.14
--- main.c 2001/10/08 01:46:50 1.94.2.15
***************
*** 461,466 ****
/* if we're connected, we must have some time to ping (at least) */
wakey = timeq_next();
! select_timeout.tv_sec = wakey - now;
select_timeout.tv_usec = 0;
/* We're connected to the server, watch for incoming data */
FD_ZERO(&connection);
--- 461,473 ----
/* if we're connected, we must have some time to ping (at least) */
wakey = timeq_next();
!
! if ((wakey - now) < 0) {
! select_timeout.tv_sec = 0;
! } else {
! select_timeout.tv_sec = wakey - now;
! }
!
select_timeout.tv_usec = 0;
+
/* We're connected to the server, watch for incoming data */
FD_ZERO(&connection);
***************
*** 476,480 ****
}
/* run timeq after reading socket input */
! if (cManager.uplink->state == CONNECTED) timeq_run(now);
} else if (errno != EINTR){
log(MAIN_LOG, LOG_ERROR, "select(): %s\n", strerror(errno));
--- 483,487 ----
}
/* run timeq after reading socket input */
! timeq_run(now);
} else if (errno != EINTR){
log(MAIN_LOG, LOG_ERROR, "select(): %s\n", strerror(errno));
|
