refresh

diff --git a/meta b/meta
index ce567b04a10c4fdcb32b3545e036a0969a5a83fe..344e1e2bf59d7a7372aee97aeb34cc1758cce720 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 2c9d3b8dea4b1cc25f74aacb1f43afea9f69d392
-Head: 7c465974adc5954a6e79e68bb6bd3f1c9a268b59
+Previous: 8f78cc179be50491375f7684f934c17900d423b9
+Head: 9d661d643b62858fe119794e0ca41b5575faa0ce
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
-  fork-pass: f06f7fd1b8be8aa696028c29b02ce856fd472eda
-  refresh-temp: 7c465974adc5954a6e79e68bb6bd3f1c9a268b59
+  fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
 Unapplied:
   fork-connect: 85934ae0f5efd5fb11c2f7414e69787d81d62b1c
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df

diff --git a/patches/fork-pass b/patches/fork-pass
index 7ee031fa50f12386c0ea34f712c986033160977a..869af55c4e9dc5b635dc1008986a63e589f4a551 100644 (file)
--- a/patches/fork-pass
+++ b/patches/fork-pass
@@ -1,5 +1,5 @@
 Bottom: 3ea2748a5c41b11a2e7033c56bddd938d2770b6c
-Top:    3ea2748a5c41b11a2e7033c56bddd938d2770b6c
+Top:    216c0397df2215433e2acfe73e52db57cbf694c4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-13 16:00:16 -0700
 
@@ -12,4 +12,36 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index b18d310..bb8e3fb 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, &param, sizeof param);
+       set_rsocket_options(dfd);
+-
+       copysockopts(dfd, sfd, &rs, &real);
+       real.shutdown(sfd, SHUT_RDWR);
+       real.close(sfd);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 25ca7ea..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: 3ea2748a5c41b11a2e7033c56bddd938d2770b6c
-Top:    216c0397df2215433e2acfe73e52db57cbf694c4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-13 16:01:15 -0700
-
-Refresh of fork-pass
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index b18d310..bb8e3fb 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, &param, sizeof param);
-       set_rsocket_options(dfd);
--
-       copysockopts(dfd, sfd, &rs, &real);
-       real.shutdown(sfd, SHUT_RDWR);
-       real.close(sfd);