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

Merge branch 'master' into otrsmp

Browse Source
This commit is contained in:
James Booth
2014-05-07 19:32:25 +01:00
parent aa0d4fe892 143c5a3493
commit 9fd9871ee9
5 changed files with 174 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/muc.c
View File

@@ -34,6 +34,7 @@ typedef struct _muc_room_t {
char *nick; // e.g. Some User char *nick; // e.g. Some User
char *password; char *password;
char *subject; char *subject;
GList *pending_broadcasts;
gboolean autojoin; gboolean autojoin;
gboolean pending_nick_change; gboolean pending_nick_change;
GHashTable *roster; GHashTable *roster;
@@ -144,6 +145,7 @@ muc_join_room(const char * const room, const char * const nick,
new_room->password = NULL; new_room->password = NULL;
} }
new_room->subject = NULL; new_room->subject = NULL;
new_room->pending_broadcasts = NULL;
new_room->roster = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, new_room->roster = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)p_contact_free); (GDestroyNotify)p_contact_free);
new_room->nick_ac = autocomplete_new(); new_room->nick_ac = autocomplete_new();
@@ -202,6 +204,65 @@ muc_room_is_autojoin(const char * const room)
} }
} }
void
muc_set_subject(const char * const room, const char * const subject)
{
if (rooms != NULL) {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room != NULL) {
if (chat_room->subject != NULL) {
free(chat_room->subject);
}
chat_room->subject = strdup(subject);
}
}
}
char *
muc_get_subject(const char * const room)
{
if (rooms != NULL) {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room != NULL) {
return chat_room->subject;
} else {
return NULL;
}
} else {
return NULL;
}
}
void
muc_add_pending_broadcast(const char * const room, const char * const message)
{
if (rooms != NULL) {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room != NULL) {
chat_room->pending_broadcasts = g_list_append(chat_room->pending_broadcasts, strdup(message));
}
}
}
GList *
muc_get_pending_broadcasts(const char * const room)
{
if (rooms != NULL) {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room != NULL) {
return chat_room->pending_broadcasts;
} else {
return NULL;
}
} else {
return NULL;
}
}
char * char *
muc_get_old_nick(const char * const room, const char * const new_nick) muc_get_old_nick(const char * const room, const char * const new_nick)
{ {
@@ -523,6 +584,9 @@ _free_room(ChatRoom *room)
g_hash_table_remove_all(room->nick_changes); g_hash_table_remove_all(room->nick_changes);
} }
free(room); free(room);
if (room->pending_broadcasts != NULL) {
g_list_free_full(room->pending_broadcasts, free);
}
} }
} }

5
src/muc.h
View File

@@ -71,4 +71,9 @@ void muc_reset_invites_ac(void);
char* muc_find_invite(char *search_str); char* muc_find_invite(char *search_str);
void muc_clear_invites(void); void muc_clear_invites(void);
void muc_set_subject(const char * const room, const char * const subject);
char * muc_get_subject(const char * const room);
void muc_add_pending_broadcast(const char * const room, const char * const message);
GList * muc_get_pending_broadcasts(const char * const room);
#endif #endif

32
src/server_events.c
View File

@@ -174,15 +174,22 @@ void
handle_room_broadcast(const char *const room_jid, handle_room_broadcast(const char *const room_jid,
const char * const message) const char * const message)
{ {
ui_room_broadcast(room_jid, message); if (muc_get_roster_received(room_jid)) {
ui_current_page_off(); ui_room_broadcast(room_jid, message);
ui_current_page_off();
} else {
muc_add_pending_broadcast(room_jid, message);
}
} }
void void
handle_room_subject(const char * const room_jid, const char * const subject) handle_room_subject(const char * const room_jid, const char * const subject)
{ {
ui_room_subject(room_jid, subject); muc_set_subject(room_jid, subject);
ui_current_page_off(); if (muc_get_roster_received(room_jid)) {
ui_room_subject(room_jid, subject);
ui_current_page_off();
}
} }
void void
@@ -451,7 +458,22 @@ handle_room_roster_complete(const char * const room)
muc_set_roster_received(room); muc_set_roster_received(room);
GList *roster = muc_get_roster(room); GList *roster = muc_get_roster(room);
ui_room_roster(room, roster, NULL); ui_room_roster(room, roster, NULL);
ui_current_page_off();
char *subject = muc_get_subject(room);
if (subject != NULL) {
ui_room_subject(room, subject);
ui_current_page_off();
}
GList *pending_broadcasts = muc_get_pending_broadcasts(room);
if (pending_broadcasts != NULL) {
GList *curr = pending_broadcasts;
while (curr != NULL) {
ui_room_broadcast(room, curr->data);
curr = g_list_next(curr);
}
ui_current_page_off();
}
} }
void void

43
src/xmpp/presence.c
View File

