diff options
Diffstat (limited to 'src/xmpp/iq.c')
| -rw-r--r-- | src/xmpp/iq.c | 1140 |
1 files changed, 577 insertions, 563 deletions
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c index 75bd73a1..13fcd9ad 100644 --- a/src/xmpp/iq.c +++ b/src/xmpp/iq.c @@ -39,10 +39,10 @@ #include "gitversion.h" #endif +#include <glib.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> -#include <glib.h> #ifdef HAVE_LIBMESODE #include <mesode.h> @@ -52,116 +52,120 @@ #include <strophe.h> #endif -#include "profanity.h" -#include "log.h" #include "config/preferences.h" #include "event/server_events.h" +#include "log.h" #include "plugins/plugins.h" +#include "profanity.h" #include "tools/http_upload.h" #include "ui/ui.h" #include "ui/window_list.h" -#include "xmpp/xmpp.h" +#include "xmpp/blocking.h" +#include "xmpp/capabilities.h" #include "xmpp/connection.h" -#include "xmpp/session.h" +#include "xmpp/form.h" #include "xmpp/iq.h" -#include "xmpp/capabilities.h" -#include "xmpp/blocking.h" +#include "xmpp/muc.h" +#include "xmpp/roster.h" +#include "xmpp/roster_list.h" #include "xmpp/session.h" #include "xmpp/stanza.h" -#include "xmpp/form.h" -#include "xmpp/roster_list.h" -#include "xmpp/roster.h" -#include "xmpp/muc.h" +#include "xmpp/xmpp.h" #ifdef HAVE_OMEMO #include "omemo/omemo.h" #endif -typedef struct p_room_info_data_t { - char *room; +typedef struct p_room_info_data_t +{ + char* room; gboolean display; } ProfRoomInfoData; -typedef struct p_iq_handle_t { +typedef struct p_iq_handle_t +{ ProfIqCallback func; ProfIqFreeCallback free_func; - void *userdata; + void* userdata; } ProfIqHandler; -typedef struct privilege_set_t { - char *item; - char *privilege; +typedef struct privilege_set_t +{ + char* item; + char* privilege; } ProfPrivilegeSet; -typedef struct affiliation_list_t { - char *affiliation; +typedef struct affiliation_list_t +{ + char* affiliation; bool show_ui_message; } ProfAffiliationList; -typedef struct command_config_data_t { - char *sessionid; - char *command; +typedef struct command_config_data_t +{ + char* sessionid; + char* command; } CommandConfigData; -static int _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata); - -static void _error_handler(xmpp_stanza_t *const stanza); -static void _disco_info_get_handler(xmpp_stanza_t *const stanza); -static void _disco_items_get_handler(xmpp_stanza_t *const stanza); -static void _disco_items_result_handler(xmpp_stanza_t *const stanza); -static void _last_activity_get_handler(xmpp_stanza_t *const stanza); -static void _version_get_handler(xmpp_stanza_t *const stanza); -static void _ping_get_handler(xmpp_stanza_t *const stanza); - -static int _version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *const userdata); -static int _http_upload_response_id_handler(xmpp_stanza_t *const stanza, void *const upload_ctx); -static int _last_activity_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _destroy_room_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_config_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_config_submit_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_affiliation_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_affiliation_set_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_role_set_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_role_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_kick_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _enable_carbons_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _disable_carbons_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _manual_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _auto_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _room_list_id_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _command_list_result_handler(xmpp_stanza_t *const stanza, void *const userdata); -static int _command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata); - -static void _iq_free_room_data(ProfRoomInfoData *roominfo); -static void _iq_free_affiliation_set(ProfPrivilegeSet *affiliation_set); -static void _iq_free_affiliation_list(ProfAffiliationList *affiliation_list); -static void _iq_id_handler_free(ProfIqHandler *handler); +static int _iq_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata); + +static void _error_handler(xmpp_stanza_t* const stanza); +static void _disco_info_get_handler(xmpp_stanza_t* const stanza); +static void _disco_items_get_handler(xmpp_stanza_t* const stanza); +static void _disco_items_result_handler(xmpp_stanza_t* const stanza); +static void _last_activity_get_handler(xmpp_stanza_t* const stanza); +static void _version_get_handler(xmpp_stanza_t* const stanza); +static void _ping_get_handler(xmpp_stanza_t* const stanza); + +static int _version_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _disco_info_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _disco_info_response_id_handler_onconnect(xmpp_stanza_t* const stanza, void* const userdata); +static int _http_upload_response_id_handler(xmpp_stanza_t* const stanza, void* const upload_ctx); +static int _last_activity_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_info_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _destroy_room_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_config_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_config_submit_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_affiliation_list_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_affiliation_set_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_role_set_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_role_list_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_kick_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _enable_carbons_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _disable_carbons_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _manual_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _caps_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _caps_response_for_jid_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _caps_response_legacy_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _auto_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _room_list_id_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _command_list_result_handler(xmpp_stanza_t* const stanza, void* const userdata); +static int _command_exec_response_handler(xmpp_stanza_t* const stanza, void* const userdata); + +static void _iq_free_room_data(ProfRoomInfoData* roominfo); +static void _iq_free_affiliation_set(ProfPrivilegeSet* affiliation_set); +static void _iq_free_affiliation_list(ProfAffiliationList* affiliation_list); +static void _iq_id_handler_free(ProfIqHandler* handler); // scheduled -static int _autoping_timed_send(xmpp_conn_t *const conn, void *const userdata); +static int _autoping_timed_send(xmpp_conn_t* const conn, void* const userdata); -static void _identity_destroy(DiscoIdentity *identity); -static void _item_destroy(DiscoItem *item); +static void _identity_destroy(DiscoIdentity* identity); +static void _item_destroy(DiscoItem* item); static gboolean autoping_wait = FALSE; -static GTimer *autoping_time = NULL; -static GHashTable *id_handlers; -static GHashTable *rooms_cache = NULL; +static GTimer* autoping_time = NULL; +static GHashTable* id_handlers; +static GHashTable* rooms_cache = NULL; static int -_iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata) +_iq_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata) { log_debug("iq stanza handler fired"); iq_autoping_timer_cancel(); // reset the autoping timer - char *text; + char* text; size_t text_size; xmpp_stanza_to_text(stanza, &text, &text_size); gboolean cont = plugins_on_iq_stanza_receive(text); @@ -170,18 +174,18 @@ _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const us return 1; } - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { _error_handler(stanza); } - xmpp_stanza_t *discoinfo = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_DISCO_INFO); + xmpp_stanza_t* discoinfo = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_DISCO_INFO); if (discoinfo && (g_strcmp0(type, STANZA_TYPE_GET) == 0)) { _disco_info_get_handler(stanza); } - xmpp_stanza_t *discoitems = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_DISCO_ITEMS); + xmpp_stanza_t* discoitems = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_DISCO_ITEMS); if (discoitems && (g_strcmp0(type, STANZA_TYPE_GET) == 0)) { _disco_items_get_handler(stanza); } @@ -189,22 +193,22 @@ _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const us _disco_items_result_handler(stanza); } - xmpp_stanza_t *lastactivity = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_LASTACTIVITY); + xmpp_stanza_t* lastactivity = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_LASTACTIVITY); if (lastactivity && (g_strcmp0(type, STANZA_TYPE_GET) == 0)) { _last_activity_get_handler(stanza); } - xmpp_stanza_t *version = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_VERSION); + xmpp_stanza_t* version = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_VERSION); if (version && (g_strcmp0(type, STANZA_TYPE_GET) == 0)) { _version_get_handler(stanza); } - xmpp_stanza_t *ping = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_PING); + xmpp_stanza_t* ping = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_PING); if (ping && (g_strcmp0(type, STANZA_TYPE_GET) == 0)) { _ping_get_handler(stanza); } - xmpp_stanza_t *roster = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_ROSTER); + xmpp_stanza_t* roster = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_ROSTER); if (roster && (g_strcmp0(type, STANZA_TYPE_SET) == 0)) { roster_set_handler(stanza); } @@ -212,14 +216,14 @@ _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const us roster_result_handler(stanza); } - xmpp_stanza_t *blocking = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_BLOCKING); + xmpp_stanza_t* blocking = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_BLOCKING); if (blocking && (g_strcmp0(type, STANZA_TYPE_SET) == 0)) { blocked_set_handler(stanza); } - const char *id = xmpp_stanza_get_id(stanza); + const char* id = xmpp_stanza_get_id(stanza); if (id) { - ProfIqHandler *handler = g_hash_table_lookup(id_handlers, id); + ProfIqHandler* handler = g_hash_table_lookup(id_handlers, id); if (handler) { int keep = handler->func(stanza, handler->userdata); if (!keep) { @@ -234,8 +238,8 @@ _iq_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const us void iq_handlers_init(void) { - xmpp_conn_t * const conn = connection_get_conn(); - xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_conn_t* const conn = connection_get_conn(); + xmpp_ctx_t* const ctx = connection_get_ctx(); xmpp_handler_add(conn, _iq_handler, NULL, STANZA_NAME_IQ, NULL, ctx); if (prefs_get_autoping() != 0) { @@ -260,7 +264,7 @@ iq_handlers_clear() } static void -_iq_id_handler_free(ProfIqHandler *handler) +_iq_id_handler_free(ProfIqHandler* handler) { if (handler == NULL) { return; @@ -272,9 +276,9 @@ _iq_id_handler_free(ProfIqHandler *handler) } void -iq_id_handler_add(const char *const id, ProfIqCallback func, ProfIqFreeCallback free_func, void *userdata) +iq_id_handler_add(const char* const id, ProfIqCallback func, ProfIqFreeCallback free_func, void* userdata) { - ProfIqHandler *handler = malloc(sizeof(ProfIqHandler)); + ProfIqHandler* handler = malloc(sizeof(ProfIqHandler)); handler->func = func; handler->free_func = free_func; handler->userdata = userdata; @@ -325,7 +329,7 @@ iq_set_autoping(const int seconds) return; } - xmpp_conn_t * const conn = connection_get_conn(); + xmpp_conn_t* const conn = connection_get_conn(); xmpp_timed_handler_delete(conn, _autoping_timed_send); if (seconds == 0) { @@ -333,7 +337,7 @@ iq_set_autoping(const int seconds) } int millis = seconds * 1000; - xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_ctx_t* const ctx = connection_get_ctx(); xmpp_timed_handler_add(conn, _autoping_timed_send, millis, ctx); } @@ -348,7 +352,7 @@ iq_rooms_cache_clear(void) } void -iq_room_list_request(gchar *conferencejid, gchar *filter) +iq_room_list_request(gchar* conferencejid, gchar* filter) { if (g_hash_table_contains(rooms_cache, conferencejid)) { log_debug("Rooms request cached for: %s", conferencejid); @@ -358,9 +362,9 @@ iq_room_list_request(gchar *conferencejid, gchar *filter) log_debug("Rooms request not cached for: %s", conferencejid); - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_disco_items_iq(ctx, id, conferencejid, NULL); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_disco_items_iq(ctx, id, conferencejid, NULL); iq_id_handler_add(id, _room_list_id_handler, NULL, filter); @@ -371,9 +375,9 @@ iq_room_list_request(gchar *conferencejid, gchar *filter) void iq_enable_carbons(void) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_enable_carbons(ctx); - const char *id = xmpp_stanza_get_id(iq); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_enable_carbons(ctx); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _enable_carbons_id_handler, NULL, NULL); @@ -384,9 +388,9 @@ iq_enable_carbons(void) void iq_disable_carbons(void) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_disable_carbons(ctx); - const char *id = xmpp_stanza_get_id(iq); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_disable_carbons(ctx); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _disable_carbons_id_handler, NULL, NULL); @@ -395,17 +399,17 @@ iq_disable_carbons(void) } void -iq_http_upload_request(HTTPUpload *upload) +iq_http_upload_request(HTTPUpload* upload) { - char *jid = connection_jid_for_feature(STANZA_NS_HTTP_UPLOAD); + char* jid = connection_jid_for_feature(STANZA_NS_HTTP_UPLOAD); if (jid == NULL) { cons_show_error("XEP-0363 HTTP File Upload is not supported by the server"); return; } - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_http_upload_request(ctx, id, jid, upload); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_http_upload_request(ctx, id, jid, upload); iq_id_handler_add(id, _http_upload_response_id_handler, NULL, upload); free(id); @@ -416,11 +420,11 @@ iq_http_upload_request(HTTPUpload *upload) } void -iq_disco_info_request(gchar *jid) +iq_disco_info_request(gchar* jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, jid, NULL); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, jid, NULL); iq_id_handler_add(id, _disco_info_response_id_handler, NULL, NULL); @@ -431,11 +435,11 @@ iq_disco_info_request(gchar *jid) } void -iq_disco_info_request_onconnect(gchar *jid) +iq_disco_info_request_onconnect(gchar* jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, jid, NULL); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, jid, NULL); iq_id_handler_add(id, _disco_info_response_id_handler_onconnect, NULL, NULL); @@ -446,11 +450,11 @@ iq_disco_info_request_onconnect(gchar *jid) } void -iq_last_activity_request(gchar *jid) +iq_last_activity_request(gchar* jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_last_activity_iq(ctx, id, jid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_last_activity_iq(ctx, id, jid); iq_id_handler_add(id, _last_activity_response_id_handler, NULL, NULL); @@ -461,13 +465,13 @@ iq_last_activity_request(gchar *jid) } void -iq_room_info_request(const char *const room, gboolean display_result) +iq_room_info_request(const char* const room, gboolean display_result) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, room, NULL); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, room, NULL); - ProfRoomInfoData *cb_data = malloc(sizeof(ProfRoomInfoData)); + ProfRoomInfoData* cb_data = malloc(sizeof(ProfRoomInfoData)); cb_data->room = strdup(room); cb_data->display = display_result; @@ -480,10 +484,10 @@ iq_room_info_request(const char *const room, gboolean display_result) } void -iq_send_caps_request_for_jid(const char *const to, const char *const id, - const char *const node, const char *const ver) +iq_send_caps_request_for_jid(const char* const to, const char* const id, + const char* const node, const char* const ver) { - xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_ctx_t* const ctx = connection_get_ctx(); if (!node) { log_error("Could not create caps request, no node"); @@ -494,9 +498,9 @@ iq_send_caps_request_for_jid(const char *const to, const char *const id, return; } - GString *node_str = g_string_new(""); + GString* node_str = g_string_new(""); g_string_printf(node_str, "%s#%s", node, ver); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, to, node_str->str); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, to, node_str->str); g_string_free(node_str, TRUE); iq_id_handler_add(id, _caps_response_for_jid_id_handler, free, strdup(to)); @@ -506,10 +510,10 @@ iq_send_caps_request_for_jid(const char *const to, const char *const id, } void -iq_send_caps_request(const char *const to, const char *const id, - const char *const node, const char *const ver) +iq_send_caps_request(const char* const to, const char* const id, + const char* const node, const char* const ver) { - xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_ctx_t* const ctx = connection_get_ctx(); if (!node) { log_error("Could not create caps request, no node"); @@ -520,9 +524,9 @@ iq_send_caps_request(const char *const to, const char *const id, return; } - GString *node_str = g_string_new(""); + GString* node_str = g_string_new(""); g_string_printf(node_str, "%s#%s", node, ver); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, to, node_str->str); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, to, node_str->str); g_string_free(node_str, TRUE); iq_id_handler_add(id, _caps_response_id_handler, NULL, NULL); @@ -532,10 +536,10 @@ iq_send_caps_request(const char *const to, const char *const id, } void -iq_send_caps_request_legacy(const char *const to, const char *const id, - const char *const node, const char *const ver) +iq_send_caps_request_legacy(const char* const to, const char* const id, + const char* const node, const char* const ver) { - xmpp_ctx_t * const ctx = connection_get_ctx(); + xmpp_ctx_t* const ctx = connection_get_ctx(); if (!node) { log_error("Could not create caps request, no node"); @@ -546,9 +550,9 @@ iq_send_caps_request_legacy(const char *const to, const char *const id, return; } - GString *node_str = g_string_new(""); + GString* node_str = g_string_new(""); g_string_printf(node_str, "%s#%s", node, ver); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, to, node_str->str); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, to, node_str->str); iq_id_handler_add(id, _caps_response_legacy_id_handler, g_free, node_str->str); g_string_free(node_str, FALSE); @@ -558,30 +562,30 @@ iq_send_caps_request_legacy(const char *const to, const char *const id, } void -iq_disco_items_request(gchar *jid) +iq_disco_items_request(gchar* jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_disco_items_iq(ctx, "discoitemsreq", jid, NULL); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_disco_items_iq(ctx, "discoitemsreq", jid, NULL); iq_send_stanza(iq); xmpp_stanza_release(iq); } void -iq_disco_items_request_onconnect(gchar *jid) +iq_disco_items_request_onconnect(gchar* jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_disco_items_iq(ctx, "discoitemsreq_onconnect", jid, NULL); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_disco_items_iq(ctx, "discoitemsreq_onconnect", jid, NULL); iq_send_stanza(iq); xmpp_stanza_release(iq); } void -iq_send_software_version(const char *const fulljid) +iq_send_software_version(const char* const fulljid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_software_version_iq(ctx, fulljid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_software_version_iq(ctx, fulljid); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _version_result_id_handler, free, strdup(fulljid)); iq_send_stanza(iq); @@ -589,21 +593,21 @@ iq_send_software_version(const char *const fulljid) } void -iq_confirm_instant_room(const char *const room_jid) +iq_confirm_instant_room(const char* const room_jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_instant_room_request_iq(ctx, room_jid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_instant_room_request_iq(ctx, room_jid); iq_send_stanza(iq); xmpp_stanza_release(iq); } void -iq_destroy_room(const char *const room_jid) +iq_destroy_room(const char* const room_jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_instant_room_destroy_iq(ctx, room_jid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_instant_room_destroy_iq(ctx, room_jid); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _destroy_room_result_id_handler, NULL, NULL); iq_send_stanza(iq); @@ -611,12 +615,12 @@ iq_destroy_room(const char *const room_jid) } void -iq_request_room_config_form(const char *const room_jid) +iq_request_room_config_form(const char* const room_jid) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_config_request_iq(ctx, room_jid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_config_request_iq(ctx, room_jid); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _room_config_id_handler, NULL, NULL); iq_send_stanza(iq); @@ -624,12 +628,12 @@ iq_request_room_config_form(const char *const room_jid) } void -iq_submit_room_config(ProfConfWin *confwin) +iq_submit_room_config(ProfConfWin* confwin) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_config_submit_iq(ctx, confwin->roomjid, confwin->form); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_config_submit_iq(ctx, confwin->roomjid, confwin->form); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _room_config_submit_id_handler, NULL, NULL); iq_send_stanza(iq); @@ -637,23 +641,23 @@ iq_submit_room_config(ProfConfWin *confwin) } void -iq_room_config_cancel(ProfConfWin *confwin) +iq_room_config_cancel(ProfConfWin* confwin) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_config_cancel_iq(ctx, confwin->roomjid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_config_cancel_iq(ctx, confwin->roomjid); iq_send_stanza(iq); xmpp_stanza_release(iq); } void -iq_room_affiliation_list(const char *const room, char *affiliation, bool show_ui_message) +iq_room_affiliation_list(const char* const room, char* affiliation, bool show_ui_message) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_affiliation_list_iq(ctx, room, affiliation); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_affiliation_list_iq(ctx, room, affiliation); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); - ProfAffiliationList *affiliation_list = malloc(sizeof(ProfAffiliationList)); + ProfAffiliationList* affiliation_list = malloc(sizeof(ProfAffiliationList)); affiliation_list->affiliation = strdup(affiliation); affiliation_list->show_ui_message = show_ui_message; @@ -664,12 +668,12 @@ iq_room_affiliation_list(const char *const room, char *affiliation, bool show_ui } void -iq_room_kick_occupant(const char *const room, const char *const nick, const char *const reason) +iq_room_kick_occupant(const char* const room, const char* const nick, const char* const reason) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_kick_iq(ctx, room, nick, reason); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_kick_iq(ctx, room, nick, reason); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _room_kick_result_id_handler, free, strdup(nick)); iq_send_stanza(iq); @@ -677,15 +681,15 @@ iq_room_kick_occupant(const char *const room, const char *const nick, const char } void -iq_room_affiliation_set(const char *const room, const char *const jid, char *affiliation, - const char *const reason) +iq_room_affiliation_set(const char* const room, const char* const jid, char* affiliation, + const char* const reason) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_affiliation_set_iq(ctx, room, jid, affiliation, reason); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_affiliation_set_iq(ctx, room, jid, affiliation, reason); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); - ProfPrivilegeSet *affiliation_set = malloc(sizeof(struct privilege_set_t)); + ProfPrivilegeSet* affiliation_set = malloc(sizeof(struct privilege_set_t)); affiliation_set->item = strdup(jid); affiliation_set->privilege = strdup(affiliation); @@ -696,15 +700,15 @@ iq_room_affiliation_set(const char *const room, const char *const jid, char *aff } void -iq_room_role_set(const char *const room, const char *const nick, char *role, - const char *const reason) +iq_room_role_set(const char* const room, const char* const nick, char* role, + const char* const reason) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_role_set_iq(ctx, room, nick, role, reason); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_role_set_iq(ctx, room, nick, role, reason); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); - struct privilege_set_t *role_set = malloc(sizeof(ProfPrivilegeSet)); + struct privilege_set_t* role_set = malloc(sizeof(ProfPrivilegeSet)); role_set->item = strdup(nick); role_set->privilege = strdup(role); @@ -715,12 +719,12 @@ iq_room_role_set(const char *const room, const char *const nick, char *role, } void -iq_room_role_list(const char *const room, char *role) +iq_room_role_list(const char* const room, char* role) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_room_role_list_iq(ctx, room, role); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_room_role_list_iq(ctx, room, role); - const char *id = xmpp_stanza_get_id(iq); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _room_role_list_result_id_handler, free, strdup(role)); iq_send_stanza(iq); @@ -728,13 +732,13 @@ iq_room_role_list(const char *const room, char *role) } void -iq_send_ping(const char *const target) +iq_send_ping(const char* const target) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_ping_iq(ctx, target); - const char *id = xmpp_stanza_get_id(iq); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_ping_iq(ctx, target); + const char* id = xmpp_stanza_get_id(iq); - GDateTime *now = g_date_time_new_now_local(); + GDateTime* now = g_date_time_new_now_local(); iq_id_handler_add(id, _manual_pong_id_handler, (ProfIqFreeCallback)g_date_time_unref, now); iq_send_stanza(iq); @@ -742,11 +746,11 @@ iq_send_ping(const char *const target) } void -iq_command_list(const char *const target) +iq_command_list(const char* const target) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - const char *id = connection_create_stanza_id(); - xmpp_stanza_t *iq = stanza_create_disco_items_iq(ctx, id, target, STANZA_NS_COMMAND); + xmpp_ctx_t* const ctx = connection_get_ctx(); + const char* id = connection_create_stanza_id(); + xmpp_stanza_t* iq = stanza_create_disco_items_iq(ctx, id, target, STANZA_NS_COMMAND); iq_id_handler_add(id, _command_list_result_handler, NULL, NULL); @@ -755,11 +759,11 @@ iq_command_list(const char *const target) } void -iq_command_exec(const char *const target, const char *const command) +iq_command_exec(const char* const target, const char* const command) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_command_exec_iq(ctx, target, command); - const char *id = xmpp_stanza_get_id(iq); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_command_exec_iq(ctx, target, command); + const char* id = xmpp_stanza_get_id(iq); iq_id_handler_add(id, _command_exec_response_handler, free, strdup(command)); @@ -768,14 +772,14 @@ iq_command_exec(const char *const target, const char *const command) } void -iq_submit_command_config(ProfConfWin *confwin) +iq_submit_command_config(ProfConfWin* confwin) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - CommandConfigData *data = (CommandConfigData *)confwin->userdata; - xmpp_stanza_t *iq = stanza_create_command_config_submit_iq(ctx, confwin->roomjid, data->command, data->sessionid, confwin->form); + xmpp_ctx_t* const ctx = connection_get_ctx(); + CommandConfigData* data = (CommandConfigData*)confwin->userdata; + xmpp_stanza_t* iq = stanza_create_command_config_submit_iq(ctx, confwin->roomjid, data->command, data->sessionid, confwin->form); - const char *id = xmpp_stanza_get_id(iq); - iq_id_handler_add(id, _command_exec_response_handler, free, strdup(data->command)); + const char* id = xmpp_stanza_get_id(iq); + iq_id_handler_add(id, _command_exec_response_handler, free, strdup(data->command)); iq_send_stanza(iq); xmpp_stanza_release(iq); @@ -785,11 +789,11 @@ iq_submit_command_config(ProfConfWin *confwin) } void -iq_cancel_command_config(ProfConfWin *confwin) +iq_cancel_command_config(ProfConfWin* confwin) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - CommandConfigData *data = (CommandConfigData *)confwin->userdata; - xmpp_stanza_t *iq = stanza_create_room_config_cancel_iq(ctx, confwin->roomjid); + xmpp_ctx_t* const ctx = connection_get_ctx(); + CommandConfigData* data = (CommandConfigData*)confwin->userdata; + xmpp_stanza_t* iq = stanza_create_room_config_cancel_iq(ctx, confwin->roomjid); iq_send_stanza(iq); xmpp_stanza_release(iq); free(data->sessionid); @@ -798,10 +802,10 @@ iq_cancel_command_config(ProfConfWin *confwin) } static void -_error_handler(xmpp_stanza_t *const stanza) +_error_handler(xmpp_stanza_t* const stanza) { - const char *id = xmpp_stanza_get_id(stanza); - char *error_msg = stanza_get_error_message(stanza); + const char* id = xmpp_stanza_get_id(stanza); + char* error_msg = stanza_get_error_message(stanza); if (id) { log_debug("IQ error handler fired, id: %s, error: %s", id, error_msg); @@ -815,12 +819,12 @@ _error_handler(xmpp_stanza_t *const stanza) } static int -_caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_caps_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); + const char* id = xmpp_stanza_get_id(stanza); + xmpp_stanza_t* query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); // ignore non result if ((g_strcmp0(type, "get") == 0) || (g_strcmp0(type, "set") == 0)) { return 1; @@ -832,7 +836,7 @@ _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_debug("Capabilities response handler fired"); } - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_info("_caps_response_id_handler(): No from attribute"); return 0; @@ -840,7 +844,7 @@ _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_warning("Error received for capabilities response from %s: ", from, error_message); free(error_message); return 0; @@ -851,16 +855,16 @@ _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) return 0; } - const char *node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); + const char* node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); if (node == NULL) { log_info("_caps_response_id_handler(): No node attribute found"); return 0; } // validate sha1 - gchar **split = g_strsplit(node, "#", -1); - char *given_sha1 = split[1]; - char *generated_sha1 = stanza_create_caps_sha1_from_query(query); + gchar** split = g_strsplit(node, "#", -1); + char* given_sha1 = split[1]; + char* generated_sha1 = stanza_create_caps_sha1_from_query(query); if (g_strcmp0(given_sha1, generated_sha1) != 0) { log_warning("Generated sha-1 does not match given:"); @@ -873,7 +877,7 @@ _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_debug("Capabilties already cached: %s", given_sha1); } else { log_debug("Capabilities not cached: %s, storing", given_sha1); - EntityCapabilities *capabilities = stanza_create_caps_from_query_element(query); + EntityCapabilities* capabilities = stanza_create_caps_from_query_element(query); caps_add_by_ver(given_sha1, capabilities); caps_destroy(capabilities); } @@ -888,13 +892,13 @@ _caps_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_caps_response_for_jid_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - char *jid = (char *)userdata; - const char *id = xmpp_stanza_get_id(stanza); - xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); + char* jid = (char*)userdata; + const char* id = xmpp_stanza_get_id(stanza); + xmpp_stanza_t* query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); // ignore non result if ((g_strcmp0(type, "get") == 0) || (g_strcmp0(type, "set") == 0)) { return 1; @@ -906,7 +910,7 @@ _caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userd log_debug("Capabilities response handler fired"); } - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { if (jid) { log_info("_caps_response_for_jid_id_handler(): No from attribute for %s", jid); @@ -918,7 +922,7 @@ _caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userd // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_warning("Error received for capabilities response from %s: ", from, error_message); free(error_message); return 0; @@ -933,7 +937,7 @@ _caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userd return 0; } - const char *node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); + const char* node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); if (node == NULL) { if (jid) { log_info("_caps_response_for_jid_id_handler(): No node attribute found for %s", jid); @@ -944,20 +948,20 @@ _caps_response_for_jid_id_handler(xmpp_stanza_t *const stanza, void *const userd } log_debug("Associating capabilities with: %s", jid); - EntityCapabilities *capabilities = stanza_create_caps_from_query_element(query); + EntityCapabilities* capabilities = stanza_create_caps_from_query_element(query); caps_add_by_jid(jid, capabilities); return 0; } static int -_caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_caps_response_legacy_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - xmpp_stanza_t *query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); - char *expected_node = (char *)userdata; + const char* id = xmpp_stanza_get_id(stanza); + xmpp_stanza_t* query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); + char* expected_node = (char*)userdata; - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); // ignore non result if ((g_strcmp0(type, "get") == 0) || (g_strcmp0(type, "set") == 0)) { return 1; @@ -969,7 +973,7 @@ _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userda log_debug("Capabilities response handler fired"); } - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_info("_caps_response_legacy_id_handler(): No from attribute"); return 0; @@ -977,7 +981,7 @@ _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userda // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_warning("Error received for capabilities response from %s: ", from, error_message); free(error_message); return 0; @@ -988,7 +992,7 @@ _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userda return 0; } - const char *node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); + const char* node = xmpp_stanza_get_attribute(query, STANZA_ATTR_NODE); if (node == NULL) { log_info("_caps_response_legacy_id_handler(): No node attribute found"); return 0; @@ -1001,14 +1005,14 @@ _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userda log_debug("Capabilties already cached: %s", node); } else { log_debug("Capabilities not cached: %s, storing", node); - EntityCapabilities *capabilities = stanza_create_caps_from_query_element(query); + EntityCapabilities* capabilities = stanza_create_caps_from_query_element(query); caps_add_by_ver(node, capabilities); caps_destroy(capabilities); } caps_map_jid_to_ver(from, node); - // node match fail + // node match fail } else { log_info("Legacy Capabilities nodes do not match, expeceted %s, given %s.", expected_node, node); } @@ -1017,11 +1021,11 @@ _caps_response_legacy_id_handler(xmpp_stanza_t *const stanza, void *const userda } static int -_room_list_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_list_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - gchar *filter = (gchar*)userdata; - const char *id = xmpp_stanza_get_id(stanza); - const char *from = xmpp_stanza_get_from(stanza); + gchar* filter = (gchar*)userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (prefs_get_boolean(PREF_ROOM_LIST_CACHE) && !g_hash_table_contains(rooms_cache, from)) { g_hash_table_insert(rooms_cache, strdup(from), xmpp_stanza_copy(stanza)); @@ -1029,7 +1033,7 @@ _room_list_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_debug("Response to query: %s", id); - 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); if (query == NULL) { return 0; } @@ -1040,16 +1044,16 @@ _room_list_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } else { cons_show("Rooms list response received: %s", from); } - xmpp_stanza_t *child = xmpp_stanza_get_children(query); + xmpp_stanza_t* child = xmpp_stanza_get_children(query); if (child == NULL) { cons_show(" No rooms found."); return 0; } - GPatternSpec *glob = NULL; + GPatternSpec* glob = NULL; if (filter != NULL) { - gchar *filter_lower = g_utf8_strdown(filter, -1); - GString *glob_str = g_string_new("*"); + gchar* filter_lower = g_utf8_strdown(filter, -1); + GString* glob_str = g_string_new("*"); g_string_append(glob_str, filter_lower); g_string_append(glob_str, "*"); glob = g_pattern_spec_new(glob_str->str); @@ -1058,30 +1062,28 @@ _room_list_id_handler(xmpp_stanza_t *const stanza, void *const userdata) gboolean matched = FALSE; while (child) { - const char *stanza_name = xmpp_stanza_get_name(child); + const char* stanza_name = xmpp_stanza_get_name(child); if (stanza_name && (g_strcmp0(stanza_name, STANZA_NAME_ITEM) == 0)) { - const char *item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); - gchar *item_jid_lower = NULL; + const char* item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); + gchar* item_jid_lower = NULL; if (item_jid) { - Jid *jidp = jid_create(item_jid); + Jid* jidp = jid_create(item_jid); if (jidp && jidp->localpart) { item_jid_lower = g_utf8_strdown(jidp->localpart, -1); } jid_destroy(jidp); } - const char *item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); - gchar *item_name_lower = NULL; + const char* item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); + gchar* item_name_lower = NULL; if (item_name) { item_name_lower = g_utf8_strdown(item_name, -1); } - if ((item_jid_lower) && ((glob == NULL) || - ((g_pattern_match(glob, strlen(item_jid_lower), item_jid_lower, NULL)) || - (item_name_lower && g_pattern_match(glob, strlen(item_name_lower), item_name_lower, NULL))))) { + if ((item_jid_lower) && ((glob == NULL) || ((g_pattern_match(glob, strlen(item_jid_lower), item_jid_lower, NULL)) || (item_name_lower && g_pattern_match(glob, strlen(item_name_lower), item_name_lower, NULL))))) { if (glob) { matched = TRUE; } - GString *item = g_string_new(item_jid); + GString* item = g_string_new(item_jid); if (item_name) { g_string_append(item, " ("); g_string_append(item, item_name); @@ -1108,11 +1110,11 @@ _room_list_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_command_list_result_handler(xmpp_stanza_t *const stanza, void *const userdata) +_command_list_result_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - char *from = strdup(xmpp_stanza_get_from(stanza)); + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + char* from = strdup(xmpp_stanza_get_from(stanza)); if (id) { log_debug("IQ command list result handler fired, id: %s.", id); @@ -1122,9 +1124,9 @@ _command_list_result_handler(xmpp_stanza_t *const stanza, void *const userdata) // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_debug("Error retrieving command list for %s: %s", from, error_message); - ProfWin *win = wins_get_by_string(from); + ProfWin* win = wins_get_by_string(from); if (win) { win_command_list_error(win, error_message); } @@ -1133,15 +1135,15 @@ _command_list_result_handler(xmpp_stanza_t *const stanza, void *const userdata) return 0; } - GSList *cmds = NULL; + GSList* cmds = NULL; - xmpp_stanza_t *query = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_DISCO_ITEMS); + xmpp_stanza_t* query = xmpp_stanza_get_child_by_ns(stanza, XMPP_NS_DISCO_ITEMS); if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); + xmpp_stanza_t* child = xmpp_stanza_get_children(query); while (child) { - const char *name = xmpp_stanza_get_name(child); + const char* name = xmpp_stanza_get_name(child); if (g_strcmp0(name, "item") == 0) { - const char *node = xmpp_stanza_get_attribute(child, STANZA_ATTR_NODE); + const char* node = xmpp_stanza_get_attribute(child, STANZA_ATTR_NODE); if (node) { cmds = g_slist_insert_sorted(cmds, (gpointer)node, (GCompareFunc)g_strcmp0); } @@ -1150,9 +1152,9 @@ _command_list_result_handler(xmpp_stanza_t *const stanza, void *const userdata) } } - ProfWin *win = wins_get_by_string(from); + ProfWin* win = wins_get_by_string(from); if (win == NULL) { - win = wins_get_console(); + win = wins_get_console(); } win_handle_command_list(win, cmds); @@ -1163,12 +1165,12 @@ _command_list_result_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata) +_command_exec_response_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); - char *command = userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + char* command = userdata; if (id) { log_debug("IQ command exec response handler fired, id: %s.", id); @@ -1176,7 +1178,7 @@ _command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata log_debug("IQ command exec response handler fired."); } - ProfWin *win = wins_get_by_string(from); + ProfWin* win = wins_get_by_string(from); if (win == NULL) { /* No more window associated with this command. * Fallback to console. */ @@ -1185,45 +1187,44 @@ _command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_debug("Error executing command %s for %s: %s", command, from, error_message); win_command_exec_error(win, command, error_message); free(error_message); return 0; } - xmpp_stanza_t *cmd = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_COMMAND); + xmpp_stanza_t* cmd = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_COMMAND); if (!cmd) { log_error("No command element for command response"); win_command_exec_error(win, command, "Malformed command response"); return 0; } - - const char *status = xmpp_stanza_get_attribute(cmd, STANZA_ATTR_STATUS); + const char* status = xmpp_stanza_get_attribute(cmd, STANZA_ATTR_STATUS); if (g_strcmp0(status, "completed") == 0) { win_handle_command_exec_status(win, command, "completed"); - xmpp_stanza_t *note = xmpp_stanza_get_child_by_name(cmd, "note"); + xmpp_stanza_t* note = xmpp_stanza_get_child_by_name(cmd, "note"); if (note) { - const char *type = xmpp_stanza_get_attribute(note, "type"); - const char *value = xmpp_stanza_get_text(note); + const char* type = xmpp_stanza_get_attribute(note, "type"); + const char* value = xmpp_stanza_get_text(note); win_handle_command_exec_result_note(win, type, value); } - xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(cmd, STANZA_NS_DATA); + xmpp_stanza_t* x = xmpp_stanza_get_child_by_ns(cmd, STANZA_NS_DATA); if (x) { - xmpp_stanza_t *roster = xmpp_stanza_get_child_by_ns(x, XMPP_NS_ROSTER); + xmpp_stanza_t* roster = xmpp_stanza_get_child_by_ns(x, XMPP_NS_ROSTER); if (roster) { /* Special handling of xep-0133 roster in response */ - GSList *list = NULL; - xmpp_stanza_t *child = xmpp_stanza_get_children(roster); + GSList* list = NULL; + xmpp_stanza_t* child = xmpp_stanza_get_children(roster); while (child) { - const char *barejid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); - gchar *barejid_lower = g_utf8_strdown(barejid, -1); - const char *name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); - const char *sub = xmpp_stanza_get_attribute(child, STANZA_ATTR_SUBSCRIPTION); - const char *ask = xmpp_stanza_get_attribute(child, STANZA_ATTR_ASK); + const char* barejid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); + gchar* barejid_lower = g_utf8_strdown(barejid, -1); + const char* name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); + const char* sub = xmpp_stanza_get_attribute(child, STANZA_ATTR_SUBSCRIPTION); + const char* ask = xmpp_stanza_get_attribute(child, STANZA_ATTR_ASK); - GSList *groups = NULL; + GSList* groups = NULL; groups = roster_get_groups_from_item(child); gboolean pending_out = FALSE; @@ -1239,8 +1240,8 @@ _command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata cons_show_roster(list); g_slist_free(list); } else { - DataForm *form = form_create(x); - ProfConfWin *confwin = (ProfConfWin*)wins_new_config(from, form, NULL, NULL, NULL); + DataForm* form = form_create(x); + ProfConfWin* confwin = (ProfConfWin*)wins_new_config(from, form, NULL, NULL, NULL); confwin_handle_configuration(confwin, form); } } @@ -1248,35 +1249,35 @@ _command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata win_handle_command_exec_status(win, command, "executing"); /* Looking for a jabber:x:data type form */ - xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(cmd, STANZA_NS_DATA); + xmpp_stanza_t* x = xmpp_stanza_get_child_by_ns(cmd, STANZA_NS_DATA); if (x == NULL) { return 0; } - const char *form_type = xmpp_stanza_get_type(x); + const char* form_type = xmpp_stanza_get_type(x); if (g_strcmp0(form_type, "form") != 0) { log_error("Unsupported payload in command response"); win_command_exec_error(win, command, "Unsupported command response"); return 0; } - const char *sessionid = xmpp_stanza_get_attribute(cmd, "sessionid"); + const char* sessionid = xmpp_stanza_get_attribute(cmd, "sessionid"); - DataForm *form = form_create(x); - CommandConfigData *data = malloc(sizeof(CommandConfigData)); + DataForm* form = form_create(x); + CommandConfigData* data = malloc(sizeof(CommandConfigData)); if (sessionid == NULL) { data->sessionid = NULL; } else { data->sessionid = strdup(sessionid); } data->command = strdup(command); - ProfConfWin *confwin = (ProfConfWin*)wins_new_config(from, form, iq_submit_command_config, iq_cancel_command_config, data); + ProfConfWin* confwin = (ProfConfWin*)wins_new_config(from, form, iq_submit_command_config, iq_cancel_command_config, data); confwin_handle_configuration(confwin, form); } else if (g_strcmp0(status, "canceled") == 0) { win_handle_command_exec_status(win, command, "canceled"); - xmpp_stanza_t *note = xmpp_stanza_get_child_by_name(cmd, "note"); + xmpp_stanza_t* note = xmpp_stanza_get_child_by_name(cmd, "note"); if (note) { - const char *type = xmpp_stanza_get_attribute(note, "type"); - const char *value = xmpp_stanza_get_text(note); + const char* type = xmpp_stanza_get_attribute(note, "type"); + const char* value = xmpp_stanza_get_text(note); win_handle_command_exec_result_note(win, type, value); } } else { @@ -1288,11 +1289,11 @@ _command_exec_response_handler(xmpp_stanza_t *const stanza, void *const userdata } static int -_enable_carbons_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_enable_carbons_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (g_strcmp0(type, "error") == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); cons_show_error("Server error enabling message carbons: %s", error_message); log_debug("Error enabling carbons: %s", error_message); free(error_message); @@ -1304,11 +1305,11 @@ _enable_carbons_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_disable_carbons_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_disable_carbons_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (g_strcmp0(type, "error") == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); cons_show_error("Server error disabling message carbons: %s", error_message); log_debug("Error disabling carbons: %s", error_message); free(error_message); @@ -1320,15 +1321,15 @@ _disable_carbons_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_manual_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_manual_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *from = xmpp_stanza_get_from(stanza); - const char *type = xmpp_stanza_get_type(stanza); - GDateTime *sent = (GDateTime *)userdata; + const char* from = xmpp_stanza_get_from(stanza); + const char* type = xmpp_stanza_get_type(stanza); + GDateTime* sent = (GDateTime*)userdata; // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); if (!error_message) { cons_show_error("Error returned from pinging %s.", from); } else { @@ -1339,7 +1340,7 @@ _manual_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) return 0; } - GDateTime *now = g_date_time_new_now_local(); + GDateTime* now = g_date_time_new_now_local(); GTimeSpan elapsed = g_date_time_difference(now, sent); int elapsed_millis = elapsed / 1000; @@ -1356,7 +1357,7 @@ _manual_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_autoping_timed_send(xmpp_conn_t *const conn, void *const userdata) +_autoping_timed_send(xmpp_conn_t* const conn, void* const userdata) { if (connection_get_status() != JABBER_CONNECTED) { return 1; @@ -1366,7 +1367,7 @@ _autoping_timed_send(xmpp_conn_t *const conn, void *const userdata) log_warning("Server doesn't advertise %s feature, disabling autoping.", XMPP_FEATURE_PING); prefs_set_autoping(0); cons_show_error("Server ping not supported, autoping disabled."); - xmpp_conn_t *conn = connection_get_conn(); + xmpp_conn_t* conn = connection_get_conn(); xmpp_timed_handler_delete(conn, _autoping_timed_send); return 1; } @@ -1376,9 +1377,9 @@ _autoping_timed_send(xmpp_conn_t *const conn, void *const userdata) return 1; } - xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; - xmpp_stanza_t *iq = stanza_create_ping_iq(ctx, NULL); - const char *id = xmpp_stanza_get_id(iq); + xmpp_ctx_t* ctx = (xmpp_ctx_t*)userdata; + xmpp_stanza_t* iq = stanza_create_ping_iq(ctx, NULL); + const char* id = xmpp_stanza_get_id(iq); log_debug("Autoping: Sending ping request: %s", id); // add pong handler @@ -1396,11 +1397,11 @@ _autoping_timed_send(xmpp_conn_t *const conn, void *const userdata) } static int -_auto_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_auto_pong_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { iq_autoping_timer_cancel(); - const char *id = xmpp_stanza_get_id(stanza); + const char* id = xmpp_stanza_get_id(stanza); if (id == NULL) { log_debug("Autoping: Pong handler fired."); return 0; @@ -1408,7 +1409,7 @@ _auto_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_debug("Autoping: Pong handler fired: %s.", id); - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (type == NULL) { return 0; } @@ -1417,16 +1418,16 @@ _auto_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } // show warning if error - char *error_msg = stanza_get_error_message(stanza); + char* error_msg = stanza_get_error_message(stanza); log_warning("Server ping (id=%s) responded with error: %s", id, error_msg); free(error_msg); // turn off autoping if error type is 'cancel' - xmpp_stanza_t *error = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR); + xmpp_stanza_t* error = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR); if (error == NULL) { return 0; } - const char *errtype = xmpp_stanza_get_type(error); + const char* errtype = xmpp_stanza_get_type(error); if (errtype == NULL) { return 0; } @@ -1434,7 +1435,7 @@ _auto_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_warning("Server ping (id=%s) error type 'cancel', disabling autoping.", id); prefs_set_autoping(0); cons_show_error("Server ping not supported, autoping disabled."); - xmpp_conn_t *conn = connection_get_conn(); + xmpp_conn_t* conn = connection_get_conn(); xmpp_timed_handler_delete(conn, _autoping_timed_send); } @@ -1442,9 +1443,9 @@ _auto_pong_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static int -_version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_version_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); + const char* id = xmpp_stanza_get_id(stanza); if (id) { log_debug("IQ version result handler fired, id: %s.", id); @@ -1452,12 +1453,12 @@ _version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_debug("IQ version result handler fired."); } - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (g_strcmp0(type, STANZA_TYPE_RESULT) != 0) { if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); ui_handle_software_version_error(from, error_message); free(error_message); } else { @@ -1468,26 +1469,26 @@ _version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) return 0; } - const char *jid = xmpp_stanza_get_from(stanza); + const char* jid = xmpp_stanza_get_from(stanza); - 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); if (query == NULL) { log_error("Software version result received with no query element."); return 0; } - const char *ns = xmpp_stanza_get_ns(query); + const char* ns = xmpp_stanza_get_ns(query); if (g_strcmp0(ns, STANZA_NS_VERSION) != 0) { log_error("Software version result received without namespace."); return 0; } - char *name_str = NULL; - char *version_str = NULL; - char *os_str = NULL; - xmpp_stanza_t *name = xmpp_stanza_get_child_by_name(query, "name"); - xmpp_stanza_t *version = xmpp_stanza_get_child_by_name(query, "version"); - xmpp_stanza_t *os = xmpp_stanza_get_child_by_name(query, "os"); + char* name_str = NULL; + char* version_str = NULL; + char* os_str = NULL; + xmpp_stanza_t* name = xmpp_stanza_get_child_by_name(query, "name"); + xmpp_stanza_t* version = xmpp_stanza_get_child_by_name(query, "version"); + xmpp_stanza_t* os = xmpp_stanza_get_child_by_name(query, "os"); if (name) { name_str = xmpp_stanza_get_text(name); @@ -1503,27 +1504,30 @@ _version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) log_warning("From attribute specified different JID, using original JID."); } - xmpp_conn_t *conn = connection_get_conn(); - xmpp_ctx_t *ctx = xmpp_conn_get_context(conn); + xmpp_conn_t* conn = connection_get_conn(); + xmpp_ctx_t* ctx = xmpp_conn_get_context(conn); - Jid *jidp = jid_create((char*)userdata); + Jid* jidp = jid_create((char*)userdata); - const char *presence = NULL; + const char* presence = NULL; // if it has a fulljid it is a regular user (not server or component) if (jidp->fulljid) { if (muc_active(jidp->barejid)) { - Occupant *occupant = muc_roster_item(jidp->barejid, jidp->resourcepart); + Occupant* occupant = muc_roster_item(jidp->barejid, jidp->resourcepart); presence = string_from_resource_presence(occupant->presence); } else { PContact contact = roster_get_contact(jidp->barejid); if (contact) { - Resource *resource = p_contact_get_resource(contact, jidp->resourcepart); + Resource* resource = p_contact_get_resource(contact, jidp->resourcepart); if (!resource) { ui_handle_software_version_error(jidp->fulljid, "Unknown resource"); - if (name_str) xmpp_free(ctx, name_str); - if (version_str) xmpp_free(ctx, version_str); - if (os_str) xmpp_free(ctx, os_str); + if (name_str) + xmpp_free(ctx, name_str); + if (version_str) + xmpp_free(ctx, version_str); + if (os_str) + xmpp_free(ctx, os_str); return 0; } presence = string_from_resource_presence(resource->presence); @@ -1543,20 +1547,23 @@ _version_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) jid_destroy(jidp); - if (name_str) xmpp_free(ctx, name_str); - if (version_str) xmpp_free(ctx, version_str); - if (os_str) xmpp_free(ctx, os_str); + if (name_str) + xmpp_free(ctx, name_str); + if (version_str) + xmpp_free(ctx, version_str); + if (os_str) + xmpp_free(ctx, os_str); return 0; } static void -_ping_get_handler(xmpp_stanza_t *const stanza) +_ping_get_handler(xmpp_stanza_t* const stanza) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - const char *id = xmpp_stanza_get_id(stanza); - const char *to = xmpp_stanza_get_to(stanza); - const char *from = xmpp_stanza_get_from(stanza); + xmpp_ctx_t* const ctx = connection_get_ctx(); + const char* id = xmpp_stanza_get_id(stanza); + const char* to = xmpp_stanza_get_to(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (id) { log_debug("IQ ping get handler fired, id: %s.", id); @@ -1568,7 +1575,7 @@ _ping_get_handler(xmpp_stanza_t *const stanza) return; } - xmpp_stanza_t *pong = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, id); + xmpp_stanza_t* pong = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, id); xmpp_stanza_set_to(pong, from); xmpp_stanza_set_from(pong, to); @@ -1577,11 +1584,11 @@ _ping_get_handler(xmpp_stanza_t *const stanza) } static void -_version_get_handler(xmpp_stanza_t *const stanza) +_version_get_handler(xmpp_stanza_t* const stanza) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - const char *id = xmpp_stanza_get_id(stanza); - const char *from = xmpp_stanza_get_from(stanza); + xmpp_ctx_t* const ctx = connection_get_ctx(); + const char* id = xmpp_stanza_get_id(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (id) { log_debug("IQ version get handler fired, id: %s.", id); @@ -1594,23 +1601,23 @@ _version_get_handler(xmpp_stanza_t *const stanza) cons_show("Received IQ version request (XEP-0092) from %s", from); } - xmpp_stanza_t *response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, id); + xmpp_stanza_t* response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, id); xmpp_stanza_set_to(response, from); - xmpp_stanza_t *query = xmpp_stanza_new(ctx); + xmpp_stanza_t* query = xmpp_stanza_new(ctx); xmpp_stanza_set_name(query, STANZA_NAME_QUERY); xmpp_stanza_set_ns(query, STANZA_NS_VERSION); - xmpp_stanza_t *name = xmpp_stanza_new(ctx); + xmpp_stanza_t* name = xmpp_stanza_new(ctx); xmpp_stanza_set_name(name, "name"); - xmpp_stanza_t *name_txt = xmpp_stanza_new(ctx); + xmpp_stanza_t* name_txt = xmpp_stanza_new(ctx); xmpp_stanza_set_text(name_txt, "Profanity"); xmpp_stanza_add_child(name, name_txt); - xmpp_stanza_t *version = xmpp_stanza_new(ctx); + xmpp_stanza_t* version = xmpp_stanza_new(ctx); xmpp_stanza_set_name(version, "version"); - xmpp_stanza_t *version_txt = xmpp_stanza_new(ctx); - GString *version_str = g_string_new(PACKAGE_VERSION); + xmpp_stanza_t* version_txt = xmpp_stanza_new(ctx); + GString* version_str = g_string_new(PACKAGE_VERSION); if (strcmp(PACKAGE_STATUS, "development") == 0) { #ifdef HAVE_GIT_VERSION g_string_append(version_str, "dev."); @@ -1624,8 +1631,8 @@ _version_get_handler(xmpp_stanza_t *const stanza) xmpp_stanza_set_text(version_txt, version_str->str); xmpp_stanza_add_child(version, version_txt); - xmpp_stanza_t *os; - xmpp_stanza_t *os_txt; + xmpp_stanza_t* os; + xmpp_stanza_t* os_txt; bool include_os = prefs_get_boolean(PREF_REVEAL_OS); if (include_os) { @@ -1654,7 +1661,9 @@ _version_get_handler(xmpp_stanza_t *const stanza) xmpp_stanza_add_child(query, name); xmpp_stanza_add_child(query, version); - if (include_os) {xmpp_stanza_add_child(query, os);} + if (include_os) { + xmpp_stanza_add_child(query, os); + } xmpp_stanza_add_child(response, query); iq_send_stanza(response); @@ -1662,21 +1671,25 @@ _version_get_handler(xmpp_stanza_t *const stanza) g_string_free(version_str, TRUE); xmpp_stanza_release(name_txt); xmpp_stanza_release(version_txt); - if (include_os) {xmpp_stanza_release(os_txt);} + if (include_os) { + xmpp_stanza_release(os_txt); + } xmpp_stanza_release(name); xmpp_stanza_release(version); - if (include_os) {xmpp_stanza_release(os);} + if (include_os) { + xmpp_stanza_release(os); + } xmpp_stanza_release(query); xmpp_stanza_release(response); } } static void -_disco_items_get_handler(xmpp_stanza_t *const stanza) +_disco_items_get_handler(xmpp_stanza_t* const stanza) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - const char *id = xmpp_stanza_get_id(stanza); - const char *from = xmpp_stanza_get_from(stanza); + xmpp_ctx_t* const ctx = connection_get_ctx(); + const char* id = xmpp_stanza_get_id(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (id) { log_debug("IQ disco items get handler fired, id: %s.", id); @@ -1685,10 +1698,10 @@ _disco_items_get_handler(xmpp_stanza_t *const stanza) } if (from) { - xmpp_stanza_t *response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, xmpp_stanza_get_id(stanza)); + xmpp_stanza_t* response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, xmpp_stanza_get_id(stanza)); xmpp_stanza_set_to(response, from); - xmpp_stanza_t *query = xmpp_stanza_new(ctx); + xmpp_stanza_t* query = xmpp_stanza_new(ctx); xmpp_stanza_set_name(query, STANZA_NAME_QUERY); xmpp_stanza_set_ns(query, XMPP_NS_DISCO_ITEMS); xmpp_stanza_add_child(response, query); @@ -1700,10 +1713,10 @@ _disco_items_get_handler(xmpp_stanza_t *const stanza) } static void -_last_activity_get_handler(xmpp_stanza_t *const stanza) +_last_activity_get_handler(xmpp_stanza_t* const stanza) { - xmpp_ctx_t *ctx = connection_get_ctx(); - const char *from = xmpp_stanza_get_from(stanza); + xmpp_ctx_t* ctx = connection_get_ctx(); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { return; @@ -1714,10 +1727,10 @@ _last_activity_get_handler(xmpp_stanza_t *const stanza) char str[50]; sprintf(str, "%d", idls_secs); - xmpp_stanza_t *response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, xmpp_stanza_get_id(stanza)); + xmpp_stanza_t* response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, xmpp_stanza_get_id(stanza)); xmpp_stanza_set_to(response, from); - xmpp_stanza_t *query = xmpp_stanza_new(ctx); + xmpp_stanza_t* query = xmpp_stanza_new(ctx); xmpp_stanza_set_name(query, STANZA_NAME_QUERY); xmpp_stanza_set_attribute(query, STANZA_ATTR_XMLNS, STANZA_NS_LASTACTIVITY); xmpp_stanza_set_attribute(query, "seconds", str); @@ -1729,14 +1742,14 @@ _last_activity_get_handler(xmpp_stanza_t *const stanza) xmpp_stanza_release(response); } else { - xmpp_stanza_t *response = xmpp_iq_new(ctx, STANZA_TYPE_ERROR, xmpp_stanza_get_id(stanza)); + xmpp_stanza_t* response = xmpp_iq_new(ctx, STANZA_TYPE_ERROR, xmpp_stanza_get_id(stanza)); xmpp_stanza_set_to(response, from); - xmpp_stanza_t *error = xmpp_stanza_new(ctx); + xmpp_stanza_t* error = xmpp_stanza_new(ctx); xmpp_stanza_set_name(error, STANZA_NAME_ERROR); xmpp_stanza_set_type(error, "cancel"); - xmpp_stanza_t *service_unavailable = xmpp_stanza_new(ctx); + xmpp_stanza_t* service_unavailable = xmpp_stanza_new(ctx); xmpp_stanza_set_name(service_unavailable, "service-unavailable"); xmpp_stanza_set_ns(service_unavailable, "urn:ietf:params:xml:ns:xmpp-stanzas"); @@ -1753,15 +1766,15 @@ _last_activity_get_handler(xmpp_stanza_t *const stanza) } static void -_disco_info_get_handler(xmpp_stanza_t *const stanza) +_disco_info_get_handler(xmpp_stanza_t* const stanza) { - xmpp_ctx_t * const ctx = connection_get_ctx(); - const char *from = xmpp_stanza_get_from(stanza); + xmpp_ctx_t* const ctx = connection_get_ctx(); + const char* from = xmpp_stanza_get_from(stanza); - xmpp_stanza_t *incoming_query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); - const char *node_str = xmpp_stanza_get_attribute(incoming_query, STANZA_ATTR_NODE); + xmpp_stanza_t* incoming_query = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_QUERY); + const char* node_str = xmpp_stanza_get_attribute(incoming_query, STANZA_ATTR_NODE); - const char *id = xmpp_stanza_get_id(stanza); + const char* id = xmpp_stanza_get_id(stanza); if (id) { log_debug("IQ disco info get handler fired, id: %s.", id); @@ -1774,10 +1787,10 @@ _disco_info_get_handler(xmpp_stanza_t *const stanza) cons_show("Received IQ disco info request (XEP-0232) from %s", from); } - xmpp_stanza_t *response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, xmpp_stanza_get_id(stanza)); + xmpp_stanza_t* response = xmpp_iq_new(ctx, STANZA_TYPE_RESULT, xmpp_stanza_get_id(stanza)); xmpp_stanza_set_to(response, from); - xmpp_stanza_t *query = stanza_create_caps_query_element(ctx); + xmpp_stanza_t* query = stanza_create_caps_query_element(ctx); if (node_str) { xmpp_stanza_set_attribute(query, STANZA_ATTR_NODE, node_str); } @@ -1790,9 +1803,9 @@ _disco_info_get_handler(xmpp_stanza_t *const stanza) } static int -_destroy_room_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_destroy_room_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); + const char* id = xmpp_stanza_get_id(stanza); if (id) { log_debug("IQ destroy room result handler fired, id: %s.", id); @@ -1800,7 +1813,7 @@ _destroy_room_result_id_handler(xmpp_stanza_t *const stanza, void *const userdat log_debug("IQ destroy room result handler fired."); } - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (from == NULL) { log_error("No from attribute for IQ destroy room result"); } else { @@ -1811,11 +1824,11 @@ _destroy_room_result_id_handler(xmpp_stanza_t *const stanza, void *const userdat } static int -_room_config_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_config_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (id) { log_debug("IQ room config handler fired, id: %s.", id); @@ -1825,7 +1838,7 @@ _room_config_id_handler(xmpp_stanza_t *const stanza, void *const userdata) // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); ui_handle_room_configuration_form_error(from, error_message); free(error_message); return 0; @@ -1837,41 +1850,41 @@ _room_config_id_handler(xmpp_stanza_t *const stanza, void *const userdata) return 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); if (query == NULL) { log_warning("No query element found parsing room config response"); ui_handle_room_configuration_form_error(from, "No query element found parsing room config response"); return 0; } - xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(query, STANZA_NS_DATA); + xmpp_stanza_t* x = xmpp_stanza_get_child_by_ns(query, STANZA_NS_DATA); if (x == NULL) { log_warning("No x element found with %s namespace parsing room config response", STANZA_NS_DATA); ui_handle_room_configuration_form_error(from, "No form configuration options available"); return 0; } - const char *form_type = xmpp_stanza_get_type(x); + const char* form_type = xmpp_stanza_get_type(x); if (g_strcmp0(form_type, "form") != 0) { log_warning("x element not of type 'form' parsing room config response"); ui_handle_room_configuration_form_error(from, "Form not of type 'form' parsing room config response."); return 0; } - DataForm *form = form_create(x); - ProfConfWin *confwin = (ProfConfWin*)wins_new_config(from, form, iq_submit_room_config, iq_room_config_cancel, NULL); + DataForm* form = form_create(x); + ProfConfWin* confwin = (ProfConfWin*)wins_new_config(from, form, iq_submit_room_config, iq_room_config_cancel, NULL); confwin_handle_configuration(confwin, form); return 0; } static int -_room_affiliation_set_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_affiliation_set_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); - ProfPrivilegeSet *affiliation_set = (ProfPrivilegeSet*)userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + ProfPrivilegeSet* affiliation_set = (ProfPrivilegeSet*)userdata; if (id) { log_debug("IQ affiliation set handler fired, id: %s.", id); @@ -1881,9 +1894,9 @@ _room_affiliation_set_result_id_handler(xmpp_stanza_t *const stanza, void *const // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_debug("Error setting affiliation %s list for room %s, user %s: %s", affiliation_set->privilege, from, affiliation_set->item, error_message); - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin) { mucwin_affiliation_set_error(mucwin, affiliation_set->item, affiliation_set->privilege, error_message); } @@ -1894,12 +1907,12 @@ _room_affiliation_set_result_id_handler(xmpp_stanza_t *const stanza, void *const } static int -_room_role_set_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_role_set_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); - ProfPrivilegeSet *role_set = (ProfPrivilegeSet*)userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + ProfPrivilegeSet* role_set = (ProfPrivilegeSet*)userdata; if (id) { log_debug("IQ role set handler fired, id: %s.", id); @@ -1909,9 +1922,9 @@ _room_role_set_result_id_handler(xmpp_stanza_t *const stanza, void *const userda // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_debug("Error setting role %s list for room %s, user %s: %s", role_set->privilege, from, role_set->item, error_message); - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin) { mucwin_role_set_error(mucwin, role_set->item, role_set->privilege, error_message); } @@ -1922,12 +1935,12 @@ _room_role_set_result_id_handler(xmpp_stanza_t *const stanza, void *const userda } static int -_room_affiliation_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_affiliation_list_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); - ProfAffiliationList *affiliation_list = (ProfAffiliationList *)userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + ProfAffiliationList* affiliation_list = (ProfAffiliationList*)userdata; if (id) { log_debug("IQ affiliation list result handler fired, id: %s.", id); @@ -1937,28 +1950,28 @@ _room_affiliation_list_result_id_handler(xmpp_stanza_t *const stanza, void *cons // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_debug("Error retrieving %s list for room %s: %s", affiliation_list->affiliation, from, error_message); - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin && affiliation_list->show_ui_message) { mucwin_affiliation_list_error(mucwin, affiliation_list->affiliation, error_message); } free(error_message); return 0; } - GSList *jids = NULL; + GSList* jids = NULL; - xmpp_stanza_t *query = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_ADMIN); + xmpp_stanza_t* query = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_ADMIN); if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); + xmpp_stanza_t* child = xmpp_stanza_get_children(query); while (child) { - const char *name = xmpp_stanza_get_name(child); + const char* name = xmpp_stanza_get_name(child); if (g_strcmp0(name, "item") == 0) { - const char *jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); + const char* jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); if (jid) { if (g_strcmp0(affiliation_list->affiliation, "member") == 0 - || g_strcmp0(affiliation_list->affiliation, "owner") == 0 - || g_strcmp0(affiliation_list->affiliation, "admin") == 0) { + || g_strcmp0(affiliation_list->affiliation, "owner") == 0 + || g_strcmp0(affiliation_list->affiliation, "admin") == 0) { muc_members_add(from, jid); } jids = g_slist_insert_sorted(jids, (gpointer)jid, (GCompareFunc)g_strcmp0); @@ -1969,7 +1982,7 @@ _room_affiliation_list_result_id_handler(xmpp_stanza_t *const stanza, void *cons } muc_jid_autocomplete_add_all(from, jids); - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin && affiliation_list->show_ui_message) { mucwin_handle_affiliation_list(mucwin, affiliation_list->affiliation, jids); } @@ -1979,12 +1992,12 @@ _room_affiliation_list_result_id_handler(xmpp_stanza_t *const stanza, void *cons } static int -_room_role_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_role_list_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); - char *role = (char *)userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + char* role = (char*)userdata; if (id) { log_debug("IQ role list result handler fired, id: %s.", id); @@ -1994,24 +2007,24 @@ _room_role_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userd // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); log_debug("Error retrieving %s list for room %s: %s", role, from, error_message); - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin) { mucwin_role_list_error(mucwin, role, error_message); } free(error_message); return 0; } - GSList *nicks = NULL; + GSList* nicks = NULL; - xmpp_stanza_t *query = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_ADMIN); + xmpp_stanza_t* query = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_ADMIN); if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); + xmpp_stanza_t* child = xmpp_stanza_get_children(query); while (child) { - const char *name = xmpp_stanza_get_name(child); + const char* name = xmpp_stanza_get_name(child); if (g_strcmp0(name, "item") == 0) { - const char *nick = xmpp_stanza_get_attribute(child, STANZA_ATTR_NICK); + const char* nick = xmpp_stanza_get_attribute(child, STANZA_ATTR_NICK); if (nick) { nicks = g_slist_insert_sorted(nicks, (gpointer)nick, (GCompareFunc)g_strcmp0); } @@ -2020,7 +2033,7 @@ _room_role_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userd } } - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin) { mucwin_handle_role_list(mucwin, role, nicks); } @@ -2030,11 +2043,11 @@ _room_role_list_result_id_handler(xmpp_stanza_t *const stanza, void *const userd } static int -_room_config_submit_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_config_submit_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (id) { log_debug("IQ room config submit handler fired, id: %s.", id); @@ -2044,7 +2057,7 @@ _room_config_submit_id_handler(xmpp_stanza_t *const stanza, void *const userdata // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); ui_handle_room_config_submit_result_error(from, error_message); free(error_message); return 0; @@ -2056,12 +2069,12 @@ _room_config_submit_id_handler(xmpp_stanza_t *const stanza, void *const userdata } static int -_room_kick_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_kick_result_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *id = xmpp_stanza_get_id(stanza); - const char *type = xmpp_stanza_get_type(stanza); - const char *from = xmpp_stanza_get_from(stanza); - char *nick = (char *)userdata; + const char* id = xmpp_stanza_get_id(stanza); + const char* type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + char* nick = (char*)userdata; if (id) { log_debug("IQ kick result handler fired, id: %s.", id); @@ -2070,9 +2083,9 @@ _room_kick_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } // handle error responses - ProfMucWin *mucwin = wins_get_muc(from); + ProfMucWin* mucwin = wins_get_muc(from); if (mucwin && (g_strcmp0(type, STANZA_TYPE_ERROR) == 0)) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); mucwin_kick_error(mucwin, nick, error_message); free(error_message); } @@ -2081,7 +2094,7 @@ _room_kick_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata) } static void -_identity_destroy(DiscoIdentity *identity) +_identity_destroy(DiscoIdentity* identity) { if (identity) { free(identity->name); @@ -2092,7 +2105,7 @@ _identity_destroy(DiscoIdentity *identity) } static void -_item_destroy(DiscoItem *item) +_item_destroy(DiscoItem* item) { if (item) { free(item->jid); @@ -2102,47 +2115,47 @@ _item_destroy(DiscoItem *item) } static int -_room_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_room_info_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *type = xmpp_stanza_get_type(stanza); - ProfRoomInfoData *cb_data = (ProfRoomInfoData *)userdata; + const char* type = xmpp_stanza_get_type(stanza); + ProfRoomInfoData* cb_data = (ProfRoomInfoData*)userdata; log_debug("Received disco#info response for room: %s", cb_data->room); // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - ProfMucWin *mucwin = wins_get_muc(cb_data->room); + ProfMucWin* mucwin = wins_get_muc(cb_data->room); if (mucwin && cb_data->display) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); mucwin_room_info_error(mucwin, error_message); free(error_message); } return 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); if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); - GSList *identities = NULL; - GSList *features = NULL; + xmpp_stanza_t* child = xmpp_stanza_get_children(query); + GSList* identities = NULL; + GSList* features = NULL; while (child) { - const char *stanza_name = xmpp_stanza_get_name(child); + const char* stanza_name = xmpp_stanza_get_name(child); if (g_strcmp0(stanza_name, STANZA_NAME_FEATURE) == 0) { - const char *var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); + const char* var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); if (var) { features = g_slist_append(features, strdup(var)); } } else if (g_strcmp0(stanza_name, STANZA_NAME_IDENTITY) == 0) { - const char *name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); - const char *type = xmpp_stanza_get_type(child); - const char *category = xmpp_stanza_get_attribute(child, STANZA_ATTR_CATEGORY); + const char* name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); + const char* type = xmpp_stanza_get_type(child); + const char* category = xmpp_stanza_get_attribute(child, STANZA_ATTR_CATEGORY); if (name || category || type) { - DiscoIdentity *identity = malloc(sizeof(struct disco_identity_t)); + DiscoIdentity* identity = malloc(sizeof(struct disco_identity_t)); if (name) { identity->name = strdup(name); - ProfMucWin *mucwin = wins_get_muc(cb_data->room); + ProfMucWin* mucwin = wins_get_muc(cb_data->room); if (mucwin) { mucwin->room_name = strdup(name); } @@ -2168,7 +2181,7 @@ _room_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata } muc_set_features(cb_data->room, features); - ProfMucWin *mucwin = wins_get_muc(cb_data->room); + ProfMucWin* mucwin = wins_get_muc(cb_data->room); if (mucwin) { #ifdef HAVE_OMEMO if (muc_anonymity_type(mucwin->roomjid) == MUC_ANONYMITY_TYPE_NONANONYMOUS && omemo_automatic_start(cb_data->room)) { @@ -2189,20 +2202,20 @@ _room_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata } static int -_last_activity_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_last_activity_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { cons_show_error("Invalid last activity response received."); log_info("Received last activity response with no from attribute."); return 0; } - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); if (from) { cons_show_error("Last activity request failed for %s: %s", from, error_message); } else { @@ -2212,7 +2225,7 @@ _last_activity_response_id_handler(xmpp_stanza_t *const stanza, void *const user return 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); if (!query) { cons_show_error("Invalid last activity response received."); @@ -2220,7 +2233,7 @@ _last_activity_response_id_handler(xmpp_stanza_t *const stanza, void *const user return 0; } - const char *seconds_str = xmpp_stanza_get_attribute(query, "seconds"); + const char* seconds_str = xmpp_stanza_get_attribute(query, "seconds"); if (!seconds_str) { cons_show_error("Invalid last activity response received."); log_info("Received last activity response with no seconds attribute."); @@ -2234,7 +2247,7 @@ _last_activity_response_id_handler(xmpp_stanza_t *const stanza, void *const user return 0; } - char *msg = xmpp_stanza_get_text(query); + char* msg = xmpp_stanza_get_text(query); sv_ev_lastactivity_response(from, seconds, msg); @@ -2243,10 +2256,10 @@ _last_activity_response_id_handler(xmpp_stanza_t *const stanza, void *const user } static int -_disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_disco_info_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - const char *from = xmpp_stanza_get_from(stanza); - const char *type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (from) { log_debug("Received disco#info response from: %s", from); @@ -2256,7 +2269,7 @@ _disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdat // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); if (from) { cons_show_error("Service discovery failed for %s: %s", from, error_message); } else { @@ -2266,26 +2279,26 @@ _disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdat return 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); if (query) { - xmpp_stanza_t *child = xmpp_stanza_get_children(query); - GSList *identities = NULL; - GSList *features = NULL; + xmpp_stanza_t* child = xmpp_stanza_get_children(query); + GSList* identities = NULL; + GSList* features = NULL; while (child) { - const char *stanza_name = xmpp_stanza_get_name(child); + const char* stanza_name = xmpp_stanza_get_name(child); if (g_strcmp0(stanza_name, STANZA_NAME_FEATURE) == 0) { - const char *var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); + const char* var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); if (var) { features = g_slist_append(features, strdup(var)); } } else if (g_strcmp0(stanza_name, STANZA_NAME_IDENTITY) == 0) { - const char *name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); - const char *type = xmpp_stanza_get_type(child); - const char *category = xmpp_stanza_get_attribute(child, STANZA_ATTR_CATEGORY); + const char* name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); + const char* type = xmpp_stanza_get_type(child); + const char* category = xmpp_stanza_get_attribute(child, STANZA_ATTR_CATEGORY); if (name || category || type) { - DiscoIdentity *identity = malloc(sizeof(struct disco_identity_t)); + DiscoIdentity* identity = malloc(sizeof(struct disco_identity_t)); if (name) { identity->name = strdup(name); @@ -2320,10 +2333,10 @@ _disco_info_response_id_handler(xmpp_stanza_t *const stanza, void *const userdat } static int -_disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *const userdata) +_disco_info_response_id_handler_onconnect(xmpp_stanza_t* const stanza, void* const userdata) { - const char *from = xmpp_stanza_get_from(stanza); - const char *type = xmpp_stanza_get_type(stanza); + const char* from = xmpp_stanza_get_from(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (from) { log_debug("Received disco#info response from: %s", from); @@ -2333,7 +2346,7 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *con // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); if (from) { log_error("Service discovery failed for %s: %s", from, error_message); } else { @@ -2343,20 +2356,20 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *con return 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); if (query) { - GHashTable *features = connection_get_features(from); + GHashTable* features = connection_get_features(from); if (features == NULL) { log_error("No matching disco item found for %s", from); return 1; } - xmpp_stanza_t *child = xmpp_stanza_get_children(query); + xmpp_stanza_t* child = xmpp_stanza_get_children(query); while (child) { - const char *stanza_name = xmpp_stanza_get_name(child); + const char* stanza_name = xmpp_stanza_get_name(child); if (g_strcmp0(stanza_name, STANZA_NAME_FEATURE) == 0) { - const char *var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); + const char* var = xmpp_stanza_get_attribute(child, STANZA_ATTR_VAR); if (var) { g_hash_table_add(features, strdup(var)); } @@ -2371,11 +2384,11 @@ _disco_info_response_id_handler_onconnect(xmpp_stanza_t *const stanza, void *con } static int -_http_upload_response_id_handler(xmpp_stanza_t *const stanza, void *const userdata) +_http_upload_response_id_handler(xmpp_stanza_t* const stanza, void* const userdata) { - HTTPUpload *upload = (HTTPUpload *)userdata; - const char *from = xmpp_stanza_get_from(stanza); - const char *type = xmpp_stanza_get_type(stanza); + HTTPUpload* upload = (HTTPUpload*)userdata; + const char* from = xmpp_stanza_get_from(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (from) { log_info("Received http_upload response from: %s", from); @@ -2385,7 +2398,7 @@ _http_upload_response_id_handler(xmpp_stanza_t *const stanza, void *const userda // handle error responses if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { - char *error_message = stanza_get_error_message(stanza); + char* error_message = stanza_get_error_message(stanza); if (from) { cons_show_error("Uploading '%s' failed for %s: %s", upload->filename, from, error_message); } else { @@ -2395,23 +2408,25 @@ _http_upload_response_id_handler(xmpp_stanza_t *const stanza, void *const userda return 0; } - xmpp_stanza_t *slot = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_SLOT); + xmpp_stanza_t* slot = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_SLOT); if (slot && g_strcmp0(xmpp_stanza_get_ns(slot), STANZA_NS_HTTP_UPLOAD) == 0) { - xmpp_stanza_t *put = xmpp_stanza_get_child_by_name(slot, STANZA_NAME_PUT); - xmpp_stanza_t *get = xmpp_stanza_get_child_by_name(slot, STANZA_NAME_GET); + xmpp_stanza_t* put = xmpp_stanza_get_child_by_name(slot, STANZA_NAME_PUT); + xmpp_stanza_t* get = xmpp_stanza_get_child_by_name(slot, STANZA_NAME_GET); if (put && get) { - char *put_url = xmpp_stanza_get_text(put); - char *get_url = xmpp_stanza_get_text(get); + char* put_url = xmpp_stanza_get_text(put); + char* get_url = xmpp_stanza_get_text(get); upload->put_url = strdup(put_url); upload->get_url = strdup(get_url); - xmpp_conn_t *conn = connection_get_conn(); - xmpp_ctx_t *ctx = xmpp_conn_get_context(conn); - if (put_url) xmpp_free(ctx, put_url); - if (get_url) xmpp_free(ctx, get_url); + xmpp_conn_t* conn = connection_get_conn(); + xmpp_ctx_t* ctx = xmpp_conn_get_context(conn); + if (put_url) + xmpp_free(ctx, put_url); + if (get_url) + xmpp_free(ctx, get_url); pthread_create(&(upload->worker), NULL, &http_file_put, upload); http_upload_add_upload(upload); @@ -2425,38 +2440,37 @@ _http_upload_response_id_handler(xmpp_stanza_t *const stanza, void *const userda } static void -_disco_items_result_handler(xmpp_stanza_t *const stanza) +_disco_items_result_handler(xmpp_stanza_t* const stanza) { log_debug("Received disco#items response"); - const char *id = xmpp_stanza_get_id(stanza); - const char *from = xmpp_stanza_get_from(stanza); - GSList *items = NULL; + const char* id = xmpp_stanza_get_id(stanza); + const char* from = xmpp_stanza_get_from(stanza); + GSList* items = NULL; - if ((g_strcmp0(id, "discoitemsreq") != 0) && - (g_strcmp0(id, "discoitemsreq_onconnect") != 0)) { + if ((g_strcmp0(id, "discoitemsreq") != 0) && (g_strcmp0(id, "discoitemsreq_onconnect") != 0)) { return; } log_debug("Response to query: %s", id); - 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); if (query == NULL) { return; } - xmpp_stanza_t *child = xmpp_stanza_get_children(query); + xmpp_stanza_t* child = xmpp_stanza_get_children(query); if (child == NULL) { return; } while (child) { - const char *stanza_name = xmpp_stanza_get_name(child); + const char* stanza_name = xmpp_stanza_get_name(child); if (stanza_name && (g_strcmp0(stanza_name, STANZA_NAME_ITEM) == 0)) { - const char *item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); + const char* item_jid = xmpp_stanza_get_attribute(child, STANZA_ATTR_JID); if (item_jid) { - DiscoItem *item = malloc(sizeof(struct disco_item_t)); + DiscoItem* item = malloc(sizeof(struct disco_item_t)); item->jid = strdup(item_jid); - const char *item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); + const char* item_name = xmpp_stanza_get_attribute(child, STANZA_ATTR_NAME); if (item_name) { item->name = strdup(item_name); } else { @@ -2479,14 +2493,14 @@ _disco_items_result_handler(xmpp_stanza_t *const stanza) } void -iq_send_stanza(xmpp_stanza_t *const stanza) +iq_send_stanza(xmpp_stanza_t* const stanza) { - char *text; + char* text; size_t text_size; xmpp_stanza_to_text(stanza, &text, &text_size); - xmpp_conn_t *conn = connection_get_conn(); - char *plugin_text = plugins_on_iq_stanza_send(text); + xmpp_conn_t* conn = connection_get_conn(); + char* plugin_text = plugins_on_iq_stanza_send(text); if (plugin_text) { xmpp_send_raw_string(conn, "%s", plugin_text); free(plugin_text); @@ -2497,7 +2511,7 @@ iq_send_stanza(xmpp_stanza_t *const stanza) } static void -_iq_free_room_data(ProfRoomInfoData *roominfo) +_iq_free_room_data(ProfRoomInfoData* roominfo) { if (roominfo) { free(roominfo->room); @@ -2506,7 +2520,7 @@ _iq_free_room_data(ProfRoomInfoData *roominfo) } static void -_iq_free_affiliation_set(ProfPrivilegeSet *affiliation_set) +_iq_free_affiliation_set(ProfPrivilegeSet* affiliation_set) { if (affiliation_set) { free(affiliation_set->item); @@ -2516,7 +2530,7 @@ _iq_free_affiliation_set(ProfPrivilegeSet *affiliation_set) } static void -_iq_free_affiliation_list(ProfAffiliationList *affiliation_list) +_iq_free_affiliation_list(ProfAffiliationList* affiliation_list) { if (affiliation_list) { free(affiliation_list->affiliation); @@ -2525,26 +2539,26 @@ _iq_free_affiliation_list(ProfAffiliationList *affiliation_list) } void -iq_mam_request(ProfChatWin *win) +iq_mam_request(ProfChatWin* win) { - if (connection_supports(XMPP_FEATURE_MAM2) == FALSE) { + if (connection_supports(XMPP_FEATURE_MAM2) == FALSE) { log_warning("Server doesn't advertise %s feature.", XMPP_FEATURE_PING); cons_show_error("Server doesn't support MAM."); return; - } + } - xmpp_ctx_t * const ctx = connection_get_ctx(); - char *id = connection_create_stanza_id(); + xmpp_ctx_t* const ctx = connection_get_ctx(); + char* id = connection_create_stanza_id(); - GDateTime *now = g_date_time_new_now_local(); - GDateTime *timestamp = g_date_time_add_days(now, -1); + GDateTime* now = g_date_time_new_now_local(); + GDateTime* timestamp = g_date_time_add_days(now, -1); g_date_time_unref(now); - gchar *datestr = g_date_time_format(timestamp,"%FT%T%:::z"); - xmpp_stanza_t *iq = stanza_create_mam_iq(ctx, win->barejid, datestr); + gchar* datestr = g_date_time_format(timestamp, "%FT%T%:::z"); + xmpp_stanza_t* iq = stanza_create_mam_iq(ctx, win->barejid, datestr); g_free(datestr); g_date_time_unref(timestamp); -// iq_id_handler_add(id, _http_upload_response_id_handler, NULL, upload); + // iq_id_handler_add(id, _http_upload_response_id_handler, NULL, upload); free(id); iq_send_stanza(iq); |