Don't delete RTP if there is a channel, even if we get REGISTER/SUBSCRIBE (bug #4534)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
716a669818
commit
9f136f57fe
|
@ -9488,19 +9488,11 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
|
|||
p->expiry = max_expiry;
|
||||
}
|
||||
/* Go ahead and free RTP port */
|
||||
if (p->rtp) {
|
||||
if (p->owner) {
|
||||
p->owner->fds[0] = -1;
|
||||
p->owner->fds[1] = -1;
|
||||
}
|
||||
if (p->rtp && !p->owner) {
|
||||
ast_rtp_destroy(p->rtp);
|
||||
p->rtp = NULL;
|
||||
}
|
||||
if (p->vrtp) {
|
||||
if (p->owner) {
|
||||
p->owner->fds[2] = -1;
|
||||
p->owner->fds[3] = -1;
|
||||
}
|
||||
if (p->vrtp && !p->owner) {
|
||||
ast_rtp_destroy(p->vrtp);
|
||||
p->vrtp = NULL;
|
||||
}
|
||||
|
@ -9526,19 +9518,11 @@ static int handle_request_register(struct sip_pvt *p, struct sip_request *req, i
|
|||
ast_log(LOG_NOTICE, "Registration from '%s' failed for '%s'\n", get_header(req, "To"), ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
|
||||
if (res < 1) {
|
||||
/* Go ahead and free RTP port */
|
||||
if (p->rtp) {
|
||||
if (p->owner) {
|
||||
p->owner->fds[0] = -1;
|
||||
p->owner->fds[1] = -1;
|
||||
}
|
||||
if (p->rtp && !p->owner) {
|
||||
ast_rtp_destroy(p->rtp);
|
||||
p->rtp = NULL;
|
||||
}
|
||||
if (p->vrtp) {
|
||||
if (p->owner) {
|
||||
p->owner->fds[2] = -1;
|
||||
p->owner->fds[3] = -1;
|
||||
}
|
||||
if (p->vrtp && !p->owner) {
|
||||
ast_rtp_destroy(p->vrtp);
|
||||
p->vrtp = NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue