cfilter: re-add `conn` as parameter to cfilter setup methods
- `Curl_ssl_get_config()` now returns the first config if no SSL proxy
filter is active
- socket filter starts connection only on first invocation of its
connect method
Fixes #9982
Closes #9983
diff --git a/lib/cfilters.c b/lib/cfilters.c
index fe7624e..2d04390 100644
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -226,20 +226,22 @@
return result;
}
-void Curl_conn_cf_add(struct Curl_easy *data, int index,
+void Curl_conn_cf_add(struct Curl_easy *data,
+ struct connectdata *conn,
+ int index,
struct Curl_cfilter *cf)
{
(void)data;
- DEBUGF(infof(data, DMSGI(data, index, "cf_add(filter=%s)"),
- cf->cft->name));
-
- DEBUGASSERT(data->conn);
+ DEBUGASSERT(conn);
DEBUGASSERT(!cf->conn);
DEBUGASSERT(!cf->next);
- cf->next = data->conn->cfilter[index];
- cf->conn = data->conn;
+
+ DEBUGF(infof(data, CMSGI(conn, index, "cf_add(filter=%s)"),
+ cf->cft->name));
+ cf->next = conn->cfilter[index];
+ cf->conn = conn;
cf->sockindex = index;
- data->conn->cfilter[index] = cf;
+ conn->cfilter[index] = cf;
}
void Curl_conn_cf_discard(struct Curl_cfilter *cf, struct Curl_easy *data)
@@ -260,11 +262,11 @@
}
CURLcode Curl_conn_setup(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex,
const struct Curl_dns_entry *remotehost,
int ssl_mode)
{
- struct connectdata *conn = data->conn;
struct Curl_cfilter *cf;
CURLcode result;
@@ -281,13 +283,13 @@
*/
if(!conn->cfilter[sockindex]) {
DEBUGF(infof(data, DMSGI(data, sockindex, "setup, init filter chain")));
- result = Curl_conn_socket_set(data, sockindex);
+ result = Curl_conn_socket_set(data, conn, sockindex);
if(result)
goto out;
#ifndef CURL_DISABLE_PROXY
if(conn->bits.socksproxy) {
- result = Curl_conn_socks_proxy_add(data, sockindex);
+ result = Curl_conn_socks_proxy_add(data, conn, sockindex);
if(result)
goto out;
}
@@ -295,7 +297,7 @@
if(conn->bits.httpproxy) {
#ifdef USE_SSL
if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {
- result = Curl_ssl_cfilter_proxy_add(data, sockindex);
+ result = Curl_ssl_cfilter_proxy_add(data, conn, sockindex);
if(result)
goto out;
}
@@ -303,7 +305,7 @@
#if !defined(CURL_DISABLE_HTTP)
if(conn->bits.tunnel_proxy) {
- result = Curl_conn_http_proxy_add(data, sockindex);
+ result = Curl_conn_http_proxy_add(data, conn, sockindex);
if(result)
goto out;
}
@@ -315,7 +317,7 @@
if(ssl_mode == CURL_CF_SSL_ENABLE
|| (ssl_mode != CURL_CF_SSL_DISABLE
&& conn->handler->flags & PROTOPT_SSL)) {
- result = Curl_ssl_cfilter_add(data, sockindex);
+ result = Curl_ssl_cfilter_add(data, conn, sockindex);
if(result)
goto out;
}
@@ -325,7 +327,7 @@
#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
if(data->set.haproxyprotocol) {
- result = Curl_conn_haproxy_add(data, sockindex);
+ result = Curl_conn_haproxy_add(data, conn, sockindex);
if(result)
goto out;
}
diff --git a/lib/cfilters.h b/lib/cfilters.h
index 7e87781..c339e46 100644
--- a/lib/cfilters.h
+++ b/lib/cfilters.h
@@ -180,6 +180,7 @@
* the start of the chain (top).
*/
void Curl_conn_cf_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex,
struct Curl_cfilter *cf);
@@ -208,6 +209,7 @@
* suitable filter chain.
*/
CURLcode Curl_conn_setup(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex,
const struct Curl_dns_entry *remotehost,
int ssl_mode);
diff --git a/lib/connect.c b/lib/connect.c
index eed3068..9ec664e 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1721,8 +1721,8 @@
const struct Curl_dns_entry *remotehost)
{
struct socket_cf_ctx *ctx = cf->ctx;
- bool done;
+ (void)data;
DEBUGASSERT(ctx);
if(ctx->remotehost != remotehost) {
if(ctx->remotehost) {
@@ -1730,10 +1730,9 @@
}
ctx->remotehost = remotehost;
}
- /* we start connecting right on setup */
DEBUGF(infof(data, CFMSG(cf, "setup(remotehost=%s)"),
cf->conn->hostname_resolve));
- return socket_cf_connect(cf, data, FALSE, &done);
+ return CURLE_OK;
}
static void socket_cf_close(struct Curl_cfilter *cf,
@@ -1828,6 +1827,7 @@
};
CURLcode Curl_conn_socket_set(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex)
{
CURLcode result;
@@ -1835,7 +1835,8 @@
struct socket_cf_ctx *scf_ctx = NULL;
/* Need to be first */
- DEBUGASSERT(!data->conn->cfilter[sockindex]);
+ DEBUGASSERT(conn);
+ DEBUGASSERT(!conn->cfilter[sockindex]);
scf_ctx = calloc(sizeof(*scf_ctx), 1);
if(!scf_ctx) {
result = CURLE_OUT_OF_MEMORY;
@@ -1844,7 +1845,7 @@
result = Curl_cf_create(&cf, &cft_socket, scf_ctx);
if(result)
goto out;
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
out:
if(result) {
@@ -1898,9 +1899,9 @@
};
CURLcode Curl_conn_socket_accepted_set(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex, curl_socket_t *s)
{
- struct connectdata *conn = data->conn;
CURLcode result;
struct Curl_cfilter *cf = NULL;
struct socket_cf_ctx *scf_ctx = NULL;
@@ -1922,7 +1923,7 @@
result = Curl_cf_create(&cf, &cft_socket_accept, scf_ctx);
if(result)
goto out;
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
}
/* close any existing socket and replace */
diff --git a/lib/connect.h b/lib/connect.h
index 79f932a..1e90a85 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -149,9 +149,12 @@
#endif
CURLcode Curl_conn_socket_set(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex);
CURLcode Curl_conn_socket_accepted_set(struct Curl_easy *data,
- int sockindex, curl_socket_t *s);
+ struct connectdata *conn,
+ int sockindex,
+ curl_socket_t *s);
#endif /* HEADER_CURL_CONNECT_H */
diff --git a/lib/ftp.c b/lib/ftp.c
index f72d803..c6e31e1 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -286,7 +286,7 @@
(void)curlx_nonblock(s, TRUE); /* enable non-blocking */
/* Replace any filter on SECONDARY with one listeing on this socket */
- result = Curl_conn_socket_accepted_set(data, SECONDARYSOCKET, &s);
+ result = Curl_conn_socket_accepted_set(data, conn, SECONDARYSOCKET, &s);
if(result)
return result;
@@ -1267,7 +1267,8 @@
ftpc->count1 = fcmd;
/* Replace any filter on SECONDARY with one listeing on this socket */
- result = Curl_conn_socket_accepted_set(data, SECONDARYSOCKET, &portsock);
+ result = Curl_conn_socket_accepted_set(data, conn, SECONDARYSOCKET,
+ &portsock);
if(result)
goto out;
portsock = CURL_SOCKET_BAD; /* now held in filter */
@@ -1973,7 +1974,7 @@
}
}
- result = Curl_conn_setup(data, SECONDARYSOCKET, addr,
+ result = Curl_conn_setup(data, conn, SECONDARYSOCKET, addr,
conn->bits.ftp_use_data_ssl?
CURL_CF_SSL_ENABLE : CURL_CF_SSL_DISABLE);
@@ -2741,7 +2742,7 @@
/* this was BLOCKING, keep it so for now */
bool done;
if(!Curl_ssl_conn_is_ssl(data, FIRSTSOCKET)) {
- result = Curl_ssl_cfilter_add(data, FIRSTSOCKET);
+ result = Curl_ssl_cfilter_add(data, conn, FIRSTSOCKET);
if(result) {
/* we failed and bail out */
return CURLE_USE_SSL_FAILED;
diff --git a/lib/http.c b/lib/http.c
index 105e8cf..66d3b4d 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -219,7 +219,7 @@
#endif
static CURLcode h3_setup_conn(struct Curl_easy *data,
- struct connectdata *conn)
+ struct connectdata *conn)
{
#ifdef ENABLE_QUIC
/* We want HTTP/3 directly, setup the filter chain ourself,
@@ -243,7 +243,7 @@
DEBUGF(infof(data, "HTTP/3 direct conn setup(conn #%ld, index=%d)",
conn->connection_id, FIRSTSOCKET));
- return Curl_conn_socket_set(data, FIRSTSOCKET);
+ return Curl_conn_socket_set(data, conn, FIRSTSOCKET);
#else /* ENABLE_QUIC */
(void)conn;
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 53810b2..0519c8e 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -1191,6 +1191,7 @@
};
CURLcode Curl_conn_http_proxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@@ -1198,7 +1199,7 @@
result = Curl_cf_create(&cf, &cft_http_proxy, NULL);
if(!result)
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
return result;
}
@@ -1275,6 +1276,7 @@
};
CURLcode Curl_conn_haproxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@@ -1282,7 +1284,7 @@
result = Curl_cf_create(&cf, &cft_haproxy, NULL);
if(!result)
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
return result;
}
diff --git a/lib/http_proxy.h b/lib/http_proxy.h
index ea59083..dfdc0e7 100644
--- a/lib/http_proxy.h
+++ b/lib/http_proxy.h
@@ -33,9 +33,11 @@
#define PROXY_TIMEOUT (3600*1000)
CURLcode Curl_conn_http_proxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex);
CURLcode Curl_conn_haproxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex);
#endif /* !CURL_DISABLE_PROXY && !CURL_DISABLE_HTTP */
diff --git a/lib/imap.c b/lib/imap.c
index 76012e0..03dc191 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -477,7 +477,7 @@
CURLcode result;
if(!Curl_ssl_conn_is_ssl(data, FIRSTSOCKET)) {
- result = Curl_ssl_cfilter_add(data, FIRSTSOCKET);
+ result = Curl_ssl_cfilter_add(data, conn, FIRSTSOCKET);
if(result)
goto out;
}
diff --git a/lib/pop3.c b/lib/pop3.c
index b45f867..e94d7e5 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -372,7 +372,7 @@
CURLcode result;
if(!Curl_ssl_conn_is_ssl(data, FIRSTSOCKET)) {
- result = Curl_ssl_cfilter_add(data, FIRSTSOCKET);
+ result = Curl_ssl_cfilter_add(data, conn, FIRSTSOCKET);
if(result)
goto out;
}
diff --git a/lib/smtp.c b/lib/smtp.c
index 36f07eb..cbaf482 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -399,7 +399,7 @@
CURLcode result;
if(!Curl_ssl_conn_is_ssl(data, FIRSTSOCKET)) {
- result = Curl_ssl_cfilter_add(data, FIRSTSOCKET);
+ result = Curl_ssl_cfilter_add(data, conn, FIRSTSOCKET);
if(result)
goto out;
}
diff --git a/lib/socks.c b/lib/socks.c
index e0b1735..ebce083 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -1245,6 +1245,7 @@
};
CURLcode Curl_conn_socks_proxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@@ -1252,7 +1253,7 @@
result = Curl_cf_create(&cf, &cft_socks_proxy, NULL);
if(!result)
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
return result;
}
diff --git a/lib/socks.h b/lib/socks.h
index ddbb07c..2e2fa18 100644
--- a/lib/socks.h
+++ b/lib/socks.h
@@ -52,6 +52,7 @@
#endif
CURLcode Curl_conn_socks_proxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex);
#endif /* CURL_DISABLE_PROXY */
diff --git a/lib/url.c b/lib/url.c
index 719bbed..74201f9 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4041,7 +4041,7 @@
is later set again for the progress meter purpose */
conn->now = Curl_now();
if(!conn->bits.reuse)
- result = Curl_conn_setup(data, FIRSTSOCKET, conn->dns_entry,
+ result = Curl_conn_setup(data, conn, FIRSTSOCKET, conn->dns_entry,
CURL_CF_SSL_DEFAULT);
/* not sure we need this flag to be passed around any more */
*protocol_done = FALSE;
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 9ab54c6..1976246 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -1462,6 +1462,7 @@
connssl->port = (int)cf->conn->remote_port;
}
}
+ DEBUGASSERT(connssl->hostname);
}
static void ssl_cf_destroy(struct Curl_cfilter *cf, struct Curl_easy *data)
@@ -1504,17 +1505,20 @@
}
(void)connssl;
+ DEBUGASSERT(data->conn);
+ DEBUGASSERT(data->conn == cf->conn);
DEBUGASSERT(connssl);
- /* TODO: right now we do not fully control when hostname is set, but
- * copy it over again on each connect call. Esp. secondary chains seems
- * to set it after the filters have been added */
- reinit_hostname(cf);
+ DEBUGASSERT(cf->conn->host.name);
result = cf->next->cft->connect(cf->next, data, blocking, done);
if(result || !*done)
return result;
+ /* TODO: right now we do not fully control when hostname is set,
+ * assign it on each connect call. */
+ reinit_hostname(cf);
*done = FALSE;
+
if(blocking) {
result = ssl_connect(cf, data);
*done = (result == CURLE_OK);
@@ -1628,6 +1632,7 @@
};
CURLcode Curl_ssl_cfilter_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@@ -1645,9 +1650,8 @@
if(result)
goto out;
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
- reinit_hostname(cf);
result = CURLE_OK;
out:
@@ -1658,6 +1662,7 @@
#ifndef CURL_DISABLE_PROXY
CURLcode Curl_ssl_cfilter_proxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@@ -1674,9 +1679,8 @@
if(result)
goto out;
- Curl_conn_cf_add(data, sockindex, cf);
+ Curl_conn_cf_add(data, conn, sockindex, cf);
- reinit_hostname(cf);
result = CURLE_OK;
out:
@@ -1793,7 +1797,7 @@
(void)data;
DEBUGASSERT(data->conn);
cf = get_ssl_cf_engaged(data->conn, sockindex);
- return cf? Curl_ssl_cf_get_config(cf, data) : NULL;
+ return cf? Curl_ssl_cf_get_config(cf, data) : &data->set.ssl;
}
struct ssl_primary_config *
diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index 17c3770..a3601ba 100644
--- a/lib/vtls/vtls.h
+++ b/lib/vtls/vtls.h
@@ -153,6 +153,7 @@
#define SSL_SHUTDOWN_TIMEOUT 10000 /* ms */
CURLcode Curl_ssl_cfilter_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex);
CURLcode Curl_ssl_cfilter_remove(struct Curl_easy *data,
@@ -160,6 +161,7 @@
#ifndef CURL_DISABLE_PROXY
CURLcode Curl_ssl_cfilter_proxy_add(struct Curl_easy *data,
+ struct connectdata *conn,
int sockindex);
#endif /* !CURL_DISABLE_PROXY */
@@ -239,8 +241,8 @@
#define Curl_ssl_get_backend_data_size(a) 0
#define Curl_ssl_use(a,b) FALSE
#define Curl_ssl_conn_is_ssl(a,b) FALSE
-#define Curl_ssl_cfilter_add(a,b) CURLE_NOT_BUILT_IN
-#define Curl_ssl_cfilter_proxy_add(a,b) CURLE_NOT_BUILT_IN
+#define Curl_ssl_cfilter_add(a,b,c) CURLE_NOT_BUILT_IN
+#define Curl_ssl_cfilter_proxy_add(a,b,c) CURLE_NOT_BUILT_IN
#define Curl_ssl_get_config(a,b) NULL
#define Curl_ssl_cfilter_remove(a,b) CURLE_OK
#endif
