Skip to content

Commit 196f3c3

Browse files
committed
cf-socket: restore Curl_sock_assign_addr()
Regression since it was not private. Also used by msh3.c Follow-up to 8e85764 Reported-by: Gisle Vanem Fixes curl#11202 Closes curl#11204
1 parent 3df6693 commit 196f3c3

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

lib/cf-socket.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ tcpkeepalive(struct Curl_easy *data,
216216
* Assign the address `ai` to the Curl_sockaddr_ex `dest` and
217217
* set the transport used.
218218
*/
219-
static void sock_assign_addr(struct Curl_sockaddr_ex *dest,
220-
const struct Curl_addrinfo *ai,
221-
int transport)
219+
void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
220+
const struct Curl_addrinfo *ai,
221+
int transport)
222222
{
223223
/*
224224
* The Curl_sockaddr_ex structure is basically libcurl's external API
@@ -310,7 +310,7 @@ CURLcode Curl_socket_open(struct Curl_easy *data,
310310
/* if the caller doesn't want info back, use a local temp copy */
311311
addr = &dummy;
312312

313-
sock_assign_addr(addr, ai, transport);
313+
Curl_sock_assign_addr(addr, ai, transport);
314314
return socket_open(data, addr, sockfd);
315315
}
316316

@@ -788,7 +788,7 @@ static void cf_socket_ctx_init(struct cf_socket_ctx *ctx,
788788
memset(ctx, 0, sizeof(*ctx));
789789
ctx->sock = CURL_SOCKET_BAD;
790790
ctx->transport = transport;
791-
sock_assign_addr(&ctx->addr, ai, transport);
791+
Curl_sock_assign_addr(&ctx->addr, ai, transport);
792792
Curl_bufq_init(&ctx->recvbuf, NW_RECV_CHUNK_SIZE, NW_RECV_CHUNKS);
793793
}
794794

lib/cf-socket.h

+7
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@ void Curl_sndbufset(curl_socket_t sockfd);
102102
#define Curl_sndbufset(y) Curl_nop_stmt
103103
#endif
104104

105+
/**
106+
* Assign the address `ai` to the Curl_sockaddr_ex `dest` and
107+
* set the transport used.
108+
*/
109+
void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
110+
const struct Curl_addrinfo *ai,
111+
int transport);
105112

106113
/**
107114
* Creates a cfilter that opens a TCP socket to the given address

0 commit comments

Comments
 (0)