diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-11 19:51:10 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-11 19:51:10 +0000 |
commit | 03282c69bc5ea93213e0c8432eecb95c614b7a12 (patch) | |
tree | b7441a4d432165c86f101a434de1acdf9305f3e3 /main/rtp.c | |
parent | d1a280188a9a6228b0960541f84bb29e3f56cceb (diff) |
If the incoming RTP stream changes codec force the bridge to break if the other side does not support it.
(closes issue #11729)
Reported by: tsearle
Patches:
new_codec_patch_udiff.patch uploaded by tsearle (license 373)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@98325 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
-rw-r--r-- | main/rtp.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/main/rtp.c b/main/rtp.c index 6c47db511..dba41826a 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1062,6 +1062,10 @@ static int bridge_p2p_rtp_write(struct ast_rtp *rtp, struct ast_rtp *bridged, un /* Check what the payload value should be */ rtpPT = ast_rtp_lookup_pt(rtp, payload); + /* If the payload coming in is not one of the negotiated ones then send it to the core, this will cause formats to change and the bridge to break */ + if (!bridged->current_RTP_PT[payload].code) + return -1; + /* If the payload is DTMF, and we are listening for DTMF - then feed it into the core */ if (ast_test_flag(rtp, FLAG_P2P_NEED_DTMF) && !rtpPT.isAstFormat && rtpPT.code == AST_RTP_DTMF) return -1; @@ -3142,6 +3146,12 @@ static enum ast_bridge_result bridge_p2p_loop(struct ast_channel *c0, struct ast cs[1] = c1; cs[2] = NULL; for (;;) { + /* If the underlying formats have changed force this bridge to break */ + if ((c0->rawreadformat != c1->rawwriteformat) || (c1->rawreadformat != c0->rawwriteformat)) { + ast_log(LOG_DEBUG, "Oooh, formats changed, backing out\n"); + res = AST_BRIDGE_FAILED_NOWARN; + break; + } /* Check if anything changed */ if ((c0->tech_pvt != pvt0) || (c1->tech_pvt != pvt1) || |