diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-11 21:51:17 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-11 21:51:17 +0000 |
| commit | 1e9ac855d3b08ca227d9bceddd7e6ff595fbfc16 (patch) | |
| tree | 1d8ffe911be1bb94ff0108d61b594bedbd4a5b3b /apps | |
| parent | 7bf8d36c8b5f6e767128bc0d6f3f133f84ec5bb2 (diff) | |
Merged revisions 19348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r19348 | kpfleming | 2006-04-11 16:50:18 -0500 (Tue, 11 Apr 2006) | 2 lines
don't call the originating device as part of the Page() operation (issue #6932)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_page.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/apps/app_page.c b/apps/app_page.c index 8bd52d144..11d90cb21 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (c) 2004 - 2005 Digium, Inc. All rights reserved. + * Copyright (c) 2004 - 2006 Digium, Inc. All rights reserved. * * Mark Spencer <markster@digium.com> * @@ -147,6 +147,7 @@ static int page_exec(struct ast_channel *chan, void *data) struct ast_app *app; char *tmp; int res=0; + char originator[AST_CHANNEL_NAME]; if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "This application requires at least one argument (destination(s) to page)\n"); @@ -171,7 +172,16 @@ static int page_exec(struct ast_channel *chan, void *data) ast_app_parse_options(page_opts, &flags, NULL, options); snprintf(meetmeopts, sizeof(meetmeopts), "%ud|%sqxdw", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m"); + + ast_copy_string(originator, chan->name, sizeof(originator)); + if ((tmp = strchr(originator, '-'))) + *tmp = '\0'; + while ((tech = strsep(&tmp, "&"))) { + /* don't call the originating device */ + if (!strcasecmp(tech, originator)) + continue; + if ((resource = strchr(tech, '/'))) { *resource++ = '\0'; launch_page(chan, meetmeopts, tech, resource); @@ -179,6 +189,7 @@ static int page_exec(struct ast_channel *chan, void *data) ast_log(LOG_WARNING, "Incomplete destination '%s' supplied.\n", tech); } } + if (!ast_test_flag(&flags, PAGE_QUIET)) { res = ast_streamfile(chan, "beep", chan->language); if (!res) |