a6971ce90a — curl

Subject

connect: turn conn_get_first_origin into static

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/connect.c +15 -13 lib/connect.h +0 -5

lib/connect.c+15 -13

@@ -446,6 +446,20 @@ static CURLcode cf_setup_add_http_proxy(struct Curl_cfilter *cf,
	#endif /* !CURL_DISABLE_HTTP */
	#endif /* CURL_DISABLE_PROXY */

+	/* Get the origin curl connects its socket to.
+	* Can be origin or the first proxy. */
+	static struct Curl_peer conn_get_first_origin(struct connectdata conn,
+	int sockindex)
+	{
+	#ifndef CURL_DISABLE_PROXY
+	if(conn->socks_proxy.peer)
+	return conn->socks_proxy.peer;
+	if(conn->http_proxy.peer)
+	return conn->http_proxy.peer;
+	#endif
+	return (sockindex == SECONDARYSOCKET) ? conn->origin2 : conn->origin;
+	}
+
	static CURLcode cf_setup_add_ip_happy(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
@@ -457,7 +471,7 @@ static CURLcode cf_setup_add_ip_happy(struct Curl_cfilter *cf,
	* do we use for it? Only on the first hop we can do Happy Eyeballs.
	* first_origin and first_peer differ on --connect-to. */
	struct Curl_peer *first_origin =
-	Curl_conn_get_first_origin(cf->conn, cf->sockindex);
+	conn_get_first_origin(cf->conn, cf->sockindex);
	struct Curl_peer *first_peer =
	Curl_conn_get_first_peer(cf->conn, cf->sockindex);
	struct Curl_peer *tunnel_peer = NULL;
@@ -818,18 +832,6 @@ struct Curl_peer Curl_conn_get_destination(struct connectdata conn,
	(conn->via_peer ? conn->via_peer : conn->origin);
	}

-	struct Curl_peer Curl_conn_get_first_origin(struct connectdata conn,
-	int sockindex)
-	{
-	#ifndef CURL_DISABLE_PROXY
-	if(conn->socks_proxy.peer)
-	return conn->socks_proxy.peer;
-	if(conn->http_proxy.peer)
-	return conn->http_proxy.peer;
-	#endif
-	return (sockindex == SECONDARYSOCKET) ? conn->origin2 : conn->origin;
-	}
-
	struct Curl_peer Curl_conn_get_first_peer(struct connectdata conn,
	int sockindex)
	{

lib/connect.h+0 -5

@@ -136,11 +136,6 @@ struct Curl_peer Curl_conn_get_origin(struct connectdata conn,
	struct Curl_peer Curl_conn_get_destination(struct connectdata conn,
	int sockindex);

-	/* Get the origin curl connects its socket to.
-	* Can be origin or the first proxy. */
-	struct Curl_peer Curl_conn_get_first_origin(struct connectdata conn,
-	int sockindex);
-
	/* Get the peer curl connects its socket to.
	* Can be origin, "connect-to" or the first proxy. */
	struct Curl_peer Curl_conn_get_first_peer(struct connectdata conn,