diff options
| -rw-r--r-- | channels/chan_sip.c | 61 |
1 files changed, 39 insertions, 22 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c8987a00a..b03a3e34d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5870,6 +5870,38 @@ static void copy_socket_data(struct sip_socket *to_sock, const struct sip_socket *to_sock = *from_sock; } +/*! Cleanup the RTP and SRTP portions of a dialog + * + * \note This procedure excludes vsrtp as it is initialized differently. + */ +static void dialog_clean_rtp(struct sip_pvt *p) +{ + if (p->rtp) { + ast_rtp_instance_destroy(p->rtp); + p->rtp = NULL; + } + + if (p->vrtp) { + ast_rtp_instance_destroy(p->vrtp); + p->vrtp = NULL; + } + + if (p->trtp) { + ast_rtp_instance_destroy(p->trtp); + p->trtp = NULL; + } + + if (p->srtp) { + ast_sdp_srtp_destroy(p->srtp); + p->srtp = NULL; + } + + if (p->tsrtp) { + ast_sdp_srtp_destroy(p->tsrtp); + p->tsrtp = NULL; + } +} + /*! \brief Initialize DTLS-SRTP support on an RTP instance */ static int dialog_initialize_dtls_srtp(const struct sip_pvt *dialog, struct ast_rtp_instance *rtp, struct ast_sdp_srtp **srtp) { @@ -5917,6 +5949,9 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog) return 0; } + /* Make sure previous RTP instances/FD's do not leak */ + dialog_clean_rtp(dialog); + ast_sockaddr_copy(&bindaddr_tmp, &bindaddr); if (!(dialog->rtp = ast_rtp_instance_new(dialog->engine, sched, &bindaddr_tmp, NULL))) { return -1; @@ -6593,18 +6628,10 @@ static void sip_pvt_dtor(void *vdoomed) ast_free(p->notify); p->notify = NULL; } - if (p->rtp) { - ast_rtp_instance_destroy(p->rtp); - p->rtp = NULL; - } - if (p->vrtp) { - ast_rtp_instance_destroy(p->vrtp); - p->vrtp = NULL; - } - if (p->trtp) { - ast_rtp_instance_destroy(p->trtp); - p->trtp = NULL; - } + + /* Free RTP and SRTP instances */ + dialog_clean_rtp(p); + if (p->udptl) { ast_udptl_destroy(p->udptl); p->udptl = NULL; @@ -6637,21 +6664,11 @@ static void sip_pvt_dtor(void *vdoomed) destroy_msg_headers(p); - if (p->srtp) { - ast_sdp_srtp_destroy(p->srtp); - p->srtp = NULL; - } - if (p->vsrtp) { ast_sdp_srtp_destroy(p->vsrtp); p->vsrtp = NULL; } - if (p->tsrtp) { - ast_sdp_srtp_destroy(p->tsrtp); - p->tsrtp = NULL; - } - if (p->directmediaacl) { p->directmediaacl = ast_free_acl_list(p->directmediaacl); } |