diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-10-02 00:58:31 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-10-02 00:58:31 +0000 |
| commit | 6868babd229a635c5fd89c7b284025a92e0a3f9d (patch) | |
| tree | 25a4ee6dff29d18acfdfbbc42485333db7aa5311 /apps/app_parkandannounce.c | |
| parent | b201da1a3eb1cae654cdd3fe89ef8f9e55dd0b83 (diff) | |
Huge callerid rework (might break H.323, others)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3874 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_parkandannounce.c')
| -rwxr-xr-x | apps/app_parkandannounce.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c index c3f949ec3..269ee1fde 100755 --- a/apps/app_parkandannounce.c +++ b/apps/app_parkandannounce.c @@ -6,9 +6,9 @@ * With TONS of help from Mark! * * Asterisk is Copyrighted as follows - * Copyright (C) 1999, Mark Spencer + * Copyright (C) 1999-2004, Digium, Inc. * - * Mark Spencer <markster@linux-support.net> + * Mark Spencer <markster@digium.com> * * This program is free software, distributed under the terms of * the GNU General Public License @@ -142,8 +142,8 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data) if(option_verbose > 2) { - ast_verbose( VERBOSE_PREFIX_3 "Return Context: (%s,%s,%d) ID: %s\n", chan->context,chan->exten, chan->priority, chan->callerid); - if(!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid)) { + ast_verbose( VERBOSE_PREFIX_3 "Return Context: (%s,%s,%d) ID: %s\n", chan->context,chan->exten, chan->priority, chan->cid.cid_num); + if(!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) { ast_verbose( VERBOSE_PREFIX_3 "Warning: Return Context Invalid, call will return to default|s\n"); } } @@ -161,7 +161,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data) /* Now place the call to the extention */ - dchan = ast_request_and_dial(dialtech, AST_FORMAT_SLINEAR, dialstr,30000, &outstate, chan->callerid); + dchan = ast_request_and_dial(dialtech, AST_FORMAT_SLINEAR, dialstr,30000, &outstate, chan->cid.cid_num, chan->cid.cid_name); if(dchan) { if(dchan->_state == AST_STATE_UP) { |