[asterisk-commits] juggie: branch juggie/NoLossCDR r78604 - in /team/juggie/NoLossCDR: ./ configs/

[SVN commits to the Asterisk project]

Author: juggie
Date: Wed Aug  8 09:44:48 2007
New Revision: 78604

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78604
Log:
Merged revisions 78579 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/CDRfix5

........
r78579 | automerge | 2007-08-08 10:28:18 -0400 (Wed, 08 Aug 2007) | 1 line

automerge commit
........

Modified:
    team/juggie/NoLossCDR/   (props changed)
    team/juggie/NoLossCDR/configs/sip.conf.sample

Propchange: team/juggie/NoLossCDR/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/juggie/NoLossCDR/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug  8 09:44:48 2007
@@ -1,1 +1,1 @@
-/team/group/CDRfix5:1-78564
+/team/group/CDRfix5:1-78603

Modified: team/juggie/NoLossCDR/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/juggie/NoLossCDR/configs/sip.conf.sample?view=diff&rev=78604&r1=78603&r2=78604
==============================================================================
--- team/juggie/NoLossCDR/configs/sip.conf.sample (original)
+++ team/juggie/NoLossCDR/configs/sip.conf.sample Wed Aug  8 09:44:48 2007
@@ -403,7 +403,8 @@
 				; the call directly with media peer-2-peer without re-invites.
 				; Will not work for video and cases where the callee sends 
 				; RTP payloads and fmtp headers in the 200 OK that does not match the
-				; callers INVITE.
+				; callers INVITE. This will also fail if canreinvite is enabled when
+				; the device is actually behind NAT.
 
 ;canreinvite=nonat		; An additional option is to allow media path redirection
 				; (reinvite) but only when the peer where the media is being