[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r338470 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu Sep 29 07:49:47 2011
New Revision: 338470

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338470
Log:
Merged revisions 338435 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r338435 | irroot | 2011-09-29 14:22:43 +0200 (Thu, 29 Sep 2011) | 26 lines
  
  Merged revisions 338417 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/10
  
  ................
    r338417 | irroot | 2011-09-29 14:16:42 +0200 (Thu, 29 Sep 2011) | 19 lines
    
    Merged revisions 338416 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r338416 | irroot | 2011-09-29 14:13:05 +0200 (Thu, 29 Sep 2011) | 12 lines
      
      The rtptimeout setting is ignored on a per peer basis.
      
      Not only is the rtptimeout ignored in some cases but 
      rtpkeepalive and rtpholdtimeout is affected.
      
      this commit also removes rtptimeout/rtpholdtimeout on
      text rtp.
      
      (closes issue ASTERISK-18559)
      
      Review: https://reviewboard.asterisk.org/r/1452
    ........
  ................
................

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 29 07:49:47 2011
@@ -1,1 +1,1 @@
-/trunk:1-338428
+/trunk:1-338468

Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=338470&r1=338469&r2=338470
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Thu Sep 29 07:49:47 2011
@@ -5100,8 +5100,7 @@
 		if (!(dialog->trtp = ast_rtp_instance_new(dialog->engine, sched, &bindaddr_tmp, NULL))) {
 			return -1;
 		}
-		ast_rtp_instance_set_timeout(dialog->trtp, dialog->rtptimeout);
-		ast_rtp_instance_set_hold_timeout(dialog->trtp, dialog->rtpholdtimeout);
+		/* Do not timeout text as its not constant*/
 		ast_rtp_instance_set_keepalive(dialog->trtp, dialog->rtpkeepalive);
 
 		ast_rtp_instance_set_prop(dialog->trtp, AST_RTP_PROPERTY_RTCP, 1);