diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-23 18:11:35 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-23 18:11:35 +0000 |
| commit | 1c5a6ef3233fa9bf85bcbfe031b62cdfa22d80ba (patch) | |
| tree | d32736695425ccfece59b07a068e2f09b143316a /channels | |
| parent | 4d95ba4e58120493d348df784f10f24ed5482a0f (diff) | |
Merged revisions 170505 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r170505 | file | 2009-01-23 14:09:45 -0400 (Fri, 23 Jan 2009) | 11 lines
Merged revisions 170504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r170504 | file | 2009-01-23 14:04:08 -0400 (Fri, 23 Jan 2009) | 4 lines
Use the on hold flag to see if the call is on hold or not. It is possible that our address for them will still be valid even though they are on hold.
(closes issue #14295)
Reported by: klaus3000
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170507 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 92e8f1e6d..df80ff1ee 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -20143,7 +20143,7 @@ static void check_rtp_timeout(struct sip_pvt *dialog, time_t t) /* Might be a timeout now -- see if we're on hold */ struct sockaddr_in sin; ast_rtp_get_peer(dialog->rtp, &sin); - if (sin.sin_addr.s_addr || (ast_rtp_get_rtpholdtimeout(dialog->rtp) && + if (!ast_test_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD) || (ast_rtp_get_rtpholdtimeout(dialog->rtp) && (t > dialog->lastrtprx + ast_rtp_get_rtpholdtimeout(dialog->rtp)))) { /* Needs a hangup */ if (ast_rtp_get_rtptimeout(dialog->rtp)) { |