From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 25 May 2023 09:03:56 +0000 (+0200)
Subject: cf-socket: restore Curl_sock_assign_addr()
X-Git-Tag: curl-8_1_2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=196f3c3484ac5ae8ab30e5dabe7cd08b5ec2fe8d;p=thirdparty%2Fcurl.git

cf-socket: restore Curl_sock_assign_addr()

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

Follow-up to 8e85764b7bd7f05f5
Reported-by: Gisle Vanem
Fixes #11202
Closes #11204
---

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 51c12910a2..960979b025 100644
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -216,9 +216,9 @@ tcpkeepalive(struct Curl_easy *data,
  * Assign the address `ai` to the Curl_sockaddr_ex `dest` and
  * set the transport used.
  */
-static void sock_assign_addr(struct Curl_sockaddr_ex *dest,
-                             const struct Curl_addrinfo *ai,
-                             int transport)
+void Curl_sock_assign_addr(struct Curl_sockaddr_ex *dest,
+                           const struct Curl_addrinfo *ai,
+                           int transport)
 {
   /*
    * 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 */
     addr = &dummy;
 
-  sock_assign_addr(addr, ai, transport);
+  Curl_sock_assign_addr(addr, ai, transport);
   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));
   ctx->sock = CURL_SOCKET_BAD;
   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);
 }
 
diff --git a/lib/cf-socket.h b/lib/cf-socket.h
index 8fef641f7e..1d40df737f 100644
--- a/lib/cf-socket.h
+++ b/lib/cf-socket.h
@@ -102,6 +102,13 @@ void Curl_sndbufset(curl_socket_t sockfd);
 #define Curl_sndbufset(y) Curl_nop_stmt
 #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