Add assuan_sock_accept function.

* src/assuan-socket.c (_assuan_sock_accept): New.
(assuan_sock_accept): New.
* src/assuan.h.in (assuan_sock_accept): New.

--

GnuPG-bug-id: 5925
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

3 files changed, 35 insertions, 0 deletions

diff --git a/doc/assuan.texi b/doc/assuan.texi
index 2e0d5c7..0a197c2 100644
--- a/doc/assuan.texi
+++ b/doc/assuan.texi
@@ -1972,6 +1972,14 @@ Wrapper for close which does a closesocket on Windows if needed.
 Wrapper around socket.
 @end deftypefun
 
+@deftypefun assuan_fd_t assuan_sock_accept (@w{assuan_fd_t @var{sockfd}}, @
+         @w{struct sockaddr *@var{addr}}, @
+         @w{socklen_t *@var{p_addrlen}})
+
+Wrapper around accept.
+@end deftypefun
+
+
 @deftypefun int assuan_sock_connect (@w{assuan_fd_t @var{sockfd}}, @
          @w{struct sockaddr *@var{addr}}, @
          @w{int @var{addrlen}})
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index 3fefc39..0588dc2 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -989,6 +989,24 @@ use_socks (struct sockaddr *addr)
 }
 
 
+static assuan_fd_t
+_assuan_sock_accept (assuan_context_t ctx, assuan_fd_t sockfd,
+                     struct sockaddr *addr, socklen_t *p_addrlen)
+{
+  (void)ctx;
+#ifdef HAVE_W32_SYSTEM
+  assuan_fd_t res;
+
+  res = SOCKET2HANDLE (accept (HANDLE2SOCKET (sockfd), addr, p_addrlen));
+  if (res == SOCKET2HANDLE (INVALID_SOCKET))
+    gpg_err_set_errno (_assuan_sock_wsa2errno (WSAGetLastError ()));
+  return res;
+#else
+  return accept (sockfd, addr, p_addrlen);
+#endif
+}
+
+
 int
 _assuan_sock_connect (assuan_context_t ctx, assuan_fd_t sockfd,
 		      struct sockaddr *addr, int addrlen)
@@ -1483,6 +1501,13 @@ assuan_sock_get_flag (assuan_fd_t sockfd, const char *name, int *r_value)
   return _assuan_sock_get_flag (sock_ctx, sockfd, name, r_value);
 }
 
+assuan_fd_t
+assuan_sock_accept (assuan_fd_t sockfd, struct sockaddr *addr,
+                    socklen_t *p_addrlen)
+{
+  return _assuan_sock_accept (sock_ctx, sockfd, addr, p_addrlen);
+}
+
 int
 assuan_sock_connect (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen)
 {
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 26b18e6..e993926 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -498,6 +498,8 @@ int assuan_sock_close (assuan_fd_t fd);
 assuan_fd_t assuan_sock_new (int domain, int type, int proto);
 int assuan_sock_set_flag (assuan_fd_t sockfd, const char *name, int value);
 int assuan_sock_get_flag (assuan_fd_t sockfd, const char *name, int *r_value);
+assuan_fd_t assuan_sock_accept (assuan_fd_t sockfd,
+                                struct sockaddr *addr, socklen_t *p_addrlen);
 int assuan_sock_connect (assuan_fd_t sockfd,
                          struct sockaddr *addr, int addrlen);
 assuan_fd_t assuan_sock_connect_byname (const char *host, unsigned short port,