diff options
| author | Stefan Eissing <stefan@eissing.org> | 2022-11-11 11:45:34 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2022-11-11 15:17:51 +0100 |
| commit | dafdb20a26d0c890e83dea61a104b75408481ebd (patch) | |
| tree | 40824f46de18cb7b7b47fb06a3be624c9c06961b /lib/vtls/sectransp.c | |
| parent | 89ee5cfb38b22f9ff68c34aa55ca2c242be90826 (diff) | |
| download | curl-dafdb20a26d0c890e83dea61a104b75408481ebd.tar.gz | |
lib: connection filters (cfilter) addition to curl:
- general construct/destroy in connectdata
- default implementations of callback functions
- connect: cfilters for connect and accept
- socks: cfilter for socks proxying
- http_proxy: cfilter for http proxy tunneling
- vtls: cfilters for primary and proxy ssl
- change in general handling of data/conn
- Curl_cfilter_setup() sets up filter chain based on data settings,
if none are installed by the protocol handler setup
- Curl_cfilter_connect() boot straps filters into `connected` status,
used by handlers and multi to reach further stages
- Curl_cfilter_is_connected() to check if a conn is connected,
e.g. all filters have done their work
- Curl_cfilter_get_select_socks() gets the sockets and READ/WRITE
indicators for multi select to work
- Curl_cfilter_data_pending() asks filters if the have incoming
data pending for recv
- Curl_cfilter_recv()/Curl_cfilter_send are the general callbacks
installed in conn->recv/conn->send for io handling
- Curl_cfilter_attach_data()/Curl_cfilter_detach_data() inform filters
and addition/removal of a `data` from their connection
- adding vtl functions to prevent use of Curl_ssl globals directly
in other parts of the code.
Reviewed-by: Daniel Stenberg
Closes #9855
Diffstat (limited to 'lib/vtls/sectransp.c')
| -rw-r--r-- | lib/vtls/sectransp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c index ffabf1276..7da1a396d 100644 --- a/lib/vtls/sectransp.c +++ b/lib/vtls/sectransp.c @@ -127,6 +127,7 @@ #include "connect.h" #include "select.h" #include "vtls.h" +#include "vtls_int.h" #include "sectransp.h" #include "curl_printf.h" #include "strdup.h" @@ -3134,8 +3135,6 @@ sectransp_connect_common(struct Curl_easy *data, if(ssl_connect_done == connssl->connecting_state) { connssl->state = ssl_connection_complete; - conn->recv[sockindex] = sectransp_recv; - conn->send[sockindex] = sectransp_send; *done = TRUE; } else @@ -3530,7 +3529,9 @@ const struct Curl_ssl Curl_ssl_sectransp = { sectransp_sha256sum, /* sha256sum */ NULL, /* associate_connection */ NULL, /* disassociate_connection */ - NULL /* free_multi_ssl_backend_data */ + NULL, /* free_multi_ssl_backend_data */ + sectransp_recv, /* recv decrypted data */ + sectransp_send, /* send data to encrypt */ }; #ifdef __clang__ |