refresh (create temporary patch)

diff --git a/meta b/meta
index 203f04edd2d4edc9912a2dcda0d74fb9cf00528d..e2823d44cdd465cdb42c4964c8d04c996ba2f707 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: e55a1353348d5c164b057041f435857e7b4efd54
-Head: 768a0ea91022afb5a3189760936ddb5a39deecd9
+Previous: 4085595fc5d9e7ab61196fa601c3ded11a997062
+Head: 8b6189584b1b40f5a40d1c104590bc63eb18e0a3
 Applied:
   dbg-fork: 768a0ea91022afb5a3189760936ddb5a39deecd9
+  refresh-temp: 8b6189584b1b40f5a40d1c104590bc63eb18e0a3
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..69640f4
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: 3ff660268308f81ffa10068086e46e1eb0d84b77
+Top:    897cee0b17f17050fe3667cbaf7c6d9d3f66ab9d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-22 15:36:51 -0700
+
+Refresh of dbg-fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index fba0281..d1d8b06 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -413,9 +413,13 @@ int socket(int domain, int type, int protocol)
+       if (index < 0)
+               return index;
+ 
++      if ((domain == PF_INET || domain == PF_INET6) &&
++          (type == SOCK_STREAM) && (!protocol || protocol == IPPROTO_TCP) && fork_support) {
++              printf("skipping rsocket call\n");
++              goto realsock;
++      }
++
+       recursive = 1;
+-printf("skipping rsocket call\n");
+-goto realsock;
+       ret = rsocket(domain, type, protocol);
+       recursive = 0;
+       if (ret >= 0) {