luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cf-socket: restore Curl_sock_assign_addr()

Browse Source 
Regression since it was not private. Also used by msh3.c

Follow-up to 8e85764b7b
Reported-by: Gisle Vanem
Fixes #11202
Closes #11204
This commit is contained in:
Daniel Stenberg 2023-05-25 11:03:56 +02:00
parent 3df6693787
commit 196f3c3484
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cf-socket.c
View File

@ -216,9 +216,9 @@ tcpkeepalive(struct Curl_easy *data,
* Assign the address `ai` to the Curl_sockaddr_ex `dest` and * Assign the address `ai` to the Curl_sockaddr_ex `dest` and
* set the transport used. * set the transport used.
*/ */
static void sock_assign_addr(struct Curl_sockaddr_ex *dest, void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
const struct Curl_addrinfo *ai, const struct Curl_addrinfo *ai,
int transport) int transport)
{ {
/* /*
* The Curl_sockaddr_ex structure is basically libcurl's external API * The Curl_sockaddr_ex structure is basically libcurl's external API
@ -310,7 +310,7 @@ CURLcode Curl_socket_open(struct Curl_easy *data,
/* if the caller doesn't want info back, use a local temp copy */ /* if the caller doesn't want info back, use a local temp copy */
addr = &dummy; addr = &dummy;
sock_assign_addr(addr, ai, transport); Curl_sock_assign_addr(addr, ai, transport);
return socket_open(data, addr, sockfd); return socket_open(data, addr, sockfd);
} }
@ -788,7 +788,7 @@ static void cf_socket_ctx_init(struct cf_socket_ctx *ctx,
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
ctx->sock = CURL_SOCKET_BAD; ctx->sock = CURL_SOCKET_BAD;
ctx->transport = transport; ctx->transport = transport;
sock_assign_addr(&ctx->addr, ai, transport); Curl_sock_assign_addr(&ctx->addr, ai, transport);
Curl_bufq_init(&ctx->recvbuf, NW_RECV_CHUNK_SIZE, NW_RECV_CHUNKS); Curl_bufq_init(&ctx->recvbuf, NW_RECV_CHUNK_SIZE, NW_RECV_CHUNKS);
} }

7
lib/cf-socket.h
View File

@ -102,6 +102,13 @@ void Curl_sndbufset(curl_socket_t sockfd);
#define Curl_sndbufset(y) Curl_nop_stmt #define Curl_sndbufset(y) Curl_nop_stmt
#endif #endif
/**
* Assign the address `ai` to the Curl_sockaddr_ex `dest` and
* set the transport used.
*/
void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
const struct Curl_addrinfo *ai,
int transport);
/** /**
* Creates a cfilter that opens a TCP socket to the given address * Creates a cfilter that opens a TCP socket to the given address