From 275ca923cb862f104957e59f68a3871b7f486327 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 13 Aug 2012 14:47:35 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index cc5dc2fe..60f712f2 100644 --- a/meta +++ b/meta @@ -1,11 +1,12 @@ Version: 1 -Previous: 3bd98343bdd8b419931e08f102600de5622b5f62 -Head: a31705e2a68851f684dc58edff0f08f3d3906cea +Previous: 083aaf02eb148dbd340e1b916fb8f97a5431c88d +Head: af2f529bdcc4ae2ec8db2948e6c31c8ce81d2a49 Applied: real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2 dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824 oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97 fork-connect: a31705e2a68851f684dc58edff0f08f3d3906cea + refresh-temp: af2f529bdcc4ae2ec8db2948e6c31c8ce81d2a49 Unapplied: dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df fstat: a62c653906870422edef5f6388dac9f76c953e35 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..1af5415a --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,39 @@ +Bottom: 0841906224bb250847983ffd2a5d0bee11b39b28 +Top: b325ccfd975dd153285cfe5ba9f66efd16427780 +Author: Sean Hefty +Date: 2012-08-13 14:47:35 -0700 + +Refresh of fork-connect + +--- + +diff --git a/src/preload.c b/src/preload.c +index 33f3baf..2b115d3 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -184,7 +184,7 @@ static inline int fd_getd(int index) + return fdi ? fdi->fd : index; + } + +-static inline enum fd_state fd_gets(int index) ++static inline enum fd_fork_state fd_gets(int index) + { + struct fd_info *fdi; + +@@ -514,7 +514,7 @@ static void fork_active(int socket) + if ((ret != sizeof msg) || msg) + goto err2; + +- ret = rconnect(ret, &sin6, len); ++ ret = rconnect(ret, &addr, len); + if (ret) + goto err2; + +@@ -574,7 +574,7 @@ static void fork_passive(int socket) + goto lclose; + + msg = 0; +- len = real.send(sfd, &msg, sizeof msg, MSG_NODELAY); ++ len = real.write(sfd, &msg, sizeof msgs); + if (len != sizeof msg) + goto lclose; -- 2.46.0