diff options
| author | George Joseph <gjoseph@digium.com> | 2017-08-01 16:36:35 -0500 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-08-01 15:39:26 -0600 |
| commit | 6edefc9480dac80895eec53f19343933b5bd531e (patch) | |
| tree | dbe984e138bc1251344b06541183b3bfd818b24c /res | |
| parent | 8f51443a08e00335fbf83584d150edbac35c4a17 (diff) | |
Revert "res_pjsip_session: Release media resources on session end quicker."
This reverts commit 6c374d863c420d2519a52fffba3de5f935a30cdb.
Change-Id: Ia89836005df66ef540885afd6f171886de0db442
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_session.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 40b197bf7..bb349a4b6 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -1872,12 +1872,8 @@ static void session_destructor(void *obj) ast_taskprocessor_unreference(session->serializer); ao2_cleanup(session->datastores); - if (session->active_media_state) { - ast_sip_session_media_state_free(session->active_media_state); - } - if (session->pending_media_state) { - ast_sip_session_media_state_free(session->pending_media_state); - } + ast_sip_session_media_state_free(session->active_media_state); + ast_sip_session_media_state_free(session->pending_media_state); AST_LIST_HEAD_DESTROY(&session->supplements); while ((delay = AST_LIST_REMOVE_HEAD(&session->delayed_requests, next))) { @@ -3138,13 +3134,6 @@ static int session_end(void *vsession) iter->session_end(session); } } - - /* Release any media resources. */ - ast_sip_session_media_state_free(session->active_media_state); - session->active_media_state = NULL; - ast_sip_session_media_state_free(session->pending_media_state); - session->pending_media_state = NULL; - return 0; } |