don't call the originating device as part of the Page() operation (issue #6932)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@19348 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_page.c b/apps/app_page.c
index 7826d285bee573788e8fd2d14f8639a2af5979ed..6898bfa27ee04504b9527a96f3a57373fb6d2d61 100644 (file)
--- 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>
  *
@@ -149,6 +149,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");
@@ -175,7 +176,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);
@@ -183,6 +193,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)