[asterisk-commits] jpeeler: trunk r235382 - in /trunk/channels: chan_dahdi.c sig_analog.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Dec 16 18:52:03 2009
New Revision: 235382

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=235382
Log:
Fix call forwarding for analog phones.

(closes issue #16440)
Reported by: mmichelson

Modified:
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_analog.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=235382&r1=235381&r2=235382
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Dec 16 18:52:03 2009
@@ -8685,7 +8685,9 @@
 		tmp->amaflags = i->amaflags;
 	i->subs[idx].owner = tmp;
 	ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
-	ast_string_field_set(tmp, call_forward, i->call_forward);
+	if (!analog_lib_handles(i->sig, i->radio, i->oprmode)) {
+		ast_string_field_set(tmp, call_forward, i->call_forward);
+	}
 	/* If we've been told "no ADSI" then enforce it */
 	if (!i->adsi)
 		tmp->adsicpe = AST_ADSI_UNAVAILABLE;

Modified: trunk/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.c?view=diff&rev=235382&r1=235381&r2=235382
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Wed Dec 16 18:52:03 2009
@@ -402,6 +402,7 @@
 	}
 
 	c = p->calls->new_ast_channel(p->chan_pvt, state, startpbx, sub, requestor);
+	ast_string_field_set(c, call_forward, p->call_forward);
 	p->subs[sub].owner = c;
 	if (!p->owner) {
 		p->owner = c;