diff options
author | phsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-24 17:52:02 +0000 |
---|---|---|
committer | phsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-24 17:52:02 +0000 |
commit | 5a62c4d43ac70f5c7e059424f4dbf31a9b34c966 (patch) | |
tree | 80600f391997679bdab1887ab98d00f78c28abba /res/res_jabber.c | |
parent | dfd32b125efd0aae7f5de2ecc4d27e43e5fd868d (diff) |
Merged revisions 124872 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r124872 | phsultan | 2008-06-24 19:50:22 +0200 (Tue, 24 Jun 2008) | 6 lines
Subscribe to buddy's presence only if we really need to. That is, if
the corresponding roster item has a subscription value set to "none"
or "from".
Make the code more readable.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124873 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_jabber.c')
-rw-r--r-- | res/res_jabber.c | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 85a33328d..98a21c6ab 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -2137,26 +2137,33 @@ static int aji_filter_roster(void *data, ikspak *pak) ASTOBJ_UNLOCK(iterator); }); - if (!flag) { - buddy = ast_calloc(1, sizeof(*buddy)); - if (!buddy) { - ast_log(LOG_WARNING, "Out of memory\n"); - return 0; - } - ASTOBJ_INIT(buddy); - ASTOBJ_WRLOCK(buddy); - ast_copy_string(buddy->name, iks_find_attrib(x, "jid"), sizeof(buddy->name)); - ast_clear_flag(&buddy->flags, AST_FLAGS_ALL); - if(ast_test_flag(&client->flags, AJI_AUTOPRUNE)) { - ast_set_flag(&buddy->flags, AJI_AUTOPRUNE); - ASTOBJ_MARK(buddy); - } else - ast_set_flag(&buddy->flags, AJI_AUTOREGISTER); - ASTOBJ_UNLOCK(buddy); - if (buddy) { - ASTOBJ_CONTAINER_LINK(&client->buddies, buddy); - ASTOBJ_UNREF(buddy, aji_buddy_destroy); - } + if (flag) { + /* found buddy, don't create a new one */ + x = iks_next(x); + continue; + } + + buddy = ast_calloc(1, sizeof(*buddy)); + if (!buddy) { + ast_log(LOG_WARNING, "Out of memory\n"); + return 0; + } + ASTOBJ_INIT(buddy); + ASTOBJ_WRLOCK(buddy); + ast_copy_string(buddy->name, iks_find_attrib(x, "jid"), sizeof(buddy->name)); + ast_clear_flag(&buddy->flags, AST_FLAGS_ALL); + if(ast_test_flag(&client->flags, AJI_AUTOPRUNE)) { + ast_set_flag(&buddy->flags, AJI_AUTOPRUNE); + ASTOBJ_MARK(buddy); + } else if (!iks_strcmp(iks_find_attrib(x, "subscription"), "none") || !iks_strcmp(iks_find_attrib(x, "subscription"), "from")) { + /* subscribe to buddy's presence only + if we really need to */ + ast_set_flag(&buddy->flags, AJI_AUTOREGISTER); + } + ASTOBJ_UNLOCK(buddy); + if (buddy) { + ASTOBJ_CONTAINER_LINK(&client->buddies, buddy); + ASTOBJ_UNREF(buddy, aji_buddy_destroy); } } x = iks_next(x); |