kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a regression from direct media ACLs where the directrtpsetup option no longer works.

Browse Source 
A check was added for direct media ACLs that immediately forbid remote bridging if there
was no bridged channel. This caused directrtpsetup to no longer function as it needs this
information before bridging actually occurs.

Logic has now been adjusted so if there is no bridged channel a remote bridge will still
be attempted.

(closes issue ASTERISK-20511)
Reported by: kristoff

Review: https://reviewboard.asterisk.org/r/2146/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@374456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2012-10-04 17:39:18 +00:00
parent 2075c52a31
commit 3a013aab68
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
channels/chan_sip.c
View File

@@ -29370,22 +29370,22 @@ static enum ast_rtp_glue_result sip_get_rtp_peer(struct ast_channel *chan, struc
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
if (!(opp_chan = ast_bridged_channel(chan))) { if ((opp_chan = ast_bridged_channel(chan)) && (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
return AST_RTP_GLUE_RESULT_FORBID; (!(opp = opp_chan->tech_pvt)))) {
} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
(!(opp = opp_chan->tech_pvt))) {
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
sip_pvt_lock(p); sip_pvt_lock(p);
while (sip_pvt_trylock(opp)) { while (opp && sip_pvt_trylock(opp)) {
sip_pvt_unlock(p); sip_pvt_unlock(p);
usleep(1); usleep(1);
sip_pvt_lock(p); sip_pvt_lock(p);
} }
if (!(p->rtp)) { if (!(p->rtp)) {
if (opp) {
sip_pvt_unlock(opp); sip_pvt_unlock(opp);
}
sip_pvt_unlock(p); sip_pvt_unlock(p);
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
@@ -29395,7 +29395,7 @@ static enum ast_rtp_glue_result sip_get_rtp_peer(struct ast_channel *chan, struc
if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) { if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) {
res = AST_RTP_GLUE_RESULT_REMOTE; res = AST_RTP_GLUE_RESULT_REMOTE;
if (!apply_directmedia_ha(p, opp, "audio")) { if (opp && !apply_directmedia_ha(p, opp, "audio")) {
res = AST_RTP_GLUE_RESULT_FORBID; res = AST_RTP_GLUE_RESULT_FORBID;
} }
} else if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA_NAT)) { } else if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA_NAT)) {
@@ -29404,7 +29404,9 @@ static enum ast_rtp_glue_result sip_get_rtp_peer(struct ast_channel *chan, struc
res = AST_RTP_GLUE_RESULT_FORBID; res = AST_RTP_GLUE_RESULT_FORBID;
} }
if (opp) {
sip_pvt_unlock(opp); sip_pvt_unlock(opp);
}
if (p->srtp) { if (p->srtp) {
res = AST_RTP_GLUE_RESULT_FORBID; res = AST_RTP_GLUE_RESULT_FORBID;
@@ -29426,22 +29428,22 @@ static enum ast_rtp_glue_result sip_get_vrtp_peer(struct ast_channel *chan, stru
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
if (!(opp_chan = ast_bridged_channel(chan))) { if ((opp_chan = ast_bridged_channel(chan)) && (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
return AST_RTP_GLUE_RESULT_FORBID; (!(opp = opp_chan->tech_pvt)))) {
} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
(!(opp = opp_chan->tech_pvt))) {
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
sip_pvt_lock(p); sip_pvt_lock(p);
while (sip_pvt_trylock(opp)) { while (opp && sip_pvt_trylock(opp)) {
sip_pvt_unlock(p); sip_pvt_unlock(p);
usleep(1); usleep(1);
sip_pvt_lock(p); sip_pvt_lock(p);
} }
if (!(p->vrtp)) { if (!(p->vrtp)) {
if (opp) {
sip_pvt_unlock(opp); sip_pvt_unlock(opp);
}
sip_pvt_unlock(p); sip_pvt_unlock(p);
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
@@ -29451,12 +29453,14 @@ static enum ast_rtp_glue_result sip_get_vrtp_peer(struct ast_channel *chan, stru
if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) { if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) {
res = AST_RTP_GLUE_RESULT_REMOTE; res = AST_RTP_GLUE_RESULT_REMOTE;
if (!apply_directmedia_ha(p, opp, "video")) { if (opp && !apply_directmedia_ha(p, opp, "video")) {
res = AST_RTP_GLUE_RESULT_FORBID; res = AST_RTP_GLUE_RESULT_FORBID;
} }
} }
if (opp) {
sip_pvt_unlock(opp); sip_pvt_unlock(opp);
}
sip_pvt_unlock(p); sip_pvt_unlock(p);
return res; return res;
@@ -29473,22 +29477,22 @@ static enum ast_rtp_glue_result sip_get_trtp_peer(struct ast_channel *chan, stru
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
if (!(opp_chan = ast_bridged_channel(chan))) { if ((opp_chan = ast_bridged_channel(chan)) && (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
return AST_RTP_GLUE_RESULT_FORBID; (!(opp = opp_chan->tech_pvt)))) {
} else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
(!(opp = opp_chan->tech_pvt))) {
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
sip_pvt_lock(p); sip_pvt_lock(p);
while (sip_pvt_trylock(opp)) { while (opp && sip_pvt_trylock(opp)) {
sip_pvt_unlock(p); sip_pvt_unlock(p);
usleep(1); usleep(1);
sip_pvt_lock(p); sip_pvt_lock(p);
} }
if (!(p->trtp)) { if (!(p->trtp)) {
if (opp) {
sip_pvt_unlock(opp); sip_pvt_unlock(opp);
}
sip_pvt_unlock(p); sip_pvt_unlock(p);
return AST_RTP_GLUE_RESULT_FORBID; return AST_RTP_GLUE_RESULT_FORBID;
} }
@@ -29498,12 +29502,14 @@ static enum ast_rtp_glue_result sip_get_trtp_peer(struct ast_channel *chan, stru
if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) { if (ast_test_flag(&p->flags[0], SIP_DIRECT_MEDIA)) {
res = AST_RTP_GLUE_RESULT_REMOTE; res = AST_RTP_GLUE_RESULT_REMOTE;
if (!apply_directmedia_ha(p, opp, "text")) { if (opp && !apply_directmedia_ha(p, opp, "text")) {
res = AST_RTP_GLUE_RESULT_FORBID; res = AST_RTP_GLUE_RESULT_FORBID;
} }
} }
if (opp) {
sip_pvt_unlock(opp); sip_pvt_unlock(opp);
}
sip_pvt_unlock(p); sip_pvt_unlock(p);
return res; return res;