Merged revisions 161948 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 9 Dec 2008 14:57:39 +0000 (14:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 9 Dec 2008 14:57:39 +0000 (14:57 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r161948 | russell | 2008-12-09 08:52:25 -0600 (Tue, 09 Dec 2008) | 15 lines

Fix a problem with GROUP() settings on a masquerade.

The previous code carried over group settings from the old channel to the new
one.  However, it did nothing with the group settings that were already on the
new channel.  This patch removes all group settings that already existed on the
new channel.

I have a more complicated version of this patch which addresses only the most
blatant problem with this, which is that a channel can end up with multiple
group settings in the same category.  However, I could not think of a use case
for keeping any of the group settings from the old channel, so I went this route
for now.

(closes AST-152)

........

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

main/app.c

index 2d1b897..aecbffa 100644 (file)
@@ -1010,10 +1010,15 @@ int ast_app_group_update(struct ast_channel *old, struct ast_channel *new)
        struct ast_group_info *gi = NULL;
 
        AST_RWLIST_WRLOCK(&groups);
-       AST_RWLIST_TRAVERSE(&groups, gi, list) {
-               if (gi->chan == old)
+       AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) {
+               if (gi->chan == old) {
                        gi->chan = new;
+               } else if (gi->chan == new) {
+                       AST_RWLIST_REMOVE_CURRENT(list);
+                       ast_free(gi);
+               }
        }
+       AST_RWLIST_TRAVERSE_SAFE_END
        AST_RWLIST_UNLOCK(&groups);
 
        return 0;