romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 19:53:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

cf-socket: make set_local_ip void, and remove failf()

Browse source 
No callers of this function checked the return code, meaning failures
are not lethal == using failf was wrong, and it can just as well return
void.

Closes #19137
This commit is contained in:
Daniel Stenberg 2025-10-19 11:38:30 +02:00
parent d2af9c9a08
commit 1876ed6296
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/cf-socket.c
View file

@ -1042,10 +1042,12 @@ static void cf_socket_destroy(struct Curl_cfilter *cf, struct Curl_easy *data)
cf->ctx = NULL;
}
static CURLcode set_local_ip(struct Curl_cfilter *cf,
struct Curl_easy *data)
static void set_local_ip(struct Curl_cfilter *cf,
struct Curl_easy *data)
{
struct cf_socket_ctx *ctx = cf->ctx;
ctx->ip.local_ip[0] = 0;
ctx->ip.local_port = -1;
#ifdef HAVE_GETSOCKNAME
if((ctx->sock != CURL_SOCKET_BAD) &&
@ -1059,23 +1061,18 @@ static CURLcode set_local_ip(struct Curl_cfilter *cf,
memset(&ssloc, 0, sizeof(ssloc));
if(getsockname(ctx->sock, (struct sockaddr*) &ssloc, &slen)) {
int error = SOCKERRNO;
failf(data, "getsockname() failed with errno %d: %s",
infof(data, "getsockname() failed with errno %d: %s",
error, curlx_strerror(error, buffer, sizeof(buffer)));
return CURLE_FAILED_INIT;
}
if(!Curl_addr2string((struct sockaddr*)&ssloc, slen,
ctx->ip.local_ip, &ctx->ip.local_port)) {
failf(data, "ssloc inet_ntop() failed with errno %d: %s",
else if(!Curl_addr2string((struct sockaddr*)&ssloc, slen,
ctx->ip.local_ip, &ctx->ip.local_port)) {
infof(data, "ssloc inet_ntop() failed with errno %d: %s",
errno, curlx_strerror(errno, buffer, sizeof(buffer)));
return CURLE_FAILED_INIT;
}
}
#else
(void)data;
ctx->ip.local_ip[0] = 0;
ctx->ip.local_port = -1;
#endif
return CURLE_OK;
}
static CURLcode set_remote_ip(struct Curl_cfilter *cf,