From 6ecfe392a3daf839c8fbe19e99c7e5d69448c36b Mon Sep 17 00:00:00 2001 From: lmadsen Date: Wed, 28 Oct 2009 20:17:06 +0000 Subject: Merged revisions 226384 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r226384 | lmadsen | 2009-10-28 15:11:07 -0500 (Wed, 28 Oct 2009) | 17 lines Merged revisions 226382 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r226382 | lmadsen | 2009-10-28 15:06:13 -0500 (Wed, 28 Oct 2009) | 9 lines Update documentation in sip.conf.sample. Update the documentation in sip.conf.sample in order to make it more clear that directmedia/canreinvite do not cause Asterisk to ignore reINVITEs. It is only used to stop Asterisk from generating a reINVITE, but does not stop it from accepting them if necessary. (closes issue #15644) Reported by: lmadsen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@226387 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/sip.conf.sample | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configs') diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 17629ea64..fc35ecbff 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -592,6 +592,13 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; callers INVITE. This will also fail if canreinvite is enabled when ; the device is actually behind NAT. + ; Additionally this option does not disable all reINVITE operations. + ; It only controls Asterisk generating reINVITEs for the specific + ; purpose of setting up a direct media path. If a reINVITE is + ; needed to switch a media stream to inactive (when placed on + ; hold) or to T.38, it will still be done, regardless of this + ; setting. + ;canreinvite=nonat ; An additional option is to allow media path redirection ; (reinvite) but only when the peer where the media is being ; sent is known to not be behind a NAT (as the RTP core can -- cgit v1.2.3