X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fisrv.c;h=f0df2229cd2de233ae24ecdb6aaf8c4dd8dfbc96;hb=2f7b923f5c46de0840d7a683b75b6e8561461135;hp=02ca1d787f65c0874f54296a852a01d161f16f54;hpb=7a431b3715299854fb423ec00d5fafc0e2c7f07b;p=oweals%2Fbusybox.git

diff --git a/networking/isrv.c b/networking/isrv.c
index 02ca1d787..f0df2229c 100644
--- a/networking/isrv.c
+++ b/networking/isrv.c
@@ -21,6 +21,8 @@
 
 /* Helpers */
 
+/* Even if _POSIX_MONOTONIC_CLOCK is defined, this
+ * may require librt */
 #if 0 /*def _POSIX_MONOTONIC_CLOCK*/
 static time_t monotonic_time(void)
 {
@@ -188,13 +190,15 @@ static void handle_accept(isrv_state_t *state, int fd)
 {
 	int n, newfd;
 
-	fcntl(fd, F_SETFL, (int)(PARAM_TBL[0]) | O_NONBLOCK);
+	/* suppress gcc warning "cast from ptr to int of different size" */
+	fcntl(fd, F_SETFL, (int)(ptrdiff_t)(PARAM_TBL[0]) | O_NONBLOCK);
 	newfd = accept(fd, NULL, 0);
-	fcntl(fd, F_SETFL, (int)(PARAM_TBL[0]));
+	fcntl(fd, F_SETFL, (int)(ptrdiff_t)(PARAM_TBL[0]));
 	if (newfd < 0) {
 		if (errno == EAGAIN) return;
 		/* Most probably someone gave us wrong fd type
-		 * (for example, non-socket) */
+		 * (for example, non-socket). Don't want
+		 * to loop forever. */
 		bb_perror_msg_and_die("accept");
 	}
 
@@ -210,6 +214,7 @@ static void handle_fd_set(isrv_state_t *state, fd_set *fds, int (*h)(int, void *
 	enum { LONG_CNT = sizeof(fd_set) / sizeof(long) };
 	int fds_pos;
 	int fd, peer;
+	/* need to know value at _the beginning_ of this routine */
 	int fd_cnt = FD_COUNT;
 
 	if (LONG_CNT * sizeof(long) != sizeof(fd_set))
@@ -235,10 +240,15 @@ static void handle_fd_set(isrv_state_t *state, fd_set *fds, int (*h)(int, void *
 		}
 		break; /* all words are zero */
  found_fd:
-		if (fd >= fd_cnt) /* paranoia */
+		if (fd >= fd_cnt) { /* paranoia */
+			DPRINTF("handle_fd_set: fd > fd_cnt?? (%d > %d)",
+					fd, fd_cnt);
 			break;
+		}
 		DPRINTF("handle_fd_set: fd %d is active", fd);
 		peer = FD2PEER[fd];
+		if (peer < 0)
+			continue; /* peer is already gone */
 		if (peer == 0) {
 			handle_accept(state, fd);
 			continue;
@@ -259,9 +269,9 @@ static void handle_timeout(isrv_state_t *state, int (*do_timeout)(void **))
 	peer = PEER_COUNT-1;
 	/* peer 0 is not checked */
 	while (peer > 0) {
-		DPRINTF("peer %d: time diff %d", peer, (int)(CURTIME - TIMEO_TBL[peer]));
-
-		if ((CURTIME - TIMEO_TBL[peer]) > TIMEOUT) {
+		DPRINTF("peer %d: time diff %d", peer,
+				(int)(CURTIME - TIMEO_TBL[peer]));
+		if ((CURTIME - TIMEO_TBL[peer]) >= TIMEOUT) {
 			DPRINTF("peer %d: do_timeout()", peer);
 			n = do_timeout(&PARAM_TBL[peer]);
 			if (n)
@@ -279,7 +289,7 @@ void isrv_run(
 	int (*do_wr)(int fd, void **),
 	int (*do_timeout)(void **),
 	int timeout,
-	int exit_if_no_clients)
+	int linger_timeout)
 {
 	isrv_state_t *state = xzalloc(sizeof(*state));
 	state->new_peer = new_peer;
@@ -290,7 +300,8 @@ void isrv_run(
 	isrv_register_fd(state, /*peer:*/ 0, listen_fd);
 	isrv_want_rd(state, listen_fd);
 	/* remember flags to make blocking<->nonblocking switch faster */
-	PARAM_TBL[0] = (void*) (fcntl(listen_fd, F_GETFL, 0));
+	/* (suppress gcc warning "cast from ptr to int of different size") */
+	PARAM_TBL[0] = (void*)(ptrdiff_t)(fcntl(listen_fd, F_GETFL, 0));
 
 	while (1) {
 		struct timeval tv;
@@ -300,6 +311,8 @@ void isrv_run(
 		int n;
 
 		tv.tv_sec = timeout;
+		if (PEER_COUNT <= 1)
+			tv.tv_sec = linger_timeout;
 		tv.tv_usec = 0;
 		rd = state->rd;
 		if (WR_COUNT) {
@@ -307,8 +320,9 @@ void isrv_run(
 			wrp = &wr;
 		}
 
-		DPRINTF("run: select(FD_COUNT:%d,timeout:%d)...", FD_COUNT, timeout);
-		n = select(FD_COUNT, &rd, wrp, NULL, timeout ? &tv : NULL);
+		DPRINTF("run: select(FD_COUNT:%d,timeout:%d)...",
+				FD_COUNT, (int)tv.tv_sec);
+		n = select(FD_COUNT, &rd, wrp, NULL, tv.tv_sec ? &tv : NULL);
 		DPRINTF("run: ...select:%d", n);
 
 		if (n < 0) {
@@ -317,7 +331,7 @@ void isrv_run(
 			continue;
 		}
 
-		if (exit_if_no_clients && n == 0 && PEER_COUNT <= 1)
+		if (n == 0 && linger_timeout && PEER_COUNT <= 1)
 			break;
 
 		if (timeout) {
@@ -334,4 +348,5 @@ void isrv_run(
 		}
 	}
 	DPRINTF("run: bailout");
+	/* NB: accept socket is not closed. Caller is to decide what to do */
 }