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

Moved connection_error_handler to _presence_error_handler

Browse Source
This commit is contained in:
James Booth
2014-01-27 21:42:34 +00:00
parent f26686aeca
commit da94dcf3cf
3 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/xmpp/connection.c
View File

@@ -322,49 +322,6 @@ _connection_free_session_data(void)
presence_clear_sub_requests();
}
int
connection_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
{
xmpp_ctx_t *ctx = connection_get_ctx();
gchar *err_msg = NULL;
gchar *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 *text_stanza = xmpp_stanza_get_child_by_name(error_stanza, STANZA_NAME_TEXT);
if (error_stanza == NULL) {
log_debug("error message without <error/> received");
} else {
// check for text
if (text_stanza != NULL) {
err_msg = xmpp_stanza_get_text(text_stanza);
if (err_msg != NULL) {
handle_error_message(from, err_msg);
xmpp_free(ctx, err_msg);
}
// TODO : process 'type' attribute from <error/> [RFC6120, 8.3.2]
// otherwise show defined-condition
} else {
xmpp_stanza_t *err_cond = xmpp_stanza_get_children(error_stanza);
if (err_cond == NULL) {
log_debug("error message without <defined-condition/> or <text/> received");
} else {
err_msg = xmpp_stanza_get_name(err_cond);
handle_error_message(from, err_msg);
// TODO : process 'type' attribute from <error/> [RFC6120, 8.3.2]
}
}
}
return 1;
}
static jabber_conn_status_t
_jabber_connect(const char * const fulljid, const char * const passwd,
const char * const altdomain, int port)