romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-03 20:10:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

vtls: localization of state data in filters

Browse source 
- almost all backend calls pass the Curl_cfilter intance instead of
   connectdata+sockindex
 - ssl_connect_data is remove from struct connectdata and made internal
   to vtls
 - ssl_connect_data is allocated in the added filter, kept at cf->ctx

 - added function to let a ssl filter access its ssl_primary_config and
   ssl_config_data this selects the propert subfields in conn and data,
   for filters added as plain or proxy
 - adjusted all backends to use the changed api
 - adjusted all backends to access config data via the exposed
   functions, no longer using conn or data directly

cfilter renames for clear purpose:

 - methods `Curl_conn_*(data, conn, sockindex)` work on the complete
   filter chain at `sockindex` and connection `conn`.
 - methods `Curl_cf_*(cf, ...)` work on a specific Curl_cfilter
   instance.
 - methods `Curl_conn_cf()` work on/with filter instances at a
   connection.
 - rebased and resolved some naming conflicts
 - hostname validation (und session lookup) on SECONDARY use the same
   name as on FIRST (again).

new debug macros and removing connectdata from function signatures where not
needed.

adapting schannel for new Curl_read_plain paramter.

Closes #9919
This commit is contained in:
Stefan Eissing 2022-11-22 09:55:41 +01:00 • committed by Daniel Stenberg
parent a28a80d59e
commit af22c2a546
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
48 changed files with 2230 additions and 2117 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/multi.c
View file

@ -954,7 +954,7 @@ void Curl_detach_connection(struct Curl_easy *data)
{
struct connectdata *conn = data->conn;
if(conn) {
Curl_cfilter_detach_data(conn, data);
Curl_conn_detach_data(conn, data);
Curl_llist_remove(&conn->easyq, &data->conn_queue, NULL);
}
data->conn = NULL;
@ -973,7 +973,7 @@ void Curl_attach_connection(struct Curl_easy *data,
data->conn = conn;
Curl_llist_insert_next(&conn->easyq, conn->easyq.tail, data,
&data->conn_queue);
Curl_cfilter_attach_data(conn, data);
Curl_conn_attach_data(conn, data);
if(conn->handler->attach)
conn->handler->attach(data, conn);
}
@ -1038,7 +1038,7 @@ static int multi_getsock(struct Curl_easy *data,
case MSTATE_TUNNELING:
case MSTATE_CONNECTING:
return Curl_cfilter_get_select_socks(data, conn, FIRSTSOCKET, socks);
return Curl_conn_get_select_socks(data, FIRSTSOCKET, socks);
case MSTATE_DOING_MORE:
return domore_getsock(data, conn, socks);
@ -1696,7 +1696,7 @@ static CURLcode protocol_connect(struct Curl_easy *data,
*protocol_done = FALSE;
if(Curl_cfilter_is_connected(data, conn, FIRSTSOCKET)
if(Curl_conn_is_connected(conn, FIRSTSOCKET)
&& conn->bits.protoconnstart) {
/* We already are connected, get back. This may happen when the connect
worked fine in the first call, like when we connect to a local server
@ -1982,8 +1982,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
case MSTATE_CONNECTING:
/* awaiting a completion of an asynch TCP connect */
DEBUGASSERT(data->conn);
result = Curl_cfilter_connect(data, data->conn, FIRSTSOCKET,
FALSE, &connected);
result = Curl_conn_connect(data, FIRSTSOCKET, FALSE, &connected);
if(connected && !result) {
rc = CURLM_CALL_MULTI_PERFORM;
multistate(data, MSTATE_PROTOCONNECT);