Merge pull request #685 from ytwang0320/kp

set SO_LINGER to 0 in case of TIME_WAIT
iqiyi · Nov 21, 2020 · e93ade3 · e93ade3
2 parents 5835065 + 49cacc7
commit e93ade3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tools/keepalived/keepalived/core/layer4.c b/tools/keepalived/keepalived/core/layer4.c
@@ -50,10 +50,9 @@ socket_bind_connect(int fd, conn_opts_t *co)
 		return connect_error;
 	}
 	if (opt == SOCK_STREAM) {
-		/* free the tcp port after closing the socket descriptor, but
-		 * allow time for a proper shutdown. */
+		/* free the tcp port after closing the socket descriptor */
 		li.l_onoff = 1;
-		li.l_linger = 5;
+		li.l_linger = 0;
 		if (setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof (struct linger)))
 			log_message(LOG_INFO, "Failed to set SO_LINGER for socket %d - errno %d (%m)", fd, errno);
 	}