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_osplookup.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_osplookup.c')
| -rwxr-xr-x | apps/app_osplookup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 55216d4eb..4110d740b 100755 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -1,11 +1,11 @@ /* * Asterisk -- A telephony toolkit for Linux. * - * Time of day - Report the time of day + * Open Settlement Protocol Lookup * - * 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 @@ -110,7 +110,7 @@ static int osplookup_exec(struct ast_channel *chan, void *data) } LOCAL_USER_ADD(u); ast_log(LOG_DEBUG, "Whoo hoo, looking up OSP on '%s' via '%s'\n", temp, provider ? provider : "<default>"); - if ((res = ast_osp_lookup(chan, provider, temp, chan->callerid, &result)) > 0) { + if ((res = ast_osp_lookup(chan, provider, temp, chan->cid.cid_num, &result)) > 0) { char tmp[80]; snprintf(tmp, sizeof(tmp), "%d", result.handle); pbx_builtin_setvar_helper(chan, "OSPHANDLE", tmp); @@ -127,7 +127,7 @@ static int osplookup_exec(struct ast_channel *chan, void *data) } if (!res) { /* Look for a "busy" place */ - if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid)) + if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) chan->priority += 100; } else if (res > 0) res = 0; @@ -171,7 +171,7 @@ static int ospnext_exec(struct ast_channel *chan, void *data) } if (!res) { /* Look for a "busy" place */ - if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid)) + if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) chan->priority += 100; } else if (res > 0) res = 0; @@ -218,7 +218,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data) } if (!res) { /* Look for a "busy" place */ - if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid)) + if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) chan->priority += 100; } else if (res > 0) res = 0; |