Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

ss: policy: adaptations for dynamic policy

Browse source
This commit is contained in:
Jin Wang 2021-10-21 14:44:33 +01:00 • committed by Andy Green
parent 63db023f58
commit b43f90a8ed
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/core-net/private-lib-core-net.h
View file

@ -524,7 +524,7 @@ struct lws_vhost {
uint32_t tls_session_cache_max;
#endif
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY)
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY) || defined(LWS_WITH_SECURE_STREAMS_CPP)
int8_t ss_refcount;
/**< refcount of number of ss connections with streamtypes using this
* trust store */

4
lib/secure-streams/policy-common.c
View file

@ -367,7 +367,7 @@ lws_ss_policy_ref_trust_store(struct lws_context *context,
}
accepted:
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY)
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY) || defined(LWS_WITH_SECURE_STREAMS_CPP)
if (doref)
v->ss_refcount++;
#endif
@ -375,7 +375,7 @@ accepted:
return v;
}
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY)
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY) || defined(LWS_WITH_SECURE_STREAMS_CPP)
int
lws_ss_policy_unref_trust_store(struct lws_context *context,
const lws_ss_policy_t *pol)

2
lib/secure-streams/private-lib-secure-streams.h
View file

@ -541,7 +541,7 @@ lws_ss_cancel_notify_dll(struct lws_dll2 *d, void *user);
int
lws_sspc_cancel_notify_dll(struct lws_dll2 *d, void *user);
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY)
#if defined(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY) || defined(LWS_WITH_SECURE_STREAMS_CPP)
int
lws_ss_policy_unref_trust_store(struct lws_context *context,
const lws_ss_policy_t *pol);

13
lib/secure-streams/secure-streams.c
View file

@ -1283,6 +1283,14 @@ extant:
lwsl_err("%s: unable to get vhost / trust store\n", __func__);
goto fail_creation;
}
#else
#if defined(LWS_WITH_SECURE_STREAMS_CPP)
if (!ssi->streamtype &&
!lws_ss_policy_ref_trust_store(context, h->policy, 1 /* do the ref */)) {
lwsl_err("%s: unable to get vhost / trust store\n", __func__);
goto fail_creation;
}
#endif
#endif
r = lws_ss_event_helper(h, LWSSSCS_CREATING);
@ -1487,6 +1495,11 @@ lws_ss_destroy(lws_ss_handle_t **ppss)
if (h->policy)
lws_ss_policy_unref_trust_store(h->context, h->policy);
#else
#if defined(LWS_WITH_SECURE_STREAMS_CPP)
if (!h->info.streamtype || !*(h->info.streamtype))
lws_ss_policy_unref_trust_store(h->context, h->policy);
#endif
#endif
#if defined(LWS_WITH_SERVER)