Fix call forwarding for analog phones.

(closes issue #16440)
Reported by: mmichelson

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@235382 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 707a9b21a4d54aa8c3fc9e3434bbdd2af627297f..ac592e9d454f14ee98c4509782bf8d4d667c1c35 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8685,7 +8685,9 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
                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;

diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index aa0d441c9ff6712aa5889ece6e98f8d1f1ce729b..e31e656bc836471644b7884e517c831c827a5185 100644 (file)
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -402,6 +402,7 @@ static struct ast_channel * analog_new_ast_channel(struct analog_pvt *p, int sta
        }
 
        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;