[asterisk-commits] russell: branch 1.6.0 r119840 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jun  2 15:08:48 2008
New Revision: 119840

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

................
r119839 | russell | 2008-06-02 15:08:24 -0500 (Mon, 02 Jun 2008) | 15 lines

Merged revisions 119838 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119838 | russell | 2008-06-02 15:08:04 -0500 (Mon, 02 Jun 2008) | 7 lines

Revert a change made for issue #12479.  This change caused a regression such that
a dial string such as (IAX2/foo) did not automatically fall back to dialing the 's'
extension anymore.

(closes issue #12779)
Reported by: dagmoller

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=119840&r1=119839&r2=119840
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Mon Jun  2 15:08:48 2008
@@ -3487,10 +3487,7 @@
 	}
 
 	if (!pds.exten) {
-		if (!ast_strlen_zero(c->exten))
-			pds.exten = c->exten;
-		else
-			pds.exten = defaultrdest;
+		pds.exten = defaultrdest;
 	}
 
 	if (create_addr(pds.peer, c, &sin, &cai)) {