From 7c465974adc5954a6e79e68bb6bd3f1c9a268b59 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 13 Aug 2012 16:01:15 -0700 Subject: [PATCH] Refresh of fork-pass --- src/preload.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/preload.c b/src/preload.c index b18d3100..bb8e3fbe 100644 --- a/src/preload.c +++ b/src/preload.c @@ -492,7 +492,7 @@ static void fork_passive(int socket) socklen_t len; uint32_t msg; - fd_get(socket, &sfd); + sfd = fd_getd(socket); len = sizeof sin6; ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len); @@ -510,7 +510,7 @@ static void fork_passive(int socket) lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0); if (lfd < 0) { - ret = lfd; + ret = lfd; goto sclose; } @@ -537,10 +537,7 @@ static void fork_passive(int socket) goto lclose; } - param = 1; - rsetsockopt(dfd, IPPROTO_TCP, TCP_NODELAY, ¶m, sizeof param); set_rsocket_options(dfd); - copysockopts(dfd, sfd, &rs, &real); real.shutdown(sfd, SHUT_RDWR); real.close(sfd); -- 2.45.2