kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 19348 via svnmerge from

Browse Source 
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
This commit is contained in:
Kevin P. Fleming
2006-04-11 21:51:17 +00:00
parent 7bf8d36c8b
commit 1e9ac855d3
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_page.c
View File

@@ -1,7 +1,7 @@
/* /*
* Asterisk -- An open source telephony toolkit. * 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> * Mark Spencer <markster@digium.com>
* *
@@ -147,6 +147,7 @@ static int page_exec(struct ast_channel *chan, void *data)
struct ast_app *app; struct ast_app *app;
char *tmp; char *tmp;
int res=0; int res=0;
char originator[AST_CHANNEL_NAME];
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "This application requires at least one argument (destination(s) to page)\n"); 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); ast_app_parse_options(page_opts, &flags, NULL, options);
snprintf(meetmeopts, sizeof(meetmeopts), "%ud|%sqxdw", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m"); 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, "&"))) { while ((tech = strsep(&tmp, "&"))) {
/* don't call the originating device */
if (!strcasecmp(tech, originator))
continue;
if ((resource = strchr(tech, '/'))) { if ((resource = strchr(tech, '/'))) {
*resource++ = '\0'; *resource++ = '\0';
launch_page(chan, meetmeopts, tech, resource); 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); ast_log(LOG_WARNING, "Incomplete destination '%s' supplied.\n", tech);
} }
} }
if (!ast_test_flag(&flags, PAGE_QUIET)) { if (!ast_test_flag(&flags, PAGE_QUIET)) {
res = ast_streamfile(chan, "beep", chan->language); res = ast_streamfile(chan, "beep", chan->language);
if (!res) if (!res)