diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-02-01 01:53:25 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-02-01 01:53:25 +0000 |
commit | d2d81ca374445d48290038fb3e15c42689115ec9 (patch) | |
tree | 8ba40ca8d9138e7c86afc4ac13996c33ee5cdb63 /apps | |
parent | bd8ff1abcbd05f49bcb0f015d3034ce3eff26b72 (diff) |
Allow hints to have names (bug #3471)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4938 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/app_dial.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 0c155a907..2e8264753 100755 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -217,6 +217,26 @@ static int ast_onedigit_goto(struct ast_channel *chan, char *context, char exten } +static char *get_cid_name(char *name, int namelen, struct ast_channel *chan) +{ + char *context; + char *exten; + if (!ast_strlen_zero(chan->macrocontext)) + context = chan->macrocontext; + else + context = chan->context; + + if (!ast_strlen_zero(chan->macroexten)) + exten = chan->macroexten; + else + exten = chan->exten; + + if (ast_get_hint(NULL, 0, name, namelen, chan, context, exten)) + return name; + else + return ""; +} + static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localuser *outgoing, int *to, struct ast_flags *peerflags, int *sentringing, char *status, size_t statussize, int busystart, int nochanstart, int congestionstart, int *result) { struct localuser *o; @@ -235,6 +255,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu int single; struct ast_channel *winner; char *context = NULL; + char cidname[AST_MAX_EXTENSION]; single = (outgoing && !outgoing->next && !ast_test_flag(outgoing, DIAL_MUSICONHOLD | DIAL_RINGBACKONLY)); @@ -382,7 +403,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu numnochan++; } else { /* After calling, set callerid to extension */ - ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, NULL, NULL); + ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, get_cid_name(cidname, sizeof(cidname), in), NULL); } } /* Hangup the original channel now, in case we needed it */ @@ -558,6 +579,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags int cause; char numsubst[AST_MAX_EXTENSION]; char restofit[AST_MAX_EXTENSION]; + char cidname[AST_MAX_EXTENSION]; char *transfer = NULL; char *newnum; char *l; @@ -991,7 +1013,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags } else { if (option_verbose > 2) 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); + ast_set_callerid(tmp->chan, ast_strlen_zero(chan->macroexten) ? chan->exten : chan->macroexten, get_cid_name(cidname, sizeof(cidname), chan), NULL); } /* Put them in the list of outgoing thingies... We're ready now. XXX If we're forcibly removed, these outgoing calls won't get |