mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 23:55:27 +00:00
Code Issues Releases Wiki Activity

tlsctx_client_session_cache_new() -> tlsctx_client_session_create()

Browse Source 
Additionally to renaming, it changes the function definition so that
it accepts a pointer to pointer instead of returning a pointer to the
new object.

It is mostly done to make it in line with other functions in the
module.
This commit is contained in:
Artem Boldariev
2022-12-22 20:04:22 +02:00
parent f102df96b8
commit 7962e7f575
6 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/dig/dighost.c
View File

@@ -2880,9 +2880,9 @@ get_create_tls_context(dig_query_t *query, const bool is_https,
} }
#endif /* HAVE_LIBNGHTTP2 */ #endif /* HAVE_LIBNGHTTP2 */
sess_cache = isc_tlsctx_client_session_cache_new( isc_tlsctx_client_session_cache_create(
mctx, ctx, mctx, ctx, ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE); &sess_cache);
result = isc_tlsctx_cache_add( result = isc_tlsctx_cache_add(
query->lookup->tls_ctx_cache, tlsctxname, transport, query->lookup->tls_ctx_cache, tlsctxname, transport,

5
lib/dns/transport.c
View File

@@ -498,9 +498,10 @@ dns_transport_get_tlsctx(dns_transport_t *transport, const isc_sockaddr_t *peer,
isc_tlsctx_enable_dot_client_alpn(tlsctx); isc_tlsctx_enable_dot_client_alpn(tlsctx);
sess_cache = isc_tlsctx_client_session_cache_new( isc_tlsctx_client_session_cache_create(
mctx, tlsctx, mctx, tlsctx,
ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE); ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
&sess_cache);
found_store = NULL; found_store = NULL;
result = isc_tlsctx_cache_add(tlsctx_cache, tlsname, result = isc_tlsctx_cache_add(tlsctx_cache, tlsname,

8
lib/isc/include/isc/tls.h
View File

@@ -320,9 +320,10 @@ typedef struct isc_tlsctx_client_session_cache isc_tlsctx_client_session_cache_t
* comparable to or surpass the size of a typical DNS message. * comparable to or surpass the size of a typical DNS message.
*/ */
isc_tlsctx_client_session_cache_t * void
isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx, isc_tlsctx_client_session_cache_create(
const size_t max_entries); isc_mem_t *mctx, isc_tlsctx_t *ctx, const size_t max_entries,
isc_tlsctx_client_session_cache_t **cachep);
/*%< /*%<
* Create a new TLS client session cache object. * Create a new TLS client session cache object.
* *
@@ -330,6 +331,7 @@ isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx,
*\li 'mctx' is a valid memory context object; *\li 'mctx' is a valid memory context object;
*\li 'ctx' is a valid TLS context object; *\li 'ctx' is a valid TLS context object;
*\li 'max_entries' is a positive number; *\li 'max_entries' is a positive number;
*\li 'cachep' is a valid pointer to a pointer which must be equal to NULL.
*/ */
void void

10
lib/isc/tls.c
View File

@@ -1465,13 +1465,15 @@ struct isc_tlsctx_client_session_cache {
isc_mutex_t lock; isc_mutex_t lock;
}; };
isc_tlsctx_client_session_cache_t * void
isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx, isc_tlsctx_client_session_cache_create(
const size_t max_entries) { isc_mem_t *mctx, isc_tlsctx_t *ctx, const size_t max_entries,
isc_tlsctx_client_session_cache_t **cachep) {
isc_tlsctx_client_session_cache_t *nc; isc_tlsctx_client_session_cache_t *nc;
REQUIRE(ctx != NULL); REQUIRE(ctx != NULL);
REQUIRE(max_entries > 0); REQUIRE(max_entries > 0);
REQUIRE(cachep != NULL && *cachep == NULL);
nc = isc_mem_get(mctx, sizeof(*nc)); nc = isc_mem_get(mctx, sizeof(*nc));
@@ -1486,7 +1488,7 @@ isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx,
nc->magic = TLSCTX_CLIENT_SESSION_CACHE_MAGIC; nc->magic = TLSCTX_CLIENT_SESSION_CACHE_MAGIC;
return (nc); *cachep = nc;
} }
void void

5
tests/isc/doh_test.c
View File

@@ -319,9 +319,10 @@ setup_test(void **state) {
client_tlsctx = NULL; client_tlsctx = NULL;
isc_tlsctx_createclient(&client_tlsctx); isc_tlsctx_createclient(&client_tlsctx);
isc_tlsctx_enable_http2client_alpn(client_tlsctx); isc_tlsctx_enable_http2client_alpn(client_tlsctx);
client_sess_cache = isc_tlsctx_client_session_cache_new( isc_tlsctx_client_session_cache_create(
mctx, client_tlsctx, mctx, client_tlsctx,
ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE); ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
&client_sess_cache);
isc_quota_init(&listener_quota, 0); isc_quota_init(&listener_quota, 0);
atomic_store(&check_listener_quota, false); atomic_store(&check_listener_quota, false);

5
tests/isc/netmgr_common.c
View File

@@ -186,9 +186,10 @@ setup_netmgr_test(void **state) {
isc_tlsctx_enable_dot_client_alpn(tcp_connect_tlsctx); isc_tlsctx_enable_dot_client_alpn(tcp_connect_tlsctx);
tcp_tlsctx_client_sess_cache = isc_tlsctx_client_session_cache_new( isc_tlsctx_client_session_cache_create(
mctx, tcp_connect_tlsctx, mctx, tcp_connect_tlsctx,
ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE); ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
&tcp_tlsctx_client_sess_cache);
return (0); return (0);
} }