devs/cproof
1
2
Fork 1
Code Issues 42 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Refactor roster.c

Browse Source
This commit is contained in:
James Booth
2013-05-22 21:43:06 +01:00
parent 15c7820594
commit 2842b423d1
1 changed files with 63 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/xmpp/roster.c
View File

@@ -33,12 +33,8 @@
#include "xmpp/stanza.h" #include "xmpp/stanza.h"
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
#define HANDLE(type, func) xmpp_handler_add(conn, func, XMPP_NS_ROSTER, STANZA_NAME_IQ, type, ctx) #define HANDLE(type, func) xmpp_handler_add(conn, func, XMPP_NS_ROSTER, \
STANZA_NAME_IQ, type, ctx)
static int _roster_handle_push(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
static int _roster_handle_result(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
// nicknames // nicknames
static Autocomplete name_ac; static Autocomplete name_ac;
@@ -55,7 +51,17 @@ static GHashTable *contacts;
// nickname to jid map // nickname to jid map
static GHashTable *name_to_barejid; static GHashTable *name_to_barejid;
// event handlers
static int _roster_handle_push(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
static int _roster_handle_result(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
// helper functions // helper functions
static void _add_name_and_barejid(const char * const name,
const char * const barejid);
static void _replace_name(const char * const current_name,
const char * const new_name, const char * const barejid);
static gboolean _key_equals(void *key1, void *key2); static gboolean _key_equals(void *key1, void *key2);
static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2); static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2);
@@ -86,7 +92,8 @@ roster_init(void)
fulljid_ac = autocomplete_new(); fulljid_ac = autocomplete_new();
contacts = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, g_free, contacts = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, g_free,
(GDestroyNotify)p_contact_free); (GDestroyNotify)p_contact_free);
name_to_barejid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); name_to_barejid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
g_free);
} }
void void
@@ -99,7 +106,8 @@ roster_clear(void)
contacts = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, g_free, contacts = g_hash_table_new_full(g_str_hash, (GEqualFunc)_key_equals, g_free,
(GDestroyNotify)p_contact_free); (GDestroyNotify)p_contact_free);
g_hash_table_destroy(name_to_barejid); g_hash_table_destroy(name_to_barejid);
name_to_barejid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); name_to_barejid = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
g_free);
} }
void void
@@ -128,15 +136,8 @@ roster_add(const char * const barejid, const char * const name,
if (contact == NULL) { if (contact == NULL) {
contact = p_contact_new(barejid, name, subscription, NULL, pending_out); contact = p_contact_new(barejid, name, subscription, NULL, pending_out);
g_hash_table_insert(contacts, strdup(barejid), contact); g_hash_table_insert(contacts, strdup(barejid), contact);
if (name != NULL) {
autocomplete_add(name_ac, strdup(name));
g_hash_table_insert(name_to_barejid, strdup(name), strdup(barejid));
} else {
autocomplete_add(name_ac, strdup(barejid));
g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid));
}
autocomplete_add(barejid_ac, strdup(barejid)); autocomplete_add(barejid_ac, strdup(barejid));
_add_name_and_barejid(name, barejid);
added = TRUE; added = TRUE;
} }
@@ -155,36 +156,14 @@ roster_update(const char * const barejid, const char * const name,
p_contact_set_subscription(contact, subscription); p_contact_set_subscription(contact, subscription);
p_contact_set_pending_out(contact, pending_out); p_contact_set_pending_out(contact, pending_out);
const char * const new_handle = name; const char * const new_name = name;
const char * current_handle = NULL; const char * current_name = NULL;
if (p_contact_name(contact) != NULL) { if (p_contact_name(contact) != NULL) {
current_handle = strdup(p_contact_name(contact)); current_name = strdup(p_contact_name(contact));
} }
p_contact_set_name(contact, new_handle); p_contact_set_name(contact, new_name);
_replace_name(current_name, new_name, barejid);
// current handle exists already
if (current_handle != NULL) {
autocomplete_remove(name_ac, current_handle);
g_hash_table_remove(name_to_barejid, current_handle);
if (new_handle != NULL) {
autocomplete_add(name_ac, strdup(new_handle));
g_hash_table_insert(name_to_barejid, strdup(new_handle), strdup(barejid));
} else {
autocomplete_add(name_ac, strdup(barejid));
g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid));
}
// no current handle
} else {
if (new_handle != NULL) {
autocomplete_remove(name_ac, barejid);
g_hash_table_remove(name_to_barejid, barejid);
autocomplete_add(name_ac, strdup(new_handle));
g_hash_table_insert(name_to_barejid, strdup(new_handle), strdup(barejid));
}
}
} }
} }
@@ -199,7 +178,6 @@ roster_update_presence(const char * const barejid, Resource *resource,
if (contact == NULL) { if (contact == NULL) {
return FALSE; return FALSE;
} }
if (!_datetimes_equal(p_contact_last_activity(contact), last_activity)) { if (!_datetimes_equal(p_contact_last_activity(contact), last_activity)) {
p_contact_set_last_activity(contact, last_activity); p_contact_set_last_activity(contact, last_activity);
} }
@@ -216,6 +194,7 @@ roster_contact_offline(const char * const barejid,
const char * const resource, const char * const status) const char * const resource, const char * const status)
{ {
PContact contact = g_hash_table_lookup(contacts, barejid); PContact contact = g_hash_table_lookup(contacts, barejid);
if (contact == NULL) { if (contact == NULL) {
return FALSE; return FALSE;
} }
@@ -244,29 +223,7 @@ roster_change_name(const char * const barejid, const char * const new_name)
if (contact != NULL) { if (contact != NULL) {
p_contact_set_name(contact, new_name); p_contact_set_name(contact, new_name);
_replace_name(current_name, new_name, barejid);
// current name exists already
if (current_name != NULL) {
autocomplete_remove(name_ac, current_name);
g_hash_table_remove(name_to_barejid, current_name);
if (new_name != NULL) {
autocomplete_add(name_ac, strdup(new_name));
g_hash_table_insert(name_to_barejid, strdup(new_name), strdup(barejid));
} else {
autocomplete_add(name_ac, strdup(barejid));
g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid));
}
// no current name
} else {
if (new_name != NULL) {
autocomplete_remove(name_ac, barejid);
g_hash_table_remove(name_to_barejid, barejid);
autocomplete_add(name_ac, strdup(new_name));
g_hash_table_insert(name_to_barejid, strdup(new_name), strdup(barejid));
}
}
xmpp_conn_t * const conn = connection_get_conn(); xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx(); xmpp_ctx_t * const ctx = connection_get_ctx();
@@ -414,13 +371,17 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
// handle initial roster response // handle initial roster response
if (g_strcmp0(id, "roster") == 0) { if (g_strcmp0(id, "roster") == 0) {
xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza,
STANZA_NAME_QUERY);
xmpp_stanza_t *item = xmpp_stanza_get_children(query); xmpp_stanza_t *item = xmpp_stanza_get_children(query);
while (item != NULL) { while (item != NULL) {
const char *barejid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID); const char *barejid =
const char *name = xmpp_stanza_get_attribute(item, STANZA_ATTR_NAME); xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
const char *sub = xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION); const char *name =
xmpp_stanza_get_attribute(item, STANZA_ATTR_NAME);
const char *sub =
xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION);
gboolean pending_out = FALSE; gboolean pending_out = FALSE;
const char *ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK); const char *ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK);
@@ -437,13 +398,43 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
item = xmpp_stanza_get_next(item); item = xmpp_stanza_get_next(item);
} }
contact_presence_t conn_presence = accounts_get_login_presence(jabber_get_account_name()); contact_presence_t conn_presence =
accounts_get_login_presence(jabber_get_account_name());
presence_update(conn_presence, NULL, 0); presence_update(conn_presence, NULL, 0);
} }
return 1; return 1;
} }
static void
_add_name_and_barejid(const char * const name, const char * const barejid)
{
if (name != NULL) {
autocomplete_add(name_ac, strdup(name));
g_hash_table_insert(name_to_barejid, strdup(name), strdup(barejid));
} else {
autocomplete_add(name_ac, strdup(barejid));
g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid));
}
}
static void
_replace_name(const char * const current_name, const char * const new_name,
const char * const barejid)
{
// current handle exists already
if (current_name != NULL) {
autocomplete_remove(name_ac, current_name);
g_hash_table_remove(name_to_barejid, current_name);
_add_name_and_barejid(new_name, barejid);
// no current handle
} else if (new_name != NULL) {
autocomplete_remove(name_ac, barejid);
g_hash_table_remove(name_to_barejid, barejid);
_add_name_and_barejid(new_name, barejid);
}
}
static static
gboolean _key_equals(void *key1, void *key2) gboolean _key_equals(void *key1, void *key2)
{ {