From 6be95a8a8a6f4d3fdffca6811403a02cd894a933 Mon Sep 17 00:00:00 2001
From: Philippe Sultan <philippe.sultan@gmail.com>
Date: Tue, 24 Jun 2008 17:50:22 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@124872 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
res/res_jabber.c | 47 +++++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 20 deletions(-)
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 85a33328d1..98a21c6ab4 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);
--
GitLab