diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2017-01-19 07:41:25 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2017-01-19 07:41:25 +0000 |
commit | 52bd651923fc669cd58007de4018cd6bdb94f329 (patch) | |
tree | 663e8575b34ae178240a4383bdab9cc8a8b00c6f /pjnath | |
parent | 8ac264258cc6242cade69f1c5964388bcfc76e15 (diff) |
Re #1513: Applied the new API pj_pool_safe_release().
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5534 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
-rw-r--r-- | pjnath/src/pjnath-test/ice_test.c | 6 | ||||
-rw-r--r-- | pjnath/src/pjnath-test/server.c | 6 | ||||
-rw-r--r-- | pjnath/src/pjnath/ice_session.c | 7 | ||||
-rw-r--r-- | pjnath/src/pjnath/stun_sock.c | 6 | ||||
-rw-r--r-- | pjnath/src/pjnath/turn_session.c | 6 | ||||
-rw-r--r-- | pjnath/src/pjnath/turn_sock.c | 4 |
6 files changed, 7 insertions, 28 deletions
diff --git a/pjnath/src/pjnath-test/ice_test.c b/pjnath/src/pjnath-test/ice_test.c index 80f8c480..98456aaa 100644 --- a/pjnath/src/pjnath-test/ice_test.c +++ b/pjnath/src/pjnath-test/ice_test.c @@ -402,11 +402,7 @@ static void destroy_sess(struct test_sess *sess, unsigned wait_msec) sess->server2 = NULL; } - if (sess->pool) { - pj_pool_t *pool = sess->pool; - sess->pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&sess->pool); } static void ice_on_rx_data(pj_ice_strans *ice_st, diff --git a/pjnath/src/pjnath-test/server.c b/pjnath/src/pjnath-test/server.c index 0205f4a0..c1644cae 100644 --- a/pjnath/src/pjnath-test/server.c +++ b/pjnath/src/pjnath-test/server.c @@ -254,11 +254,7 @@ void destroy_test_server(test_server *test_srv) test_srv->dns_server = NULL; } - if (test_srv->pool) { - pj_pool_t *pool = test_srv->pool; - test_srv->pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&test_srv->pool); } static pj_bool_t stun_on_data_recvfrom(pj_activesock_t *asock, diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c index ed4b055c..159d7b1d 100644 --- a/pjnath/src/pjnath/ice_session.c +++ b/pjnath/src/pjnath/ice_session.c @@ -461,11 +461,8 @@ static void ice_on_destroy(void *obj) { pj_ice_sess *ice = (pj_ice_sess*) obj; - if (ice->pool) { - pj_pool_t *pool = ice->pool; - ice->pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&ice->pool); + LOG4((THIS_FILE, "ICE session %p destroyed", ice)); } diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c index 5623a164..8aa6dc9a 100644 --- a/pjnath/src/pjnath/stun_sock.c +++ b/pjnath/src/pjnath/stun_sock.c @@ -474,11 +474,7 @@ static void stun_sock_destructor(void *obj) } */ - if (stun_sock->pool) { - pj_pool_t *pool = stun_sock->pool; - stun_sock->pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&stun_sock->pool); TRACE_(("", "STUN sock %p destroyed", stun_sock)); diff --git a/pjnath/src/pjnath/turn_session.c b/pjnath/src/pjnath/turn_session.c index d3ff6ced..fa3eea7b 100644 --- a/pjnath/src/pjnath/turn_session.c +++ b/pjnath/src/pjnath/turn_session.c @@ -328,12 +328,8 @@ static void turn_sess_on_destroy(void *comp) /* Destroy pool */ if (sess->pool) { - pj_pool_t *pool = sess->pool; - PJ_LOG(4,(sess->obj_name, "TURN client session destroyed")); - - sess->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&sess->pool); } } diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c index ef28803a..2f1680e6 100644 --- a/pjnath/src/pjnath/turn_sock.c +++ b/pjnath/src/pjnath/turn_sock.c @@ -217,10 +217,8 @@ static void turn_sock_on_destroy(void *comp) pj_turn_sock *turn_sock = (pj_turn_sock*) comp; if (turn_sock->pool) { - pj_pool_t *pool = turn_sock->pool; PJ_LOG(4,(turn_sock->obj_name, "TURN socket destroyed")); - turn_sock->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&turn_sock->pool); } } |