curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-10 22:22:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

vtls: remove unusued 'check_cxn' from TLS handler struct

Browse Source 
The last use was removed in 7c5637b8b4

Closes #15775
This commit is contained in:
Daniel Stenberg 2024-12-18 13:54:42 +01:00
parent 2bf48b48b3
commit 86549153ef
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
10 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/vtls/bearssl.c
View File

@ -1157,7 +1157,6 @@ const struct Curl_ssl Curl_ssl_bearssl = {
NULL, /* init */ NULL, /* init */
NULL, /* cleanup */ NULL, /* cleanup */
bearssl_version, /* version */ bearssl_version, /* version */
NULL, /* check_cxn */
bearssl_shutdown, /* shutdown */ bearssl_shutdown, /* shutdown */
bearssl_data_pending, /* data_pending */ bearssl_data_pending, /* data_pending */
bearssl_random, /* random */ bearssl_random, /* random */

1
lib/vtls/gtls.c
View File

@ -2269,7 +2269,6 @@ const struct Curl_ssl Curl_ssl_gnutls = {
gtls_init, /* init */ gtls_init, /* init */
gtls_cleanup, /* cleanup */ gtls_cleanup, /* cleanup */
gtls_version, /* version */ gtls_version, /* version */
NULL, /* check_cxn */
gtls_shutdown, /* shutdown */ gtls_shutdown, /* shutdown */
gtls_data_pending, /* data_pending */ gtls_data_pending, /* data_pending */
gtls_random, /* random */ gtls_random, /* random */

1
lib/vtls/mbedtls.c
View File

@ -1643,7 +1643,6 @@ const struct Curl_ssl Curl_ssl_mbedtls = {
mbedtls_init, /* init */ mbedtls_init, /* init */
mbedtls_cleanup, /* cleanup */ mbedtls_cleanup, /* cleanup */
mbedtls_version, /* version */ mbedtls_version, /* version */
NULL, /* check_cxn */
mbedtls_shutdown, /* shutdown */ mbedtls_shutdown, /* shutdown */
mbedtls_data_pending, /* data_pending */ mbedtls_data_pending, /* data_pending */
mbedtls_random, /* random */ mbedtls_random, /* random */

1
lib/vtls/openssl.c
View File

@ -5337,7 +5337,6 @@ const struct Curl_ssl Curl_ssl_openssl = {
ossl_init, /* init */ ossl_init, /* init */
ossl_cleanup, /* cleanup */ ossl_cleanup, /* cleanup */
ossl_version, /* version */ ossl_version, /* version */
NULL, /* check_cxn */
ossl_shutdown, /* shutdown */ ossl_shutdown, /* shutdown */
ossl_data_pending, /* data_pending */ ossl_data_pending, /* data_pending */
ossl_random, /* random */ ossl_random, /* random */

1
lib/vtls/rustls.c
View File

@ -1079,7 +1079,6 @@ const struct Curl_ssl Curl_ssl_rustls = {
NULL, /* init */ NULL, /* init */
NULL, /* cleanup */ NULL, /* cleanup */
cr_version, /* version */ cr_version, /* version */
NULL, /* check_cxn */
cr_shutdown, /* shutdown */ cr_shutdown, /* shutdown */
cr_data_pending, /* data_pending */ cr_data_pending, /* data_pending */
cr_random, /* random */ cr_random, /* random */

1
lib/vtls/schannel.c
View File

@ -2798,7 +2798,6 @@ const struct Curl_ssl Curl_ssl_schannel = {
schannel_init, /* init */ schannel_init, /* init */
schannel_cleanup, /* cleanup */ schannel_cleanup, /* cleanup */
schannel_version, /* version */ schannel_version, /* version */
NULL, /* check_cxn */
schannel_shutdown, /* shutdown */ schannel_shutdown, /* shutdown */
schannel_data_pending, /* data_pending */ schannel_data_pending, /* data_pending */
schannel_random, /* random */ schannel_random, /* random */

1
lib/vtls/sectransp.c
View File

@ -2752,7 +2752,6 @@ const struct Curl_ssl Curl_ssl_sectransp = {
NULL, /* init */ NULL, /* init */
NULL, /* cleanup */ NULL, /* cleanup */
sectransp_version, /* version */ sectransp_version, /* version */
NULL, /* check_cxn */
sectransp_shutdown, /* shutdown */ sectransp_shutdown, /* shutdown */
sectransp_data_pending, /* data_pending */ sectransp_data_pending, /* data_pending */
sectransp_random, /* random */ sectransp_random, /* random */

22
lib/vtls/vtls.c
View File

@ -1284,7 +1284,6 @@ static const struct Curl_ssl Curl_ssl_multi = {
multissl_init, /* init */ multissl_init, /* init */
NULL, /* cleanup */ NULL, /* cleanup */
multissl_version, /* version */ multissl_version, /* version */
NULL, /* check_cxn */
NULL, /* shutdown */ NULL, /* shutdown */
NULL, /* data_pending */ NULL, /* data_pending */
NULL, /* random */ NULL, /* random */
@ -1825,30 +1824,9 @@ static CURLcode ssl_cf_query(struct Curl_cfilter *cf,
static bool cf_ssl_is_alive(struct Curl_cfilter *cf, struct Curl_easy *data, static bool cf_ssl_is_alive(struct Curl_cfilter *cf, struct Curl_easy *data,
bool *input_pending) bool *input_pending)
{ {
int result = -1;
/* /*
* This function tries to determine connection status. * This function tries to determine connection status.
*
* Return codes:
* 1 means the connection is still in place
* 0 means the connection has been closed
* -1 means the connection status is unknown
*/ */
if(Curl_ssl->check_cxn) {
struct cf_call_data save;
CF_DATA_SAVE(save, cf, data);
result = Curl_ssl->check_cxn(cf, data);
CF_DATA_RESTORE(cf, save);
}
if(result > 0) {
*input_pending = TRUE;
return TRUE;
}
if(result == 0) {
*input_pending = FALSE;
return FALSE;
}
/* ssl backend does not know */
return cf->next ? return cf->next ?
cf->next->cft->is_alive(cf->next, data, input_pending) : cf->next->cft->is_alive(cf->next, data, input_pending) :
FALSE; /* pessimistic in absence of data */ FALSE; /* pessimistic in absence of data */

1
lib/vtls/vtls_int.h
View File

@ -142,7 +142,6 @@ struct Curl_ssl {
void (*cleanup)(void); void (*cleanup)(void);
size_t (*version)(char *buffer, size_t size); size_t (*version)(char *buffer, size_t size);
int (*check_cxn)(struct Curl_cfilter *cf, struct Curl_easy *data);
CURLcode (*shut_down)(struct Curl_cfilter *cf, struct Curl_easy *data, CURLcode (*shut_down)(struct Curl_cfilter *cf, struct Curl_easy *data,
bool send_shutdown, bool *done); bool send_shutdown, bool *done);
bool (*data_pending)(struct Curl_cfilter *cf, bool (*data_pending)(struct Curl_cfilter *cf,

1
lib/vtls/wolfssl.c
View File

@ -2031,7 +2031,6 @@ const struct Curl_ssl Curl_ssl_wolfssl = {
wolfssl_init, /* init */ wolfssl_init, /* init */
wolfssl_cleanup, /* cleanup */ wolfssl_cleanup, /* cleanup */
wolfssl_version, /* version */ wolfssl_version, /* version */
NULL, /* check_cxn */
wolfssl_shutdown, /* shutdown */ wolfssl_shutdown, /* shutdown */
wolfssl_data_pending, /* data_pending */ wolfssl_data_pending, /* data_pending */
wolfssl_random, /* random */ wolfssl_random, /* random */