refresh

diff --git a/meta b/meta
index 9806b475d53749f5ab66cb4915eba45c10115bfb..2408a10e19ba5e0dcac188dec48b2d9cc167af5a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: c879a2d4b943b4fcc10f90a91e07767fce641d18
-Head: 675d7a6759f4da9091117ad3dcbb56ca73de7088
+Previous: 83b5b6d33d69683d589c56117859547e7736342a
+Head: f9fddc8f75f50d70032e9a084aad0421cc7886a1
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: d5c12aeec51e502abb9e152e2722a7ecfc0c0909
-  refresh-temp: 675d7a6759f4da9091117ad3dcbb56ca73de7088
+  fork: f9fddc8f75f50d70032e9a084aad0421cc7886a1
 Unapplied:
   rstream-fork: 139ce2d00d35db46877d3460c1efd6fb8d23a0c3
   dbg: d926df55f527306232be7787a15034b44d84f740

diff --git a/patches/fork b/patches/fork
index d3d42787698c2eab9e972a4e7dcf6c3c2efab229..79fed03eba6b7ae0b852eb0f0e869eb37de58c40 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    d4edc2731701b6ca6a94f9087e44dbb9f76ec25c
+Top:    a60724bf5aa9081e8c88db5b5cfd3786af42b333
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..56c6c7d 100644
+index d2058e2..731643d 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -90,7 +90,7 @@ index d2058e2..56c6c7d 100644
                return index;
        }
        fd_close(index, &ret);
-@@ -418,31 +437,68 @@ int listen(int socket, int backlog)
+@@ -418,31 +437,67 @@ int listen(int socket, int backlog)
  int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
  {
        int fd, index, ret;
@@ -131,9 +131,8 @@ index d2058e2..56c6c7d 100644
 +      flags = real.fcntl(fd, F_GETFD);
 +      real.fcntl(fd, F_SETFD, 0);
 +      ret = real.connect(fd, addr, addrlen);
-+      if (ret) {
++      if (ret)
 +              return ret;
-+      }
 +
 +      ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK);
 +      if ((ret != sizeof msg) || msg) {
@@ -163,7 +162,7 @@ index d2058e2..56c6c7d 100644
                sin = (struct sockaddr_in *) addr;
                if (ntohs(sin->sin_port) > 1024) {
                        ret = rconnect(fd, addr, addrlen);
-@@ -456,6 +512,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -456,6 +511,9 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  
                rclose(fd);
                fd = ret;
@@ -173,7 +172,7 @@ index d2058e2..56c6c7d 100644
        }
  
        return real.connect(fd, addr, addrlen);
-@@ -754,3 +813,86 @@ int fcntl(int socket, int cmd, ... /* arg */)
+@@ -754,3 +812,86 @@ int fcntl(int socket, int cmd, ... /* arg */)
        va_end(args);
        return ret;
  }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5ae405a..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: d4edc2731701b6ca6a94f9087e44dbb9f76ec25c
-Top:    a60724bf5aa9081e8c88db5b5cfd3786af42b333
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 11:31:12 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 56c6c7d..731643d 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -471,9 +471,8 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-       flags = real.fcntl(fd, F_GETFD);
-       real.fcntl(fd, F_SETFD, 0);
-       ret = real.connect(fd, addr, addrlen);
--      if (ret) {
-+      if (ret)
-               return ret;
--      }
- 
-       ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK);
-       if ((ret != sizeof msg) || msg) {