From f65dd8e0969d6c43913da51b585437c7f8447cac Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 9 Feb 2018 06:09:26 +0100
Subject: allow passing pf instead of just v6 flag to listen socket creation

---
 src/lib/mhd_sockets.c | 19 +++++--------------
 src/lib/mhd_sockets.h |  4 ++--
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/lib/mhd_sockets.c b/src/lib/mhd_sockets.c
index ddcc1f25..356d288f 100644
--- a/src/lib/mhd_sockets.c
+++ b/src/lib/mhd_sockets.c
@@ -464,31 +464,22 @@ MHD_socket_noninheritable_ (MHD_socket sock)
 /**
  * Create a listen socket, with noninheritable flag if possible.
  *
- * @param use_ipv6 if set to non-zero IPv6 is used
+ * @param pf protocol family to use
  * @return created socket or MHD_INVALID_SOCKET in case of errors
  */
 MHD_socket
-MHD_socket_create_listen_ (bool use_ipv6)
+MHD_socket_create_listen_ (int pf)
 {
-  int domain;
   MHD_socket fd;
   int cloexec_set;
 
-#ifdef HAVE_INET6
-  domain = (use_ipv6) ? PF_INET6 : PF_INET;
-#else  /* ! HAVE_INET6 */
-  if (use_ipv6)
-    return MHD_INVALID_SOCKET;
-  domain = PF_INET;
-#endif /* ! HAVE_INET6 */
-
 #if defined(MHD_POSIX_SOCKETS) && defined(SOCK_CLOEXEC)
-  fd = socket (domain,
+  fd = socket (pf,
                SOCK_STREAM | SOCK_CLOEXEC,
                0);
   cloexec_set = !0;
 #elif defined(MHD_WINSOCK_SOCKETS) && defined (WSA_FLAG_NO_HANDLE_INHERIT)
-  fd = WSASocketW (domain,
+  fd = WSASocketW (pf,
                    SOCK_STREAM,
                    0,
                    NULL,
@@ -500,7 +491,7 @@ MHD_socket_create_listen_ (bool use_ipv6)
 #endif /* !SOCK_CLOEXEC */
   if (MHD_INVALID_SOCKET == fd)
     {
-      fd = socket (domain,
+      fd = socket (pf,
                    SOCK_STREAM,
                    0);
       cloexec_set = 0;
diff --git a/src/lib/mhd_sockets.h b/src/lib/mhd_sockets.h
index c999ea35..9be34144 100644
--- a/src/lib/mhd_sockets.h
+++ b/src/lib/mhd_sockets.h
@@ -751,10 +751,10 @@ MHD_socket_noninheritable_ (MHD_socket sock);
 /**
  * Create a listen socket, with noninheritable flag if possible.
  *
- * @param use_ipv6 if set to non-zero IPv6 is used
+ * @param pf protocol family to use
  * @return created socket or MHD_INVALID_SOCKET in case of errors
  */
 MHD_socket
-MHD_socket_create_listen_ (bool use_ipv6);
+MHD_socket_create_listen_ (int pf);
 
 #endif /* ! MHD_SOCKETS_H */
-- 
cgit v1.2.3