Give outbound channels callerid of their extension *after* calling (bug #2489)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Mark Spencer 21 years ago
parent 0b4862c822
commit b6b393c1b9

@ -336,6 +336,9 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
ast_hangup(o->chan); ast_hangup(o->chan);
o->chan = NULL; o->chan = NULL;
numnochan++; numnochan++;
} else {
/* After calling, set callerid to extension */
ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, NULL, NULL);
} }
} }
/* Hangup the original channel now, in case we needed it */ /* Hangup the original channel now, in case we needed it */
@ -912,9 +915,11 @@ static int dial_exec(struct ast_channel *chan, void *data)
tmp->chan = NULL; tmp->chan = NULL;
cur = rest; cur = rest;
continue; continue;
} else } else {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst); ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
ast_set_callerid(tmp->chan, ast_strlen_zero(chan->macroexten) ? chan->exten : chan->macroexten, NULL, NULL);
}
/* Put them in the list of outgoing thingies... We're ready now. /* Put them in the list of outgoing thingies... We're ready now.
XXX If we're forcibly removed, these outgoing calls won't get XXX If we're forcibly removed, these outgoing calls won't get
hung up XXX */ hung up XXX */

Loading…
Cancel
Save