@@ -336,7 +336,10 @@ _presence_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
xmpp_stanza_t *error_stanza = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR); xmpp_stanza_t *error_stanza = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR);
xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X);
char *xmlns = xmpp_stanza_get_ns(x); char *xmlns = NULL;
if (x != NULL) {
xmlns = xmpp_stanza_get_ns(x);
}
char *type = NULL; char *type = NULL;
if (error_stanza != NULL) { if (error_stanza != NULL) {
type = xmpp_stanza_get_attribute(error_stanza, STANZA_ATTR_TYPE); type = xmpp_stanza_get_attribute(error_stanza, STANZA_ATTR_TYPE);
@@ -664,8 +667,8 @@ _muc_user_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
return 1; return 1;
} }
char *room = from_jid->barejid; char *from_room = from_jid->barejid;
char *nick = from_jid->resourcepart; char *from_nick = from_jid->resourcepart;
// handle self presence // handle self presence
if (stanza_is_muc_self_presence(stanza, jabber_get_fulljid())) { if (stanza_is_muc_self_presence(stanza, jabber_get_fulljid())) {
@@ -676,19 +679,19 @@ _muc_user_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
// leave room if not self nick change // leave room if not self nick change
if (new_nick != NULL) { if (new_nick != NULL) {
muc_set_room_pending_nick_change(room, new_nick); muc_set_room_pending_nick_change(from_room, new_nick);
} else { } else {
handle_leave_room(room); handle_leave_room(from_room);
} }
// handle self nick change // handle self nick change
} else if (muc_is_room_pending_nick_change(room)) { } else if (muc_is_room_pending_nick_change(from_room)) {
muc_complete_room_nick_change(room, nick); muc_complete_room_nick_change(from_room, from_nick);
handle_room_nick_change(room, nick); handle_room_nick_change(from_room, from_nick);
// handle roster complete // handle roster complete
} else if (!muc_get_roster_received(room)) { } else if (!muc_get_roster_received(from_room)) {
handle_room_roster_complete(room); handle_room_roster_complete(from_room);
} }
// handle presence from room members // handle presence from room members
@@ -711,28 +714,28 @@ _muc_user_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
if (stanza_is_room_nick_change(stanza)) { if (stanza_is_room_nick_change(stanza)) {
char *new_nick = stanza_get_new_nick(stanza); char *new_nick = stanza_get_new_nick(stanza);
if (new_nick != NULL) { if (new_nick != NULL) {
muc_set_roster_pending_nick_change(room, new_nick, nick); muc_set_roster_pending_nick_change(from_room, new_nick, from_nick);
free(new_nick); free(new_nick);
} }
} else { } else {
handle_room_member_offline(room, nick, "offline", status_str); handle_room_member_offline(from_room, from_nick, "offline", status_str);
} }
} else { } else {
char *show_str = stanza_get_show(stanza, "online"); char *show_str = stanza_get_show(stanza, "online");
if (!muc_get_roster_received(room)) { if (!muc_get_roster_received(from_room)) {
muc_add_to_roster(room, nick, show_str, status_str, caps_key); muc_add_to_roster(from_room, from_nick, show_str, status_str, caps_key);
} else { } else {
char *old_nick = muc_complete_roster_nick_change(room, nick); char *old_nick = muc_complete_roster_nick_change(from_room, from_nick);
if (old_nick != NULL) { if (old_nick != NULL) {
muc_add_to_roster(room, nick, show_str, status_str, caps_key); muc_add_to_roster(from_room, from_nick, show_str, status_str, caps_key);
handle_room_member_nick_change(room, old_nick, nick); handle_room_member_nick_change(from_room, old_nick, from_nick);
free(old_nick); free(old_nick);
} else { } else {
if (!muc_nick_in_roster(room, nick)) { if (!muc_nick_in_roster(from_room, from_nick)) {
handle_room_member_online(room, nick, show_str, status_str, caps_key); handle_room_member_online(from_room, from_nick, show_str, status_str, caps_key);
} else { } else {
handle_room_member_presence(room, nick, show_str, status_str, caps_key); handle_room_member_presence(from_room, from_nick, show_str, status_str, caps_key);
} }
} }
} }

145
src/xmpp/stanza.c
View File

@@ -634,127 +634,92 @@ gboolean
stanza_is_muc_self_presence(xmpp_stanza_t * const stanza, stanza_is_muc_self_presence(xmpp_stanza_t * const stanza,
const char * const self_jid) const char * const self_jid)
{ {
if (stanza == NULL) { // no stanza, or not presence stanza
return FALSE; if ((stanza == NULL) || (g_strcmp0(xmpp_stanza_get_name(stanza), STANZA_NAME_PRESENCE) != 0)) {
}
if (strcmp(xmpp_stanza_get_name(stanza), STANZA_NAME_PRESENCE) != 0) {
return FALSE; return FALSE;
} }
xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); // muc user namespaced x element
xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER);
if (x != NULL) {
if (x == NULL) { // check for status child element with 110 code
return FALSE; xmpp_stanza_t *x_children = xmpp_stanza_get_children(x);
} while (x_children != NULL) {
if (g_strcmp0(xmpp_stanza_get_name(x_children), STANZA_NAME_STATUS) == 0) {
char *ns = xmpp_stanza_get_ns(x); char *code = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_CODE);
if (ns == NULL) { if (g_strcmp0(code, "110") == 0) {
return FALSE; return TRUE;
} }
if (strcmp(ns, STANZA_NS_MUC_USER) != 0) {
return FALSE;
}
xmpp_stanza_t *x_children = xmpp_stanza_get_children(x);
if (x_children == NULL) {
return FALSE;
}
while (x_children != NULL) {
if (strcmp(xmpp_stanza_get_name(x_children), STANZA_NAME_STATUS) == 0) {
char *code = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_CODE);
if (strcmp(code, "110") == 0) {
return TRUE;
} }
x_children = xmpp_stanza_get_next(x_children);
} }
x_children = xmpp_stanza_get_next(x_children);
}
// for older server that don't send status 110 // check for item child element with jid property
x_children = xmpp_stanza_get_children(x); xmpp_stanza_t *item = xmpp_stanza_get_child_by_name(x, STANZA_NAME_ITEM);
while (x_children != NULL) { if (item != NULL) {
if (strcmp(xmpp_stanza_get_name(x_children), STANZA_NAME_ITEM) == 0) { char *jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
char *jid = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_JID);
if (jid != NULL) { if (jid != NULL) {
if (g_str_has_prefix(jid, self_jid)) { if (g_str_has_prefix(self_jid, jid)) {
return TRUE; return TRUE;
} }
} }
} }
x_children = xmpp_stanza_get_next(x_children);
}
// for servers that don't send status 110 or Jid property // check if 'from' attribute identifies this user
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
// first check if 'from' attribute identifies this user if (from != NULL) {
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); Jid *from_jid = jid_create(from);
if (from != NULL) { if (muc_room_is_active(from_jid->barejid)) {
Jid *jidp = jid_create(from); char *nick = muc_get_room_nick(from_jid->barejid);
if (muc_room_is_active(jidp->barejid)) { if (g_strcmp0(from_jid->resourcepart, nick) == 0) {
char *nick = muc_get_room_nick(jidp->barejid);
if (g_strcmp0(jidp->resourcepart, nick) == 0) {
return TRUE;
}
}
jid_destroy(jidp);
}
// secondly check if the new nickname maps to a pending nick change for this user
if (from != NULL) {
Jid *jidp = jid_create(from);
if (muc_is_room_pending_nick_change(jidp->barejid)) {
char *new_nick = jidp->resourcepart;
if (new_nick != NULL) {
char *nick = muc_get_room_nick(jidp->barejid);
char *old_nick = muc_get_old_nick(jidp->barejid, new_nick);
if (g_strcmp0(old_nick, nick) == 0) {
return TRUE; return TRUE;
} }
} }
// check if a new nickname maps to a pending nick change for this user
if (muc_is_room_pending_nick_change(from_jid->barejid)) {
char *new_nick = from_jid->resourcepart;
if (new_nick != NULL) {
char *nick = muc_get_room_nick(from_jid->barejid);
char *old_nick = muc_get_old_nick(from_jid->barejid, new_nick);
if (g_strcmp0(old_nick, nick) == 0) {
return TRUE;
}
}
}
jid_destroy(from_jid);
} }
jid_destroy(jidp);
} }
// self presence not found
return FALSE; return FALSE;
} }
gboolean gboolean
stanza_is_room_nick_change(xmpp_stanza_t * const stanza) stanza_is_room_nick_change(xmpp_stanza_t * const stanza)
{ {
if (stanza == NULL) { // no stanza, or not presence stanza
return FALSE; if ((stanza == NULL) || (g_strcmp0(xmpp_stanza_get_name(stanza), STANZA_NAME_PRESENCE) != 0)) {
}
if (strcmp(xmpp_stanza_get_name(stanza), STANZA_NAME_PRESENCE) != 0) {
return FALSE; return FALSE;
} }
xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); // muc user namespaced x element
xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER);
if (x != NULL) {
if (x == NULL) { // check for status child element with 303 code
return FALSE; xmpp_stanza_t *x_children = xmpp_stanza_get_children(x);
} while (x_children != NULL) {
if (g_strcmp0(xmpp_stanza_get_name(x_children), STANZA_NAME_STATUS) == 0) {
char *ns = xmpp_stanza_get_ns(x); char *code = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_CODE);
if (ns == NULL) { if (g_strcmp0(code, "303") == 0) {
return FALSE; return TRUE;
} }
if (strcmp(ns, STANZA_NS_MUC_USER) != 0) {
return FALSE;
}
xmpp_stanza_t *x_children = xmpp_stanza_get_children(x);
if (x_children == NULL) {
return FALSE;
}
while (x_children != NULL) {
if (strcmp(xmpp_stanza_get_name(x_children), STANZA_NAME_STATUS) == 0) {
char *code = xmpp_stanza_get_attribute(x_children, STANZA_ATTR_CODE);
if (strcmp(code, "303") == 0) {
return TRUE;
} }
x_children = xmpp_stanza_get_next(x_children);
} }
x_children = xmpp_stanza_get_next(x_children);
} }
return FALSE; return FALSE;