diff options
| author | Gregory Nietsky <gregory@distrotech.co.za> | 2011-09-29 12:22:43 +0000 |
|---|---|---|
| committer | Gregory Nietsky <gregory@distrotech.co.za> | 2011-09-29 12:22:43 +0000 |
| commit | c4a7d0e2c715172405ce5aaef70a3198b0dce33e (patch) | |
| tree | 0bcbed05ab70ae7863c6b6a6a470dd6487c71587 /channels/sip | |
| parent | 383b0739669d284900efe6f3f01b9648548770b0 (diff) | |
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
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip')
| -rw-r--r-- | channels/sip/include/sip.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index baec6eee2..fc75ff4fa 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -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) */ |