kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #1608 in FS/freeswitch from ~HUNYI/freeswitch:bugfix/FS-11207-sofia-msrp_worker-crash-when-initializing to master" 

This reverts commit abd8b0b061, reversing
changes made to 102161e14d.
This commit is contained in:
Andrey Volk 2018-11-13 20:47:28 +04:00
parent abd8b0b061
commit f0a03ca337
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/switch_msrp.c
View File

@ -103,14 +103,13 @@ static switch_bool_t msrp_check_success_report(switch_msrp_msg_t *msrp_msg)
static void msrp_deinit_ssl() static void msrp_deinit_ssl()
{ {
globals.ssl_ready = 0;
if (globals.ssl_ctx) { if (globals.ssl_ctx) {
SSL_CTX_free(globals.ssl_ctx); SSL_CTX_free(globals.ssl_ctx);
globals.ssl_ctx = NULL; globals.ssl_ctx = NULL;
} }
} }
static void msrp_init_ssl() static int msrp_init_ssl()
{ {
const char *err = ""; const char *err = "";
@ -176,11 +175,15 @@ static void msrp_init_ssl()
SSL_CTX_set_cipher_list(globals.ssl_ctx, "HIGH:!DSS:!aNULL@STRENGTH"); SSL_CTX_set_cipher_list(globals.ssl_ctx, "HIGH:!DSS:!aNULL@STRENGTH");
return; return 1;
fail: fail:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SSL ERR: %s\n", err); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SSL ERR: %s\n", err);
globals.ssl_ready = 0;
msrp_deinit_ssl(); msrp_deinit_ssl();
return 0;
} }
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ip, globals.ip);
@ -1139,10 +1142,6 @@ static void *SWITCH_THREAD_FUNC msrp_worker(switch_thread_t *thread, void *obj)
// switch_socket_opt_set(csock->sock, SWITCH_SO_NONBLOCK, TRUE); // switch_socket_opt_set(csock->sock, SWITCH_SO_NONBLOCK, TRUE);
if (csock->secure) { // tls? if (csock->secure) { // tls?
if (globals.ssl_ready != 1) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SSL not ready\n");
goto end;
}
int secure_established = 0; int secure_established = 0;
int sanity = 10; int sanity = 10;
switch_os_socket_t sockdes = SWITCH_SOCK_INVALID; switch_os_socket_t sockdes = SWITCH_SOCK_INVALID;