[SCM] Socket Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  5702910 Bump version to 1.1.1
       via  86114df swrap: Disable incomplete bind checks for EADDRINUSE.
       via  d768235 tests: Disable addr_in_use bind test while the swrap code is incomplete.
      from  3a05064 Bump version to 1.1.0.

http://gitweb.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 570291013b0844452219f76c3d5e1d78eb617d11
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 5 23:41:09 2014 +0200

    Bump version to 1.1.1

commit 86114df0dfc8d74fc545d08c864f9045c70fe452
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 5 23:47:40 2014 +0200

    swrap: Disable incomplete bind checks for EADDRINUSE.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit d768235f48622c89378cb32c48a65ecb97dd2780
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jun 5 23:46:31 2014 +0200

    tests: Disable addr_in_use bind test while the swrap code is incomplete.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt             |    4 ++--
 ChangeLog                  |    5 ++++-
 src/socket_wrapper.c       |    7 ++++++-
 tests/test_echo_tcp_bind.c |    4 ++++
 4 files changed, 16 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 307103c..8407053 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 
 set(APPLICATION_VERSION_MAJOR "1")
 set(APPLICATION_VERSION_MINOR "1")
-set(APPLICATION_VERSION_PATCH "0")
+set(APPLICATION_VERSION_PATCH "1")
 
 set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
 
@@ -19,7 +19,7 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO
 #     Increment AGE. Set REVISION to 0
 #   If the source code was changed, but there were no interface changes:
 #     Increment REVISION.
-set(LIBRARY_VERSION "0.1.0")
+set(LIBRARY_VERSION "0.1.1")
 set(LIBRARY_SOVERSION "0")
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
diff --git a/ChangeLog b/ChangeLog
index 7b3ed53..e5eabfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 ChangeLog
 ==========
 
-version 1.0.3 (released 2014-06-02)
+version 1.1.1 (released 2014-06-05)
+  * Disable incomplete address in use check in bind().
+
+version 1.1.0 (released 2014-06-02)
   * Added support for IP_PKTINFO in recvmsg().
   * Added support for IPV6_PKTINFO in recvmsg().
   * Added support for IP_RECVDSTADDR in recvmsg() on BSD.
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index f6adc95..afd9343 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -1267,6 +1267,7 @@ static struct socket_info *find_socket_info(int fd)
 	return NULL;
 }
 
+#if 0 /* FIXME */
 static bool check_addr_port_in_use(const struct sockaddr *sa, socklen_t len)
 {
 	struct socket_info *s;
@@ -1348,7 +1349,7 @@ static bool check_addr_port_in_use(const struct sockaddr *sa, socklen_t len)
 
 	return false;
 }
-
+#endif
 
 static void swrap_remove_stale(int fd)
 {
@@ -2829,7 +2830,9 @@ static int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen)
 	struct sockaddr_un un_addr;
 	struct socket_info *si = find_socket_info(s);
 	int bind_error = 0;
+#if 0 /* FIXME */
 	bool in_use;
+#endif
 
 	if (!si) {
 		return libc_bind(s, myaddr, addrlen);
@@ -2885,11 +2888,13 @@ static int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen)
 		return -1;
 	}
 
+#if 0 /* FIXME */
 	in_use = check_addr_port_in_use(myaddr, addrlen);
 	if (in_use) {
 		errno = EADDRINUSE;
 		return -1;
 	}
+#endif
 
 	free(si->myname);
 	si->myname_len = addrlen;
diff --git a/tests/test_echo_tcp_bind.c b/tests/test_echo_tcp_bind.c
index d42679a..c159206 100644
--- a/tests/test_echo_tcp_bind.c
+++ b/tests/test_echo_tcp_bind.c
@@ -154,6 +154,7 @@ static void test_bind_ipv4(void **state)
 	close(s);
 }
 
+#if 0 /* TODO */
 static void test_bind_ipv4_addr_in_use(void **state)
 {
 	struct sockaddr_in sin, sin2;
@@ -307,6 +308,7 @@ static void test_bind_ipv4_addr_in_use(void **state)
 
 	close(s);
 }
+#endif
 
 #ifdef HAVE_BINDRESVPORT
 static void test_bindresvport_ipv4(void **state)
@@ -469,9 +471,11 @@ int main(void) {
 		unit_test_setup_teardown(test_bind_ipv4,
 					 setup_echo_srv_tcp_ipv4,
 					 teardown),
+#if 0 /* TODO */
 		unit_test_setup_teardown(test_bind_ipv4_addr_in_use,
 					 setup_echo_srv_tcp_ipv4,
 					 teardown),
+#endif
 #ifdef HAVE_BINDRESVPORT
 		unit_test_setup_teardown(test_bindresvport_ipv4,
 					 setup_echo_srv_tcp_ipv4,


-- 
Socket Wrapper Repository