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

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

* commit 'fcc81f385e5d3856f11ad5e7a5682eda1c81ae41':
  FS-11207: [core] msrp: fix init ssl
This commit is contained in:
Andrey Volk 2018-11-20 16:06:31 +00:00
parent f0a03ca337 fcc81f385e
commit 817b700ae0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_msrp.c
View File

@ -103,13 +103,14 @@ 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 int msrp_init_ssl() static void msrp_init_ssl()
{ {
const char *err = ""; const char *err = "";
@ -175,15 +176,11 @@ static int 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 1; return;
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);
@ -1147,6 +1144,11 @@ static void *SWITCH_THREAD_FUNC msrp_worker(switch_thread_t *thread, void *obj)
switch_os_socket_t sockdes = SWITCH_SOCK_INVALID; switch_os_socket_t sockdes = SWITCH_SOCK_INVALID;
int code = 0; int code = 0;
if (globals.ssl_ready != 1) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SSL not ready\n");
goto end;
}
switch_os_sock_get(&sockdes, csock->sock); switch_os_sock_get(&sockdes, csock->sock);
// switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "socket: %d\n", sockdes); // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "socket: %d\n", sockdes);
switch_assert(sockdes != SWITCH_SOCK_INVALID); switch_assert(sockdes != SWITCH_SOCK_INVALID);