[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 05/10: MHD_start_daemon(): fixed port detec
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 05/10: MHD_start_daemon(): fixed port detection on some platforms, avoid re-use variable names. |
Date: |
Tue, 21 May 2019 21:29:09 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 240604a333229d672f97682c4547cc67b5732bac
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Tue May 21 20:56:53 2019 +0300
MHD_start_daemon(): fixed port detection on some platforms,
avoid re-use variable names.
---
src/microhttpd/daemon.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index fef1f8b3..57f59a57 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6029,14 +6029,17 @@ MHD_start_daemon_va (unsigned int flags,
if ( (0 == daemon->port) &&
(0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) )
{ /* Get port number. */
- struct sockaddr_storage servaddr;
+ struct sockaddr_storage bindaddr;
- memset (&servaddr,
+ memset (&bindaddr,
0,
sizeof (struct sockaddr_storage));
- addrlen = sizeof (servaddr);
+ addrlen = sizeof (struct sockaddr_storage);
+#ifdef HAVE_SOCKADDR_IN_SIN_LEN
+ bindaddr.sin_len = addrlen;
+#endif
if (0 != getsockname (listen_fd,
- (struct sockaddr *) &servaddr,
+ (struct sockaddr *) &bindaddr,
&addrlen))
{
#ifdef HAVE_MESSAGES
@@ -6046,7 +6049,7 @@ MHD_start_daemon_va (unsigned int flags,
#endif /* HAVE_MESSAGES */
}
#ifdef MHD_POSIX_SOCKETS
- else if (sizeof (servaddr) < addrlen)
+ else if (sizeof (bindaddr) < addrlen)
{
/* should be impossible with `struct sockaddr_storage` */
#ifdef HAVE_MESSAGES
@@ -6057,11 +6060,11 @@ MHD_start_daemon_va (unsigned int flags,
#endif /* MHD_POSIX_SOCKETS */
else
{
- switch (servaddr.ss_family)
+ switch (bindaddr.ss_family)
{
case AF_INET:
{
- struct sockaddr_in *s4 = (struct sockaddr_in *) &servaddr;
+ struct sockaddr_in *s4 = (struct sockaddr_in *) &bindaddr;
daemon->port = ntohs (s4->sin_port);
break;
@@ -6069,7 +6072,7 @@ MHD_start_daemon_va (unsigned int flags,
#ifdef HAVE_INET6
case AF_INET6:
{
- struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) &servaddr;
+ struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) &bindaddr;
daemon->port = ntohs(s6->sin6_port);
mhd_assert (0 != (*pflags & MHD_USE_IPv6));
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [libmicrohttpd] branch master updated (d5d03f11 -> 9da5831c), gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 03/10: Removed unused macro, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 04/10: Fixed compiler warning, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 02/10: Avoid dropping 'const' qualifier in macros, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 06/10: Check TLS strings lengths, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 05/10: MHD_start_daemon(): fixed port detection on some platforms, avoid re-use variable names.,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 01/10: Fixed doxygen comments, Fixed spelling in comments, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 07/10: Removed extra ';', gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 08/10: MHD_set_connection_value_n_nocheck_() mark as static function, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 09/10: MHD_start_daemon(): report if TCP_FASTOPEN is used on supported platform, gnunet, 2019/05/21
- [GNUnet-SVN] [libmicrohttpd] 10/10: ChangeLog updated, gnunet, 2019/05/21