mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-24 14:15:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

tool_operate: more defensive socket code

Browse Source 
- use 'struct sockaddr' to getsockname() and its sa_family member

- use 'curl_socklen_t' instead of 'socklen_t'

- check for AF_INET6 to exist instead assuming it does

Should be generally more portable.

Reported-by: Harry Sintonen
Closes #14304
This commit is contained in:
Daniel Stenberg 2024-07-29 19:49:32 +02:00
parent c879554b7d
commit abdf612221
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tool_operate.c
View File

@ -154,14 +154,10 @@ static bool is_pkcs11_uri(const char *string)
#ifdef IP_TOS
static int get_address_family(curl_socket_t sockfd)
{
struct sockaddr_storage addr;
socklen_t addrlen = sizeof(addr);
struct sockaddr addr;
curl_socklen_t addrlen = sizeof(addr);
if(getsockname(sockfd, (struct sockaddr *)&addr, &addrlen) == 0)
# ifdef __TANDEM
return addr.__ss_family;
# else
return addr.ss_family;
# endif
return addr.sa_family;
return AF_UNSPEC;
}
#endif
@ -185,12 +181,12 @@ static int sockopt_callback(void *clientp, curl_socket_t curlfd,
result = setsockopt(curlfd, SOL_IP, IP_TOS, (void *)&tos, sizeof(tos));
#endif
break;
#if defined(IPV6_TCLASS) && defined(AF_INET6)
case AF_INET6:
#ifdef IPV6_TCLASS
result = setsockopt(curlfd, IPPROTO_IPV6, IPV6_TCLASS,
(void *)&tos, sizeof(tos));
#endif
break;
#endif
}
if(result < 0) {
int error = errno;