aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Refactored iq.c to register iq handlers

Browse Source
This commit is contained in:
James Booth 2013-01-25 00:36:09 +00:00
parent 183a66c939
commit 6b632625df
3 changed files with 193 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/connection.c
View File

@ -740,7 +740,8 @@ _connection_handler(xmpp_conn_t * const conn,
xmpp_handler_add(conn, _message_handler, NULL, STANZA_NAME_MESSAGE, NULL, ctx); xmpp_handler_add(conn, _message_handler, NULL, STANZA_NAME_MESSAGE, NULL, ctx);
xmpp_handler_add(conn, _presence_handler, NULL, STANZA_NAME_PRESENCE, NULL, ctx); xmpp_handler_add(conn, _presence_handler, NULL, STANZA_NAME_PRESENCE, NULL, ctx);
xmpp_handler_add(conn, iq_handler, NULL, STANZA_NAME_IQ, NULL, ctx);
iq_add_handlers(conn, ctx);
if (prefs_get_autoping() != 0) { if (prefs_get_autoping() != 0) {
int millis = prefs_get_autoping() * 1000; int millis = prefs_get_autoping() * 1000;

274
src/iq.c
View File

@ -33,156 +33,41 @@
#include "log.h" #include "log.h"
#include "stanza.h" #include "stanza.h"
static int _iq_error_handler(xmpp_conn_t * const conn, #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_IQ, type, ctx)
xmpp_stanza_t * const stanza, xmpp_ctx_t * const ctx, const char * const id,
const char * const from);
static int _roster_handler(xmpp_conn_t * const conn, static int _iq_handle_error(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, xmpp_ctx_t * const ctx, xmpp_stanza_t * const stanza, void * const userdata);
const char * const id, const char * const type, const char * const from); static int _iq_handle_roster_set(xmpp_conn_t * const conn,
static int _caps_response_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata);
xmpp_stanza_t * const stanza, xmpp_ctx_t * const ctx, static int _iq_handle_roster_result(xmpp_conn_t * const conn,
const char * const id, const char * const type, const char * const from); xmpp_stanza_t * const stanza, void * const userdata);
static int _caps_request_handler(xmpp_conn_t * const conn, static int _iq_handle_ping_get(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, xmpp_ctx_t * const ctx, xmpp_stanza_t * const stanza, void * const userdata);
const char * const id, const char * const type, const char * const from); static int _iq_handle_version_get(xmpp_conn_t * const conn,
static int _version_request_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata);
xmpp_stanza_t * const stanza, xmpp_ctx_t * const ctx, static int _iq_handle_discoinfo_get(xmpp_conn_t * const conn,
const char * const id, const char * const type, const char * const from); xmpp_stanza_t * const stanza, void * const userdata);
static int _iq_handle_discoinfo_result(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata);
int void
iq_handler(xmpp_conn_t * const conn, iq_add_handlers(xmpp_conn_t * const conn, xmpp_ctx_t * const ctx)
xmpp_stanza_t * const stanza, void * const userdata)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; HANDLE(NULL, STANZA_TYPE_ERROR, _iq_handle_error);
char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID); HANDLE(XMPP_NS_ROSTER, STANZA_TYPE_SET, _iq_handle_roster_set);
char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE); HANDLE(XMPP_NS_ROSTER, STANZA_TYPE_RESULT, _iq_handle_roster_result);
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM); HANDLE(XMPP_NS_DISCO_INFO, STANZA_TYPE_GET, _iq_handle_discoinfo_get);
HANDLE(XMPP_NS_DISCO_INFO, STANZA_TYPE_RESULT, _iq_handle_discoinfo_result);
if (g_strcmp0(type, "error") == 0) { HANDLE(STANZA_NS_VERSION, STANZA_TYPE_GET, _iq_handle_version_get);
return _iq_error_handler(conn, stanza, ctx, id, from); HANDLE(STANZA_NS_PING, STANZA_TYPE_GET, _iq_handle_ping_get);
}
/*
if (g_strcmp0(type, "get") == 0) {
return _iq_get_handler(conn, stanza, ctx, id, from);
}
if (g_strcmp0(type, "set") == 0) {
return _iq_set_handler(conn, stanza, ctx, id, from);
}
if (g_strcmp0(type, "result") == 0) {
return _iq_result_handler(conn, stanza, ctx, id, from);
}
*/
// handle the initial roster request
if (g_strcmp0(id, "roster") == 0) {
return _roster_handler(conn, stanza, ctx, id, type, from);
// handle caps responses
} else if ((id != NULL) && (g_str_has_prefix(id, "disco")) &&
(g_strcmp0(type, "result") == 0)) {
return _caps_response_handler(conn, stanza, ctx, id, type, from);
// handle caps requests
} else if (stanza_is_caps_request(stanza)) {
return _caps_request_handler(conn, stanza, ctx, id, type, from);
} else if (stanza_is_version_request(stanza)) {
return _version_request_handler(conn, stanza, ctx, id, type, from);
// handle iq
} else {
char *type = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TYPE);
if (type == NULL) {
return TRUE;
}
// handle roster update
if (strcmp(type, STANZA_TYPE_SET) == 0) {
xmpp_stanza_t *query =
xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
if (query == NULL) {
return TRUE;
}
char *xmlns = xmpp_stanza_get_attribute(query, STANZA_ATTR_XMLNS);
if (xmlns == NULL) {
return TRUE;
}
if (strcmp(xmlns, XMPP_NS_ROSTER) != 0) {
return TRUE;
}
xmpp_stanza_t *item =
xmpp_stanza_get_child_by_name(query, STANZA_NAME_ITEM);
if (item == NULL) {
return TRUE;
}
const char *jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
const char *sub = xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION);
if (g_strcmp0(sub, "remove") == 0) {
contact_list_remove(jid);
return TRUE;
}
gboolean pending_out = FALSE;
const char *ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK);
if ((ask != NULL) && (strcmp(ask, "subscribe") == 0)) {
pending_out = TRUE;
}
contact_list_update_subscription(jid, sub, pending_out);
return TRUE;
// handle server ping
} else if (strcmp(type, STANZA_TYPE_GET) == 0) {
xmpp_stanza_t *ping = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_PING);
if (ping == NULL) {
return TRUE;
}
char *xmlns = xmpp_stanza_get_attribute(ping, STANZA_ATTR_XMLNS);
if (xmlns == NULL) {
return TRUE;
}
if (strcmp(xmlns, STANZA_NS_PING) != 0) {
return TRUE;
}
char *to = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TO);
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if ((from == NULL) || (to == NULL)) {
return TRUE;
}
xmpp_stanza_t *pong = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(pong, STANZA_NAME_IQ);
xmpp_stanza_set_attribute(pong, STANZA_ATTR_TO, from);
xmpp_stanza_set_attribute(pong, STANZA_ATTR_FROM, to);
xmpp_stanza_set_attribute(pong, STANZA_ATTR_TYPE, STANZA_TYPE_RESULT);
if (id != NULL) {
xmpp_stanza_set_attribute(pong, STANZA_ATTR_ID, id);
}
xmpp_send(conn, pong);
xmpp_stanza_release(pong);
return TRUE;
} else {
return TRUE;
}
}
} }
static int static int
_iq_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _iq_handle_error(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_ctx_t * const ctx, const char * const id, const char * const from) void * const userdata)
{ {
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
if (id != NULL) { if (id != NULL) {
log_error("IQ error received, id: %s.", id); log_error("IQ error received, id: %s.", id);
} else { } else {
@ -193,14 +78,45 @@ _iq_error_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
} }
static int static int
_roster_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _iq_handle_roster_set(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_ctx_t * const ctx, const char * const id, const char * const type, void * const userdata)
const char * const from)
{ {
xmpp_stanza_t *query, *item; xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
xmpp_stanza_t *item =
xmpp_stanza_get_child_by_name(query, STANZA_NAME_ITEM);
query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); if (item == NULL) {
item = xmpp_stanza_get_children(query); return 1;
}
const char *jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
const char *sub = xmpp_stanza_get_attribute(item, STANZA_ATTR_SUBSCRIPTION);
if (g_strcmp0(sub, "remove") == 0) {
contact_list_remove(jid);
return 1;
}
gboolean pending_out = FALSE;
const char *ask = xmpp_stanza_get_attribute(item, STANZA_ATTR_ASK);
if ((ask != NULL) && (strcmp(ask, "subscribe") == 0)) {
pending_out = TRUE;
}
contact_list_update_subscription(jid, sub, pending_out);
return 1;
}
static int
_iq_handle_roster_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
{
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
// handle initial roster response
if (g_strcmp0(id, "roster") == 0) {
xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
xmpp_stanza_t *item = xmpp_stanza_get_children(query);
while (item != NULL) { while (item != NULL) {
const char *jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID); const char *jid = xmpp_stanza_get_attribute(item, STANZA_ATTR_JID);
@ -228,15 +144,48 @@ _roster_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
* when I set dnd status and reconnect for some reason */ * when I set dnd status and reconnect for some reason */
// send initial presence // send initial presence
jabber_update_presence(PRESENCE_ONLINE, NULL, 0); jabber_update_presence(PRESENCE_ONLINE, NULL, 0);
}
return 1; return 1;
} }
static int static int
_version_request_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _iq_handle_ping_get(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_ctx_t * const ctx, const char * const id, const char * const type, void * const userdata)
const char * const from)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
const char *to = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_TO);
const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if ((from == NULL) || (to == NULL)) {
return 1;
}
xmpp_stanza_t *pong = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(pong, STANZA_NAME_IQ);
xmpp_stanza_set_attribute(pong, STANZA_ATTR_TO, from);
xmpp_stanza_set_attribute(pong, STANZA_ATTR_FROM, to);
xmpp_stanza_set_attribute(pong, STANZA_ATTR_TYPE, STANZA_TYPE_RESULT);
if (id != NULL) {
xmpp_stanza_set_attribute(pong, STANZA_ATTR_ID, id);
}
xmpp_send(conn, pong);
xmpp_stanza_release(pong);
return 1;
}
static int
_iq_handle_version_get(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
void * const userdata)
{
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if (from != NULL) { if (from != NULL) {
xmpp_stanza_t *response = xmpp_stanza_new(ctx); xmpp_stanza_t *response = xmpp_stanza_new(ctx);
xmpp_stanza_set_name(response, STANZA_NAME_IQ); xmpp_stanza_set_name(response, STANZA_NAME_IQ);
@ -279,12 +228,14 @@ _version_request_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
} }
static int static int
_caps_request_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _iq_handle_discoinfo_get(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_ctx_t * ctx, const char * const id, const char * const type, void * const userdata)
const char * const from)
{ {
xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
const char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
xmpp_stanza_t *incoming_query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); xmpp_stanza_t *incoming_query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY);
char *node_str = xmpp_stanza_get_attribute(incoming_query, STANZA_ATTR_NODE); const char *node_str = xmpp_stanza_get_attribute(incoming_query, STANZA_ATTR_NODE);
if (from != NULL && node_str != NULL) { if (from != NULL && node_str != NULL) {
xmpp_stanza_t *response = xmpp_stanza_new(ctx); xmpp_stanza_t *response = xmpp_stanza_new(ctx);
@ -304,10 +255,12 @@ _caps_request_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
} }
static int static int
_caps_response_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, _iq_handle_discoinfo_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
xmpp_ctx_t * ctx, const char * const id, const char * const type, void * const userdata)
const char * const from)
{ {
const char *id = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_ID);
if ((id != NULL) && (g_str_has_prefix(id, "disco"))) {
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);
char *node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); char *node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE);
if (node == NULL) { if (node == NULL) {
@ -371,4 +324,7 @@ _caps_response_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
free(caps_key); free(caps_key);
return 1; return 1;
} else {
return 1;
}
} }

3
src/jabber.h
View File

@ -84,7 +84,6 @@ void jabber_free_resources(void);
void jabber_restart(void); void jabber_restart(void);
void jabber_set_autoping(int seconds); void jabber_set_autoping(int seconds);
int iq_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void iq_add_handlers(xmpp_conn_t * const conn, xmpp_ctx_t * const ctx);
void * const userdata);
#endif #endif