mirror of
https://github.com/curl/curl.git
synced 2026-05-16 08:56:22 +03:00
8537a5b0bc
Disable these winsock2 functions on Windows to use the curl wrappers and preserve `WSAGetLastError()` aka `SOCKERRNO` error codes. curl sources uses `inet_pton()` and `inet_ntop()` via its own `Curl_` prefixed wrappers. These wrappers promise to not overwrite `WSAGetLastError()` aka `SOCKERRNO` error codes when calling them. But, for Windows builds with these built-in winsock2 functions detected (meaning all supported Windows versions, except Windows CE), the wrappers were 1-to-1 mapped to the winsock2 functions, which broke this promise.b06c12b724/lib/inet_ntop.c (L188-L190)b06c12b724/lib/inet_pton.c (L66-L70)These promises are old (a1d5983991) and may not be valid anymore. In this case, the callers would have to be updated to use `SOCKERRNO` to retrieve any error, instead of using `errno` as they do now. https://learn.microsoft.com/windows/win32/api/ws2tcpip/nf-ws2tcpip-inet_ntop https://learn.microsoft.com/windows/win32/api/ws2tcpip/nf-ws2tcpip-inet_pton Closes #16577
51 lines
1.7 KiB
C
51 lines
1.7 KiB
C
#ifndef HEADER_CURL_INET_NTOP_H
|
|
#define HEADER_CURL_INET_NTOP_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
|
|
|
|
#ifdef HAVE_INET_NTOP
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
#include <sys/socket.h>
|
|
#endif
|
|
#ifdef HAVE_ARPA_INET_H
|
|
#include <arpa/inet.h>
|
|
#endif
|
|
#ifdef __AMIGA__
|
|
#define Curl_inet_ntop(af,addr,buf,size) \
|
|
(char *)inet_ntop(af, (void *)addr, (unsigned char *)buf, \
|
|
(curl_socklen_t)(size))
|
|
#else
|
|
#define Curl_inet_ntop(af,addr,buf,size) \
|
|
inet_ntop(af, addr, buf, (curl_socklen_t)(size))
|
|
#endif
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_INET_NTOP_H */
|