diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0465cfc4e..4637678b8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -27613,7 +27613,20 @@ static int sip_set_udptl_peer(struct ast_channel *chan, struct ast_udptl *udptl) if (!p) { return -1; } + /* + * Lock both the pvt and it's owner safely. + */ sip_pvt_lock(p); + while (p->owner && ast_channel_trylock(p->owner)) { + sip_pvt_unlock(p); + usleep(1); + sip_pvt_lock(p); + } + + if (!p->owner) { + sip_pvt_unlock(p); + return 0; + } if (udptl) { ast_udptl_get_peer(udptl, &p->udptlredirip); } else { @@ -27632,6 +27645,7 @@ static int sip_set_udptl_peer(struct ast_channel *chan, struct ast_udptl *udptl) } /* Reset lastrtprx timer */ p->lastrtprx = p->lastrtptx = time(NULL); + ast_channel_unlock(p->owner); sip_pvt_unlock(p); return 0; } @@ -27748,12 +27762,25 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup) /* We are in early state */ return 0; - ast_channel_lock(chan); + /* + * Lock both the pvt and it's owner safely. + */ sip_pvt_lock(p); + while (p->owner && ast_channel_trylock(p->owner)) { + sip_pvt_unlock(p); + usleep(1); + sip_pvt_lock(p); + } + + if (!p->owner) { + sip_pvt_unlock(p); + return 0; + } + if (p->alreadygone) { /* If we're destroyed, don't bother */ + ast_channel_unlock(p->owner); sip_pvt_unlock(p); - ast_channel_unlock(chan); return 0; } @@ -27761,8 +27788,8 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i that are known to be behind a NAT, then stop the process now */ if (nat_active && !ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA_NAT)) { + ast_channel_unlock(p->owner); sip_pvt_unlock(p); - ast_channel_unlock(chan); return 0; } @@ -27804,8 +27831,8 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i } /* Reset lastrtprx timer */ p->lastrtprx = p->lastrtptx = time(NULL); + ast_channel_unlock(p->owner); sip_pvt_unlock(p); - ast_channel_unlock(chan); return 0; } |