From 76c9d14bb2689561f77280dc77b250db57b5f181 Mon Sep 17 00:00:00 2001
From: BJ Weschke <bweschke@btwtech.com>
Date: Wed, 3 May 2006 22:25:08 +0000
Subject: [PATCH] Allow channels in ChanSpy to belong to mutiple spygroups
#7072 (anthm)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_chanspy.c | 30 +++++++++++++++++++++++-------
doc/channelvariables.txt | 5 +++++
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index d97c546d36..d42fc0c08d 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -73,7 +73,7 @@ static const char *desc =
" Options:\n"
" b - Only spy on channels involved in a bridged call.\n"
" g(grp) - Match only channels where their ${SPYGROUP} variable is set to\n"
-" 'grp'.\n"
+" contain 'grp' in an optional : delimited list.\n"
" q - Don't play a beep when beginning to spy on a channel.\n"
" r[(basename)] - Record the session to the monitor spool directory. An\n"
" optional base for the filename may be specified. The\n"
@@ -414,7 +414,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data)
spec = NULL;
}
}
-
+
if (options) {
char *opts[OPT_ARG_ARRAY_SIZE];
ast_app_parse_options(chanspy_opts, &flags, opts, options);
@@ -471,18 +471,34 @@ static int chanspy_exec(struct ast_channel *chan, void *data)
if (peer != chan) {
const char *group = NULL;
int igrp = 1;
-
+ char *groups[25] = {0};
+ int num_groups = 0;
+ char *dup_group;
+
if (peer == prev && !chosen) {
break;
}
chosen = 0;
- group = pbx_builtin_getvar_helper(peer, "SPYGROUP");
+
if (mygroup) {
- if (!group || strcmp(mygroup, group)) {
- igrp = 0;
+ int x;
+
+ if ((group = pbx_builtin_getvar_helper(peer, "SPYGROUP"))) {
+ dup_group = ast_strdupa(group);
+ num_groups = ast_app_separate_args(dup_group, ':', groups, sizeof(groups) / sizeof(groups[0]));
}
+
+ igrp = 0;
+ if (num_groups) {
+ for (x = 0; x < num_groups; x++) {
+ if (!strcmp(mygroup, groups[x])) {
+ igrp = 1;
+ break;
+ }
+ }
+ }
}
-
+
if (igrp && (!spec || ((strlen(spec) <= strlen(peer->name) &&
!strncasecmp(peer->name, spec, strlen(spec)))))) {
if (peer && (!bronly || ast_bridged_channel(peer)) &&
diff --git a/doc/channelvariables.txt b/doc/channelvariables.txt
index d2befa33bc..cff06d81e7 100644
--- a/doc/channelvariables.txt
+++ b/doc/channelvariables.txt
@@ -755,6 +755,11 @@ ${MACRO_CONTEXT} * The calling context
${MACRO_PRIORITY} * The calling priority
${MACRO_OFFSET} Offset to add to priority at return from macro
+The ChanSpy() application uses the following variables:
+---------------------------------------------------------
+${SPYGROUP} * A ':' (colon) separated list of group names.
+ (To be set on spied on channel and matched against the g(grp) option)
+
If you compile with OSP support, these variables are used:
---------------------------------------------------------
${OSPINHANDLE} OSP handle of in_bound call
--
GitLab