diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 14:13:55 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 14:13:55 +0000 |
| commit | fc500f13557b87d4f2de37d2255ad7c27cd1ef98 (patch) | |
| tree | 98cf507b784eea6f2412627a8b45ad3496c99d8c /channels | |
| parent | edb41e9e7724a2fc0b2145e33c9484709786dc65 (diff) | |
(closes issue #9690)
Reported by: mattv
Make rtp timeouts work even if two RTP streams are directly bridged in the RTP stack.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@81331 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 54dc38262..6fe82e0dc 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15318,15 +15318,12 @@ restartsearch: ast_mutex_lock(&sip->lock); } if (sip->owner) { - if (!(ast_rtp_get_bridged(sip->rtp))) { - ast_log(LOG_NOTICE, - "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n", - sip->owner->name, - (long) (t - sip->lastrtprx)); - /* Issue a softhangup */ - ast_softhangup_nolock(sip->owner, AST_SOFTHANGUP_DEV); - } else - ast_log(LOG_NOTICE, "'%s' will not be disconnected in %ld seconds because it is directly bridged to another RTP stream\n", sip->owner->name, (long) (t - sip->lastrtprx)); + ast_log(LOG_NOTICE, + "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n", + sip->owner->name, + (long) (t - sip->lastrtprx)); + /* Issue a softhangup */ + ast_softhangup_nolock(sip->owner, AST_SOFTHANGUP_DEV); ast_channel_unlock(sip->owner); /* forget the timeouts for this call, since a hangup has already been requested and we don't want to |