[asterisk-commits] file: branch 1.6.0 r170506 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Jan 23 12:10:41 2009
New Revision: 170506

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170506
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=170506&r1=170505&r2=170506
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Jan 23 12:10:41 2009
@@ -19164,7 +19164,7 @@
 		/* 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)) {