fixed autoregister bug.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-06-06 17:25:07 +00:00
parent 63a271eb55
commit c7dbc3c166

View File

@@ -1584,23 +1584,23 @@ static int aji_filter_roster(void *data, ikspak *pak)
}); });
if (!flag) { if (!flag) {
if (ast_test_flag(client, AJI_AUTOPRUNE)) { buddy = (struct aji_buddy *) malloc(sizeof(struct aji_buddy));
buddy = (struct aji_buddy *) malloc(sizeof(struct aji_buddy)); if (!buddy)
if (!buddy) ast_log(LOG_WARNING, "Out of memory\n");
ast_log(LOG_WARNING, "Out of memory\n"); memset(buddy, 0, sizeof(struct aji_buddy));
memset(buddy, 0, sizeof(struct aji_buddy)); ASTOBJ_INIT(buddy);
ASTOBJ_INIT(buddy); ASTOBJ_WRLOCK(buddy);
ASTOBJ_WRLOCK(buddy); ast_copy_string(buddy->name, iks_find_attrib(x, "jid"), sizeof(buddy->name));
ast_copy_string(buddy->name, iks_find_attrib(x, "jid"), sizeof(buddy->name)); ast_clear_flag(buddy, AST_FLAGS_ALL);
ast_copy_string(buddy->user, iks_find_attrib(x, "jid"), sizeof(buddy->user)); if(ast_test_flag(client, AJI_AUTOPRUNE)) {
ast_clear_flag(buddy, AST_FLAGS_ALL);
ast_set_flag(buddy, AJI_AUTOPRUNE); ast_set_flag(buddy, AJI_AUTOPRUNE);
buddy->objflags |= ASTOBJ_FLAG_MARKED; buddy->objflags |= ASTOBJ_FLAG_MARKED;
ASTOBJ_UNLOCK(buddy); } else
if (buddy) { ast_set_flag(buddy, AJI_AUTOREGISTER);
ASTOBJ_CONTAINER_LINK(&client->buddies, buddy); ASTOBJ_UNLOCK(buddy);
ASTOBJ_UNREF(buddy, aji_buddy_destroy); if (buddy) {
} ASTOBJ_CONTAINER_LINK(&client->buddies, buddy);
ASTOBJ_UNREF(buddy, aji_buddy_destroy);
} }
} }
} }