aboutsummaryrefslogtreecommitdiffstats
path: root/src/assuan-support.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2011-02-03 19:51:36 +0000
committerWerner Koch <[email protected]>2011-02-03 19:51:36 +0000
commitb001a8df68c8eb33abbe879f6c7fb4db4909b6f6 (patch)
tree800d5a8dba5aeaf953c50ede3c10669b8ef48cf2 /src/assuan-support.c
parentAdd support for non-API GnuPG status codes. (diff)
parentFix socket implementation on Windows. (diff)
downloadgpgme-b001a8df68c8eb33abbe879f6c7fb4db4909b6f6.tar.gz
gpgme-b001a8df68c8eb33abbe879f6c7fb4db4909b6f6.zip
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpgme
Diffstat (limited to 'src/assuan-support.c')
-rw-r--r--src/assuan-support.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/assuan-support.c b/src/assuan-support.c
index f49ab32b..52643467 100644
--- a/src/assuan-support.c
+++ b/src/assuan-support.c
@@ -222,6 +222,21 @@ my_socketpair (assuan_context_t ctx, int namespace, int style,
}
+static int
+my_socket (assuan_context_t ctx, int namespace, int style, int protocol)
+{
+ return _gpgme_io_socket (namespace, style, protocol);
+}
+
+
+static int
+my_connect (assuan_context_t ctx, int sock, struct sockaddr *addr,
+ socklen_t length)
+{
+ return _gpgme_io_connect (sock, addr, length);
+}
+
+
struct assuan_system_hooks _gpgme_assuan_system_hooks =
{
ASSUAN_SYSTEM_HOOKS_VERSION,
@@ -234,6 +249,8 @@ struct assuan_system_hooks _gpgme_assuan_system_hooks =
my_sendmsg,
my_spawn,
my_waitpid,
- my_socketpair
+ my_socketpair,
+ my_socket,
+ my_connect
};