Reroute all socket and connect through the nonce implemenation in assuan-socket.c.

2011-02-03  Marcus Brinkmann  <[email protected]>

        * assuan-socket.c (_assuan_sock_new): Call _assuan_socket instead
        of socket.
        (_assuan_sock_connect):	Call _assuan_connect instead of connect.
        * assuan-socket-connect.c (assuan_socket_connect): Call
        _assuan_sock_new and _assuan_sock_connect instead of
        _assuan_socket and assuan_connect.
        * src/system-w32.c, src/system-w32ce.c (__assuan_socket): Call
        socket instead of _assuan_sock_new.
        (__assuan_connect): Call connect instead of _assuan_sock_connect.

5 files changed, 45 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 80ef2a0..46bbe1f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-03  Marcus Brinkmann  <[email protected]>
+
+	* assuan-socket.c (_assuan_sock_new): Call _assuan_socket instead
+	of socket.
+	(_assuan_sock_connect): Call _assuan_connect instead of connect.
+	* assuan-socket-connect.c (assuan_socket_connect): Call
+	_assuan_sock_new and _assuan_sock_connect instead of
+	_assuan_socket and assuan_connect.
+	* src/system-w32.c, src/system-w32ce.c (__assuan_socket): Call
+	socket instead of _assuan_sock_new.
+	(__assuan_connect): Call connect instead of _assuan_sock_connect.
+
 2011-02-02  Marcus Brinkmann  <[email protected]>
 
 	* assuan.h.in: Replace namespace by _namespace.
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 609813d..fa3db4b 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -251,7 +251,7 @@ assuan_socket_connect (assuan_context_t ctx, const char *name,
         return err;
     }
   
-  fd = _assuan_socket (ctx, pf, SOCK_STREAM, 0);
+  fd = _assuan_sock_new (ctx, pf, SOCK_STREAM, 0);
   if (fd == ASSUAN_INVALID_FD)
     {
       err = _assuan_error (ctx, gpg_err_code_from_syserror ());
@@ -260,7 +260,7 @@ assuan_socket_connect (assuan_context_t ctx, const char *name,
       return err;
     }
 
-  if (_assuan_connect (ctx, fd, srvr_addr, len) == -1)
+  if (_assuan_sock_connect (ctx, fd, srvr_addr, len) == -1)
     {
       TRACE2 (ctx, ASSUAN_LOG_SYSIO, "assuan_socket_connect", ctx,
 	      "can't connect to `%s': %s\n", name, strerror (errno));
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index aa27257..7eba6b4 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -245,12 +245,10 @@ _assuan_sock_new (assuan_context_t ctx, int domain, int type, int proto)
   assuan_fd_t res;
   if (domain == AF_UNIX || domain == AF_LOCAL)
     domain = AF_INET;
-  res = SOCKET2HANDLE(socket (domain, type, proto));
-  if (res == ASSUAN_INVALID_FD)
-    gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+  res = SOCKET2HANDLE(_assuan_socket (ctx, domain, type, proto));
   return res;
 #else
-  return socket (domain, type, proto);
+  return _assuan_socket (ctx, domain, type, proto);
 #endif
 }
 
@@ -281,8 +279,8 @@ _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd,
       unaddr->sun_port = myaddr.sin_port;
       unaddr->sun_addr.s_addr = myaddr.sin_addr.s_addr;
   
-      ret = connect (HANDLE2SOCKET(sockfd), 
-                     (struct sockaddr *)&myaddr, sizeof myaddr);
+      ret = _assuan_connect (ctx, HANDLE2SOCKET(sockfd), 
+			    (struct sockaddr *)&myaddr, sizeof myaddr);
       if (!ret)
         {
           /* Send the nonce. */
@@ -298,13 +296,11 @@ _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd,
   else
     {
       int res;
-      res = connect (HANDLE2SOCKET (sockfd), addr, addrlen);
-      if (res < 0)
-	gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+      res = _assuan_connect (ctx, HANDLE2SOCKET (sockfd), addr, addrlen);
       return res;
     }      
 #else
-  return connect (sockfd, addr, addrlen);
+  return _assuan_connect (ctx, sockfd, addr, addrlen);
 #endif
 }
 
diff --git a/src/system-w32.c b/src/system-w32.c
index 539d34e..9753f71 100644
--- a/src/system-w32.c
+++ b/src/system-w32.c
@@ -516,9 +516,14 @@ __assuan_socketpair (assuan_context_t ctx, int namespace, int style,
 
 
 int
-__assuan_socket (assuan_context_t ctx, int namespace, int style, int protocol)
+__assuan_socket (assuan_context_t ctx, int domain, int type, int proto)
 {
-  return _assuan_sock_new (ctx, namespace, style, protocol);
+  int res;
+
+  res = socket (domain, type, proto);
+  if (res == -1)
+    gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+  return res;
 }
 
 
@@ -526,7 +531,12 @@ int
 __assuan_connect (assuan_context_t ctx, int sock, struct sockaddr *addr,
 		  socklen_t length)
 {
-  return _assuan_sock_connect (ctx, sock, addr, length);
+  int res;
+
+  res = connect (sock, addr, length);
+  if (res < 0)
+    gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+  return res;
 }
 
 
diff --git a/src/system-w32ce.c b/src/system-w32ce.c
index da660ea..1718bb7 100644
--- a/src/system-w32ce.c
+++ b/src/system-w32ce.c
@@ -663,7 +663,12 @@ __assuan_socketpair (assuan_context_t ctx, int namespace, int style,
 int
 __assuan_socket (assuan_context_t ctx, int namespace, int style, int protocol)
 {
-  return _assuan_sock_new (ctx, namespace, style, protocol);
+  int res;
+
+  res = socket (domain, type, proto);
+  if (res == -1)
+    gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+  return res;
 }
 
 
@@ -671,7 +676,12 @@ int
 __assuan_connect (assuan_context_t ctx, int sock, struct sockaddr *addr,
 		  socklen_t length)
 {
-  return _assuan_sock_connect (ctx, sock, addr, length);
+  int res;
+
+  res = connect (sock, addr, length);
+  if (res < 0)
+    gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+  return res;
 }