refresh

diff --git a/meta b/meta
index 18522d667b66ddba58cb5f1a6641dc64a369fecc..d418161958b8f732bbba1e19f7d68fcf7d77bed5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 5c565d92f3843aecb61110650be0b3e277cc6d2d
-Head: b897fb480114a2c6faa0d5140a9fc6d333845a40
+Previous: 2c5c181450d04092f95c2b20bf55f884389d6435
+Head: 28e0744eb89227fbeded485fbad64010b9edf0f6
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
   fork: 6fe19c8ba560c3aa57c25ba8ffa0602e7b7c6786
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
-  rs-ftp: e886d54b3a5080bea731df5cdbf965f08246d855
-  refresh-temp: b897fb480114a2c6faa0d5140a9fc6d333845a40
+  rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
 Unapplied:
   dbg: 3ec7b3dd2db8422fd840e3cee062c629e7b8f5b6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1ac4a7c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,63 +0,0 @@
-Bottom: 9ac57390fafeb98c18db72a4b2a0198a58383713
-Top:    2d7d36989522b9e010497256793038fb2cb5aa9e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-25 11:21:20 -0700
-
-Refresh of rs-ftp
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index c8ad747..52eaf1a 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -405,23 +405,9 @@ real:
- 
- int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
--      struct sockaddr_in *sin;
--      int fd, ret;
--
--      if (fd_get(socket, &fd) == fd_rsocket) {
--              sin = (struct sockaddr_in *) addr;
--              if (!sin->sin_port || ntohs(sin->sin_port) > 1024)
--                      return rbind(fd, addr, addrlen);
--
--              ret = transpose_socket(socket, fd_normal);
--              if (ret < 0)
--                      return ret;
--
--              rclose(fd);
--              fd = ret;
--      }
--
--      return real.bind(fd, addr, addrlen);
-+      int fd;
-+      return (fd_get(socket, &fd) == fd_rsocket) ?
-+              rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
- }
- 
- int listen(int socket, int backlog)
-@@ -582,19 +568,15 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
- 
- int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
--      struct sockaddr_in *sin;
-       int fd, ret;
- 
-       switch (fd_get(socket, &fd)) {
-       case fd_fork:
-               return fork_active(socket, addr, addrlen);
-       case fd_rsocket:
--              sin = (struct sockaddr_in *) addr;
--              if (ntohs(sin->sin_port) > 1024) {
--                      ret = rconnect(fd, addr, addrlen);
--                      if (!ret || errno == EINPROGRESS)
--                              return ret;
--              }
-+              ret = rconnect(fd, addr, addrlen);
-+              if (!ret || errno == EINPROGRESS)
-+                      return ret;
- 
-               ret = transpose_socket(socket, fd_normal);
-               if (ret < 0)

diff --git a/patches/rs-ftp b/patches/rs-ftp
index 0952ad0975d8d361b28037069bc0da7a2cce23a5..9e8fcd2c2b218cdb20c80ef67f5be8693c7dc5cc 100644 (file)
--- a/patches/rs-ftp
+++ b/patches/rs-ftp
@@ -1,5 +1,5 @@
 Bottom: 9ac57390fafeb98c18db72a4b2a0198a58383713
-Top:    9ac57390fafeb98c18db72a4b2a0198a58383713
+Top:    2d7d36989522b9e010497256793038fb2cb5aa9e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-25 11:11:56 -0700
 
@@ -10,4 +10,57 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index c8ad747..52eaf1a 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -405,23 +405,9 @@ real:
+ 
+ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+-      struct sockaddr_in *sin;
+-      int fd, ret;
+-
+-      if (fd_get(socket, &fd) == fd_rsocket) {
+-              sin = (struct sockaddr_in *) addr;
+-              if (!sin->sin_port || ntohs(sin->sin_port) > 1024)
+-                      return rbind(fd, addr, addrlen);
+-
+-              ret = transpose_socket(socket, fd_normal);
+-              if (ret < 0)
+-                      return ret;
+-
+-              rclose(fd);
+-              fd = ret;
+-      }
+-
+-      return real.bind(fd, addr, addrlen);
++      int fd;
++      return (fd_get(socket, &fd) == fd_rsocket) ?
++              rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
+ }
+ 
+ int listen(int socket, int backlog)
+@@ -582,19 +568,15 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
+ 
+ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+-      struct sockaddr_in *sin;
+       int fd, ret;
+ 
+       switch (fd_get(socket, &fd)) {
+       case fd_fork:
+               return fork_active(socket, addr, addrlen);
+       case fd_rsocket:
+-              sin = (struct sockaddr_in *) addr;
+-              if (ntohs(sin->sin_port) > 1024) {
+-                      ret = rconnect(fd, addr, addrlen);
+-                      if (!ret || errno == EINPROGRESS)
+-                              return ret;
+-              }
++              ret = rconnect(fd, addr, addrlen);
++              if (!ret || errno == EINPROGRESS)
++                      return ret;
+ 
+               ret = transpose_socket(socket, fd_normal);
+               if (ret < 0)