mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-10-30 14:31:29 +01:00
Code Issues Projects Releases Wiki Activity

tls code cleaning

Browse Source
This commit is contained in:
mom040267 2014-12-11 09:02:49 +00:00
parent 65dc483208
commit cd35ab46af
4 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/apps/relay/dtls_listener.c
View File

@ -898,7 +898,10 @@ static int init_server(dtls_listener_relay_server_type* server,
if(!server) return -1; if(!server) return -1;
#if DTLSv1_SUPPORTED
server->dtls_ctx = e->dtls_ctx; server->dtls_ctx = e->dtls_ctx;
#endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
server->dtls_ctx_v1_2 = e->dtls_ctx_v1_2; server->dtls_ctx_v1_2 = e->dtls_ctx_v1_2;
#endif #endif
@ -918,6 +921,7 @@ static int init_server(dtls_listener_relay_server_type* server,
server->e = e; server->e = e;
#if DTLSv1_SUPPORTED
if(server->dtls_ctx) { if(server->dtls_ctx) {
#if defined(REQUEST_CLIENT_CERT) #if defined(REQUEST_CLIENT_CERT)
@ -927,11 +931,10 @@ static int init_server(dtls_listener_relay_server_type* server,
SSL_CTX_set_read_ahead(server->dtls_ctx, 1); SSL_CTX_set_read_ahead(server->dtls_ctx, 1);
#if DTLSv1_SUPPORTED
SSL_CTX_set_cookie_generate_cb(server->dtls_ctx, generate_cookie); SSL_CTX_set_cookie_generate_cb(server->dtls_ctx, generate_cookie);
SSL_CTX_set_cookie_verify_cb(server->dtls_ctx, verify_cookie); SSL_CTX_set_cookie_verify_cb(server->dtls_ctx, verify_cookie);
#endif
} }
#endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
if(server->dtls_ctx_v1_2) { if(server->dtls_ctx_v1_2) {

30
src/apps/relay/netengine.c
View File

@ -940,18 +940,18 @@ static ioa_engine_handle create_new_listener_engine(void)
,turn_params.redis_statsdb ,turn_params.redis_statsdb
#endif #endif
); );
set_ssl_ctx(e, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0, set_ssl_ctx(e, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0
#if TLSv1_1_SUPPORTED #if TLSv1_1_SUPPORTED
turn_params.tls_ctx_v1_1, ,turn_params.tls_ctx_v1_1
#if TLSv1_2_SUPPORTED #if TLSv1_2_SUPPORTED
turn_params.tls_ctx_v1_2, ,turn_params.tls_ctx_v1_2
#endif #endif
#endif #endif
#if DTLSv1_SUPPORTED #if DTLSv1_SUPPORTED
turn_params.dtls_ctx ,turn_params.dtls_ctx
#endif #endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
,turn_params.dtls_ctx_v1_2 ,turn_params.dtls_ctx_v1_2
#endif #endif
); );
ioa_engine_set_rtcp_map(e, turn_params.listener.rtcpmap); ioa_engine_set_rtcp_map(e, turn_params.listener.rtcpmap);
@ -996,18 +996,18 @@ static void setup_listener(void)
if(!turn_params.listener.ioa_eng) if(!turn_params.listener.ioa_eng)
exit(-1); exit(-1);
set_ssl_ctx(turn_params.listener.ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0, set_ssl_ctx(turn_params.listener.ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0
#if TLSv1_1_SUPPORTED #if TLSv1_1_SUPPORTED
turn_params.tls_ctx_v1_1, ,turn_params.tls_ctx_v1_1
#if TLSv1_2_SUPPORTED #if TLSv1_2_SUPPORTED
turn_params.tls_ctx_v1_2, ,turn_params.tls_ctx_v1_2
#endif #endif
#endif #endif
#if DTLSv1_SUPPORTED #if DTLSv1_SUPPORTED
turn_params.dtls_ctx ,turn_params.dtls_ctx
#endif #endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
,turn_params.dtls_ctx_v1_2 ,turn_params.dtls_ctx_v1_2
#endif #endif
); );
@ -1570,18 +1570,18 @@ static void setup_relay_server(struct relay_server *rs, ioa_engine_handle e, int
,turn_params.redis_statsdb ,turn_params.redis_statsdb
#endif #endif
); );
set_ssl_ctx(rs->ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0, set_ssl_ctx(rs->ioa_eng, turn_params.tls_ctx_ssl23, turn_params.tls_ctx_v1_0
#if TLSv1_1_SUPPORTED #if TLSv1_1_SUPPORTED
turn_params.tls_ctx_v1_1, ,turn_params.tls_ctx_v1_1
#if TLSv1_2_SUPPORTED #if TLSv1_2_SUPPORTED
turn_params.tls_ctx_v1_2, ,turn_params.tls_ctx_v1_2
#endif #endif
#endif #endif
#if DTLSv1_SUPPORTED #if DTLSv1_SUPPORTED
turn_params.dtls_ctx ,turn_params.dtls_ctx
#endif #endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
,turn_params.dtls_ctx_v1_2 ,turn_params.dtls_ctx_v1_2
#endif #endif
); );
ioa_engine_set_rtcp_map(rs->ioa_eng, turn_params.listener.rtcpmap); ioa_engine_set_rtcp_map(rs->ioa_eng, turn_params.listener.rtcpmap);

8
src/apps/relay/ns_ioalib_engine_impl.c
View File

@ -433,15 +433,15 @@ ioa_engine_handle create_ioa_engine(super_memory_t *sm,
void set_ssl_ctx(ioa_engine_handle e, void set_ssl_ctx(ioa_engine_handle e,
SSL_CTX *tls_ctx_ssl23, SSL_CTX *tls_ctx_ssl23,
SSL_CTX *tls_ctx_v1_0, SSL_CTX *tls_ctx_v1_0
#if TLSv1_1_SUPPORTED #if TLSv1_1_SUPPORTED
SSL_CTX *tls_ctx_v1_1, ,SSL_CTX *tls_ctx_v1_1
#if TLSv1_2_SUPPORTED #if TLSv1_2_SUPPORTED
SSL_CTX *tls_ctx_v1_2, ,SSL_CTX *tls_ctx_v1_2
#endif #endif
#endif #endif
#if DTLSv1_SUPPORTED #if DTLSv1_SUPPORTED
SSL_CTX *dtls_ctx ,SSL_CTX *dtls_ctx
#endif #endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
,SSL_CTX *dtls_ctx_v1_2 ,SSL_CTX *dtls_ctx_v1_2

8
src/apps/relay/ns_ioalib_impl.h
View File

@ -255,15 +255,15 @@ ioa_engine_handle create_ioa_engine(super_memory_t *sm,
void set_ssl_ctx(ioa_engine_handle e, void set_ssl_ctx(ioa_engine_handle e,
SSL_CTX *tls_ctx_ssl23, SSL_CTX *tls_ctx_ssl23,
SSL_CTX *tls_ctx_v1_0, SSL_CTX *tls_ctx_v1_0
#if TLSv1_1_SUPPORTED #if TLSv1_1_SUPPORTED
SSL_CTX *tls_ctx_v1_1, ,SSL_CTX *tls_ctx_v1_1
#if TLSv1_2_SUPPORTED #if TLSv1_2_SUPPORTED
SSL_CTX *tls_ctx_v1_2, ,SSL_CTX *tls_ctx_v1_2
#endif #endif
#endif #endif
#if DTLSv1_SUPPORTED #if DTLSv1_SUPPORTED
SSL_CTX *dtls_ctx ,SSL_CTX *dtls_ctx
#endif #endif
#if DTLSv1_2_SUPPORTED #if DTLSv1_2_SUPPORTED
,SSL_CTX *dtls_ctx_v1_2 ,SSL_CTX *dtls_ctx_v1_2