kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 338417 via svnmerge from

Browse Source 
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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Gregory Nietsky
2011-09-29 12:22:43 +00:00
parent 383b073966
commit c4a7d0e2c7
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/sip/include/sip.h
View File

@@ -1072,6 +1072,8 @@ struct sip_pvt {
time_t lastrtprx; /*!< Last RTP received */
time_t lastrtptx; /*!< Last RTP sent */
int rtptimeout; /*!< RTP timeout time */
int rtpholdtimeout; /*!< RTP timeout time on hold*/
int rtpkeepalive; /*!< RTP send packets for keepalive */
struct ast_ha *directmediaha; /*!< Which IPs are allowed to interchange direct media with this peer - copied from sip_peer */
struct ast_sockaddr recv; /*!< Received as */
struct ast_sockaddr ourip; /*!< Our IP (as seen from the outside) */