diff options
| author | Matt O'Gorman <mogorman@digium.com> | 2006-06-06 17:25:07 +0000 |
|---|---|---|
| committer | Matt O'Gorman <mogorman@digium.com> | 2006-06-06 17:25:07 +0000 |
| commit | c7dbc3c166ed9a913128b44d2fd824d721df0892 (patch) | |
| tree | 993dfac1775d63a0e7af2fefafc880446974d44d /res/res_jabber.c | |
| parent | 63a271eb55c9b10b7b2d53352e61fc49db1fe310 (diff) | |
fixed autoregister bug.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_jabber.c')
| -rw-r--r-- | res/res_jabber.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 1dcce5de7..a5cd7c420 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -1584,23 +1584,23 @@ static int aji_filter_roster(void *data, ikspak *pak) }); if (!flag) { - if (ast_test_flag(client, AJI_AUTOPRUNE)) { - buddy = (struct aji_buddy *) malloc(sizeof(struct aji_buddy)); - if (!buddy) - ast_log(LOG_WARNING, "Out of memory\n"); - memset(buddy, 0, sizeof(struct aji_buddy)); - ASTOBJ_INIT(buddy); - ASTOBJ_WRLOCK(buddy); - ast_copy_string(buddy->name, iks_find_attrib(x, "jid"), sizeof(buddy->name)); - ast_copy_string(buddy->user, iks_find_attrib(x, "jid"), sizeof(buddy->user)); - ast_clear_flag(buddy, AST_FLAGS_ALL); + buddy = (struct aji_buddy *) malloc(sizeof(struct aji_buddy)); + if (!buddy) + ast_log(LOG_WARNING, "Out of memory\n"); + memset(buddy, 0, sizeof(struct aji_buddy)); + ASTOBJ_INIT(buddy); + ASTOBJ_WRLOCK(buddy); + ast_copy_string(buddy->name, iks_find_attrib(x, "jid"), sizeof(buddy->name)); + ast_clear_flag(buddy, AST_FLAGS_ALL); + if(ast_test_flag(client, AJI_AUTOPRUNE)) { ast_set_flag(buddy, AJI_AUTOPRUNE); buddy->objflags |= ASTOBJ_FLAG_MARKED; - ASTOBJ_UNLOCK(buddy); - if (buddy) { - ASTOBJ_CONTAINER_LINK(&client->buddies, buddy); - ASTOBJ_UNREF(buddy, aji_buddy_destroy); - } + } else + ast_set_flag(buddy, AJI_AUTOREGISTER); + ASTOBJ_UNLOCK(buddy); + if (buddy) { + ASTOBJ_CONTAINER_LINK(&client->buddies, buddy); + ASTOBJ_UNREF(buddy, aji_buddy_destroy); } } } |