[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 17/63: config-win32: add support for if_nametoindex
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 17/63: config-win32: add support for if_nametoindex and getsockname |
Date: |
Fri, 07 Jun 2019 18:36:39 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 170bd047f5f73ffa914ff21205018966f31e09c0
Author: Zenju <address@hidden>
AuthorDate: Wed May 22 11:11:36 2019 +0200
config-win32: add support for if_nametoindex and getsockname
Closes https://github.com/curl/curl/pull/3923
---
lib/config-win32.h | 18 ++++++++++++++++--
lib/url.c | 4 +++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 24c35d339..08cfd0d4c 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -154,6 +154,11 @@
#define HAVE_WS2TCPIP_H 1
#endif
+/* Define if you have the <Iphlpapi.h> header file. */
+#ifndef __SALFORDC__
+#define HAVE_IPHLPAPI_H 1
+#endif
+
/* ---------------------------------------------------------------- */
/* OTHER HEADER INFO */
/* ---------------------------------------------------------------- */
@@ -188,6 +193,9 @@
/* Define to 1 if you have the `getpeername' function. */
#define HAVE_GETPEERNAME 1
+/* Define to 1 if you have the getsockname function. */
+#define HAVE_GETSOCKNAME 1
+
/* Define if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1
@@ -582,8 +590,9 @@ Vista
# endif
#endif
-/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is
- quite convoluted, compiler dependent and even build target dependent. */
+/* Availability of freeaddrinfo, getaddrinfo, getnameinfo and if_nametoindex
+ functions is quite convoluted, compiler dependent and even build target
+ dependent. */
#if defined(HAVE_WS2TCPIP_H)
# if defined(__POCC__)
# define HAVE_FREEADDRINFO 1
@@ -602,6 +611,11 @@ Vista
# define HAVE_GETNAMEINFO 1
# endif
#endif
+#if defined(HAVE_IPHLPAPI_H)
+ #if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
+ #define HAVE_IF_NAMETOINDEX 1
+ #endif
+#endif
#if defined(__POCC__)
# ifndef _MSC_VER
diff --git a/lib/url.c b/lib/url.c
index db76fa656..b5169485f 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -34,10 +34,12 @@
#ifdef HAVE_NET_IF_H
#include <net/if.h>
#endif
+#ifdef HAVE_IPHLPAPI_H
+#include <Iphlpapi.h>
+#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
-
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [gnurl] 05/63: examples: reduce variable scopes, (continued)
- [GNUnet-SVN] [gnurl] 05/63: examples: reduce variable scopes, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 11/63: sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 10/63: tests: add support to test against OpenSSH for Windows, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 08/63: examples: fix "clarify calculation precedence" warnings, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 02/63: configure/cmake: check for if_nametoindex(), gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 13/63: examples: Added SASL PLAIN authorisation identity (authzid) examples, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 09/63: bump: start on the next release, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 15/63: url: fix bad #ifdef, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 14/63: Revert "progress: CURL_DISABLE_PROGRESS_METER", gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 23/63: winbuild: Use two space indentation, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 17/63: config-win32: add support for if_nametoindex and getsockname,
gnunet <=
- [GNUnet-SVN] [gnurl] 22/63: tool_parse_cfg: Avoid 2 fopen() for WIN32, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 39/63: parse_proxy: make sure portptr is initialized, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 29/63: Revert all SASL authzid (new feature) commits, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 21/63: md4: include the mbedtls config.h to get the MD4 info, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 07/63: hiperfifo: remove unused variable, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 12/63: curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 25/63: Fix typo., gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 37/63: conncache: make "bundles" per host name when doing proxy tunnels, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 35/63: curl-win32.h: Enable Unix Domain Sockets based on the Windows SDK version, gnunet, 2019/06/07
- [GNUnet-SVN] [gnurl] 42/63: appveyor: add support for other build systems, gnunet, 2019/06/07