kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle what happens during a masquerade in relation to group counting. (issue #9657 reported by ramonpeek)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@63285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-05-07 21:39:52 +00:00
parent 999633ab4f
commit 71befa9884
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app.c
View File

@@ -1113,6 +1113,20 @@ int ast_app_group_match_get_count(char *groupmatch, char *category)
return count;
}
int ast_app_group_update(struct ast_channel *old, struct ast_channel *new)
{
struct ast_group_info *gi = NULL;
AST_LIST_LOCK(&groups);
AST_LIST_TRAVERSE(&groups, gi, list) {
if (gi->chan == old)
gi->chan = new;
}
AST_LIST_UNLOCK(&groups);
return 0;
}
int ast_app_group_discard(struct ast_channel *chan)
{
struct ast_group_info *gi = NULL;

2
channel.c
View File

@@ -3106,7 +3106,7 @@ int ast_do_masquerade(struct ast_channel *original)
original->fds[x] = clone->fds[x];
}
/* Drop group from original */
ast_app_group_discard(original);
ast_app_group_update(clone, original);
clone_variables(original, clone);
AST_LIST_HEAD_INIT_NOLOCK(&clone->varshead);
/* Presense of ADSI capable CPE follows clone */

3
include/asterisk/app.h
View File

@@ -188,6 +188,9 @@ int ast_app_group_match_get_count(char *groupmatch, char *category);
/*! Discard all group counting for a channel */
int ast_app_group_discard(struct ast_channel *chan);
/*! Update all group counting for a channel to a new one */
int ast_app_group_update(struct ast_channel *old, struct ast_channel *new);
/*! Lock the group count list */
int ast_app_group_list_lock(void);