diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-19 14:49:39 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-19 14:49:39 +0000 |
| commit | 20a72b1e76ee251c0f6cf77f93c7d7dcbaf53bfd (patch) | |
| tree | f9fe890a6277a20d30319c4acb5a1513871d955f | |
| parent | da000f521f4a9ad0bb59f3987ef083142bbe6740 (diff) | |
Merged revisions 195449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r195449 | file | 2009-05-19 11:43:54 -0300 (Tue, 19 May 2009) | 14 lines
Merged revisions 195448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r195448 | file | 2009-05-19 11:41:45 -0300 (Tue, 19 May 2009) | 7 lines
Fix a bug where direct RTP setup would partially occur even when disabled if the calling channel was answered.
(issue #13545)
Reported by: davidw
(issue #14244)
Reported by: mbnwa
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@195452 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8e4fd7ac6..f992f833d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -24072,7 +24072,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc return -1; /* Disable early RTP bridge */ - if (chan->_state != AST_STATE_UP && !sip_cfg.directrtpsetup) /* We are in early state */ + if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup) /* We are in early state */ return 0; sip_pvt_lock(p); |