[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 02/06: Correctly initialize IPv6 "any" addr
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 02/06: Correctly initialize IPv6 "any" address and non-standard IPv4 "any" address. |
Date: |
Thu, 15 Jun 2017 23:43:27 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit a03074c3f799f6c681719ddb09e669c44c52caf1
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Thu Jun 15 17:52:11 2017 +0300
Correctly initialize IPv6 "any" address and non-standard IPv4 "any" address.
---
src/microhttpd/daemon.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 17b46678..0bf97b7c 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5516,11 +5516,17 @@ MHD_start_daemon_va (unsigned int flags,
#if HAVE_INET6
if (0 != (*pflags & MHD_USE_IPv6))
{
- memset (&servaddr6,
+#ifdef IN6ADDR_ANY_INIT
+ static const struct in6_addr static_in6any = IN6ADDR_ANY_INIT;
+#endif
+ memset (&servaddr6,
0,
sizeof (struct sockaddr_in6));
servaddr6.sin6_family = AF_INET6;
servaddr6.sin6_port = htons (port);
+#ifdef IN6ADDR_ANY_INIT
+ servaddr6.sin6_addr = static_in6any;
+#endif
#if HAVE_SOCKADDR_IN_SIN_LEN
servaddr6.sin6_len = sizeof (struct sockaddr_in6);
#endif
@@ -5534,6 +5540,8 @@ MHD_start_daemon_va (unsigned int flags,
sizeof (struct sockaddr_in));
servaddr4.sin_family = AF_INET;
servaddr4.sin_port = htons (port);
+ if (0 != INADDR_ANY)
+ servaddr4.sin_addr.s_addr = htonl (INADDR_ANY);
#if HAVE_SOCKADDR_IN_SIN_LEN
servaddr4.sin_len = sizeof (struct sockaddr_in);
#endif
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [libmicrohttpd] branch master updated (8eb8e558 -> e8d937be), gnunet, 2017/06/15
- [GNUnet-SVN] [libmicrohttpd] 05/06: test_daemon: fixed error description, resource leak, gnunet, 2017/06/15
- [GNUnet-SVN] [libmicrohttpd] 01/06: Configure: removed unwanted extra square brackets, gnunet, 2017/06/15
- [GNUnet-SVN] [libmicrohttpd] 02/06: Correctly initialize IPv6 "any" address and non-standard IPv4 "any" address.,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 04/06: MHD_get_daemon_info(): return bind port number by MHD_DAEMON_INFO_BIND_PORT, gnunet, 2017/06/15
- [GNUnet-SVN] [libmicrohttpd] 03/06: MHD_start_daemon(): added port autodetection if '0' (autoselect) is used for port number, Added new MHD_FEATURE value MHD_FEATURE_AUTODETECT_BIND_PORT., gnunet, 2017/06/15
- [GNUnet-SVN] [libmicrohttpd] 06/06: Make testsuite parallel build compatible (part 1), gnunet, 2017/06/15