kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 13:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 63286 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r63286 | file | 2007-05-07 17:45:01 -0400 (Mon, 07 May 2007) | 10 lines

Merged revisions 63285 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63285 | file | 2007-05-07 17:39:52 -0400 (Mon, 07 May 2007) | 2 lines

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

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-05-07 21:47:08 +00:00
parent b6ef87dbf3
commit 5394364048
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asterisk/app.h
View File

@@ -227,6 +227,9 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category);
/*! Discard all group counting for a channel */ /*! Discard all group counting for a channel */
int ast_app_group_discard(struct ast_channel *chan); 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 */ /*! Lock the group count list */
int ast_app_group_list_lock(void); int ast_app_group_list_lock(void);

14
main/app.c
View File

@@ -894,6 +894,20 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category)
return count; 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) int ast_app_group_discard(struct ast_channel *chan)
{ {
struct ast_group_info *gi = NULL; struct ast_group_info *gi = NULL;

2
main/channel.c
View File

@@ -3575,7 +3575,7 @@ int ast_do_masquerade(struct ast_channel *original)
original->fds[x] = clone->fds[x]; original->fds[x] = clone->fds[x];
} }
ast_app_group_discard(original); ast_app_group_update(clone, original);
/* move any whisperer over */ /* move any whisperer over */
ast_channel_whisper_stop(original); ast_channel_whisper_stop(original);