2009-04-15 Marcus Brinkmann <marcus@g10code.de>

	* posix-io.c (_gpgme_io_socket, _gpgme_io_connect): New functions.
	* w32-io.c (_gpgme_io_connect): Fix stupid error.

diff --git a/trunk/src/ChangeLog b/trunk/src/ChangeLog
index 3a570f5a62f7f232f4c98675164553ad0b9234a9..1dcdb21890268a081c863599efdef35d8a9f92c6 100644 (file)
--- a/trunk/src/ChangeLog
+++ b/trunk/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-15  Marcus Brinkmann  <marcus@g10code.de>
+
+       * posix-io.c (_gpgme_io_socket, _gpgme_io_connect): New functions.
+       * w32-io.c (_gpgme_io_connect): Fix stupid error.
+
 2009-04-08  Marcus Brinkmann  <marcus@g10code.de>
 
        * w32-glib-io.c (giochannel_table): New members used, fd, socket.

diff --git a/trunk/src/posix-io.c b/trunk/src/posix-io.c
index a7047bd280a4a9e73e4258833ff6560a0edeb8cf..c85255e758693a020c6ec75132c45ac7f81849f6 100644 (file)
--- a/trunk/src/posix-io.c
+++ b/trunk/src/posix-io.c
@@ -653,3 +653,31 @@ _gpgme_io_dup (int fd)
 
   return new_fd;
 }
+
+\f
+int
+_gpgme_io_socket (int domain, int type, int proto)
+{
+  int res;
+
+  TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_socket", domain,
+             "type=%i, proto=%i", type, proto);
+
+  res = socket (domain, type, proto);
+
+  return TRACE_SYSRES (res);
+}
+
+
+int
+_gpgme_io_connect (int fd, struct sockaddr *addr, int addrlen)
+{
+  int res;
+
+  TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_connect", fd,
+             "addr=%p, addrlen=%i", addr, addrlen);
+
+  res = ath_connect (fd, addr, addrlen);
+
+  return TRACE_SYSRES (res);
+}

diff --git a/trunk/src/w32-io.c b/trunk/src/w32-io.c
index 1a65e537db695cd74c846a1f71339b0ebfa89c9c..69d8a398983189b0a0ad3b290f7e3f73939ee2f8 100644 (file)
--- a/trunk/src/w32-io.c
+++ b/trunk/src/w32-io.c
@@ -1514,13 +1514,12 @@ _gpgme_io_socket (int domain, int type, int proto)
 int
 _gpgme_io_connect (int fd, struct sockaddr *addr, int addrlen)
 {
-  int sockfd;
   int res;
 
   TRACE_BEG2 (DEBUG_SYSIO, "_gpgme_io_connect", fd,
              "addr=%p, addrlen=%i", addr, addrlen);
 
-  res = connect (sockfd, addr, addrlen);
+  res = connect (fd, addr, addrlen);
   if (!res)
     {
       errno = wsa2errno (WSAGetLastError ());