This commit is contained in:
Anthony Minessale 2016-02-18 11:44:16 -06:00
parent 3242dc58ef
commit a1fff59c25
2 changed files with 7 additions and 1 deletions

View File

@ -1113,6 +1113,7 @@ static void attach_jsock(jsock_t *jsock)
switch_core_hash_delete(globals.jsock_hash, jsock->uuid_str); switch_core_hash_delete(globals.jsock_hash, jsock->uuid_str);
ws_write_json(jp, &msg, SWITCH_TRUE); ws_write_json(jp, &msg, SWITCH_TRUE);
cJSON_Delete(msg); cJSON_Delete(msg);
jp->nodelete = 1;
jp->drop = 1; jp->drop = 1;
} }
} }
@ -1126,6 +1127,10 @@ static void attach_jsock(jsock_t *jsock)
static void detach_jsock(jsock_t *jsock) static void detach_jsock(jsock_t *jsock)
{ {
if (jsock->nodelete) {
return;
}
switch_mutex_lock(globals.jsock_mutex); switch_mutex_lock(globals.jsock_mutex);
switch_core_hash_delete(globals.jsock_hash, jsock->uuid_str); switch_core_hash_delete(globals.jsock_hash, jsock->uuid_str);
switch_mutex_unlock(globals.jsock_mutex); switch_mutex_unlock(globals.jsock_mutex);

View File

@ -112,7 +112,8 @@ struct jsock_s {
struct passwd pw; struct passwd pw;
#endif #endif
int drop; uint8_t drop;
uint8_t nodelete;
ws_socket_t local_sock; ws_socket_t local_sock;
SSL *ssl; SSL *ssl;