diff options
author | Michael Vetter <jubalh@iodoru.org> | 2020-07-07 14:18:57 +0200 |
---|---|---|
committer | Michael Vetter <jubalh@iodoru.org> | 2020-07-07 14:18:57 +0200 |
commit | a2726b6a7d16f5f846a882fbbe9127e4604bb8bb (patch) | |
tree | e6d101676dec96430eafa645ad2b7bd5391a4294 /src/xmpp/presence.c | |
parent | 95015cec56fa56f2ef97227edf06de17c65000d9 (diff) | |
download | profani-tty-a2726b6a7d16f5f846a882fbbe9127e4604bb8bb.tar.gz |
Apply coding style
Diffstat (limited to 'src/xmpp/presence.c')
-rw-r--r-- | src/xmpp/presence.c | 406 |
1 files changed, 201 insertions, 205 deletions
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c index e6f236cd..2982274d 100644 --- a/src/xmpp/presence.c +++ b/src/xmpp/presence.c @@ -67,19 +67,19 @@ static Autocomplete sub_requests_ac; -static int _presence_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata); +static int _presence_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata); -static void _presence_error_handler(xmpp_stanza_t *const stanza); -static void _unavailable_handler(xmpp_stanza_t *const stanza); -static void _subscribe_handler(xmpp_stanza_t *const stanza); -static void _subscribed_handler(xmpp_stanza_t *const stanza); -static void _unsubscribed_handler(xmpp_stanza_t *const stanza); -static void _muc_user_handler(xmpp_stanza_t *const stanza); -static void _available_handler(xmpp_stanza_t *const stanza); +static void _presence_error_handler(xmpp_stanza_t* const stanza); +static void _unavailable_handler(xmpp_stanza_t* const stanza); +static void _subscribe_handler(xmpp_stanza_t* const stanza); +static void _subscribed_handler(xmpp_stanza_t* const stanza); +static void _unsubscribed_handler(xmpp_stanza_t* const stanza); +static void _muc_user_handler(xmpp_stanza_t* const stanza); +static void _available_handler(xmpp_stanza_t* const stanza); -void _send_caps_request(char *node, char *caps_key, char *id, char *from); -static void _send_room_presence(xmpp_stanza_t *presence); -static void _send_presence_stanza(xmpp_stanza_t *const stanza); +void _send_caps_request(char* node, char* caps_key, char* id, char* from); +static void _send_room_presence(xmpp_stanza_t* presence); +static void _send_presence_stanza(xmpp_stanza_t* const stanza); void presence_sub_requests_init(void) @@ -90,46 +90,45 @@ presence_sub_requests_init(void) void presence_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, _presence_handler, NULL, STANZA_NAME_PRESENCE, NULL, ctx); } void -presence_subscription(const char *const jid, const jabber_subscr_t action) +presence_subscription(const char* const jid, const jabber_subscr_t action) { assert(jid != NULL); - Jid *jidp = jid_create(jid); + Jid* jidp = jid_create(jid); autocomplete_remove(sub_requests_ac, jidp->barejid); - const char *type = NULL; - switch (action) - { - case PRESENCE_SUBSCRIBE: - log_debug("Sending presence subscribe: %s", jid); - type = STANZA_TYPE_SUBSCRIBE; - break; - case PRESENCE_SUBSCRIBED: - log_debug("Sending presence subscribed: %s", jid); - type = STANZA_TYPE_SUBSCRIBED; - break; - case PRESENCE_UNSUBSCRIBED: - log_debug("Sending presence usubscribed: %s", jid); - type = STANZA_TYPE_UNSUBSCRIBED; - break; - default: - break; + const char* type = NULL; + switch (action) { + case PRESENCE_SUBSCRIBE: + log_debug("Sending presence subscribe: %s", jid); + type = STANZA_TYPE_SUBSCRIBE; + break; + case PRESENCE_SUBSCRIBED: + log_debug("Sending presence subscribed: %s", jid); + type = STANZA_TYPE_SUBSCRIBED; + break; + case PRESENCE_UNSUBSCRIBED: + log_debug("Sending presence usubscribed: %s", jid); + type = STANZA_TYPE_UNSUBSCRIBED; + break; + default: + break; } if (!type) { log_error("Attempt to send unknown subscription action: %s", jid); return; } - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *presence = xmpp_presence_new(ctx); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* presence = xmpp_presence_new(ctx); - char *id = connection_create_stanza_id(); + char* id = connection_create_stanza_id(); xmpp_stanza_set_id(presence, id); free(id); @@ -161,18 +160,18 @@ presence_clear_sub_requests(void) } char* -presence_sub_request_find(const char *const search_str, gboolean previous, void *context) +presence_sub_request_find(const char* const search_str, gboolean previous, void* context) { return autocomplete_complete(sub_requests_ac, search_str, TRUE, previous); } gboolean -presence_sub_request_exists(const char *const bare_jid) +presence_sub_request_exists(const char* const bare_jid) { gboolean result = FALSE; - GList *requests = autocomplete_create_list(sub_requests_ac); - GList *curr = requests; + GList* requests = autocomplete_create_list(sub_requests_ac); + GList* curr = requests; while (curr) { if (strcmp(curr->data, bare_jid) == 0) { result = TRUE; @@ -192,14 +191,14 @@ presence_reset_sub_request_search(void) } void -presence_send(const resource_presence_t presence_type, const int idle, char *signed_status) +presence_send(const resource_presence_t presence_type, const int idle, char* signed_status) { if (connection_get_status() != JABBER_CONNECTED) { log_warning("Error setting presence, not connected."); return; } - char *msg = connection_get_presence_msg(); + char* msg = connection_get_presence_msg(); if (msg) { log_debug("Updating presence: %s, \"%s\"", string_from_resource_presence(presence_type), msg); } else { @@ -209,24 +208,24 @@ presence_send(const resource_presence_t presence_type, const int idle, char *sig const int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); connection_set_priority(pri); - xmpp_ctx_t * const ctx = connection_get_ctx(); - xmpp_stanza_t *presence = xmpp_presence_new(ctx); + xmpp_ctx_t* const ctx = connection_get_ctx(); + xmpp_stanza_t* presence = xmpp_presence_new(ctx); - char *id = connection_create_stanza_id(); + char* id = connection_create_stanza_id(); xmpp_stanza_set_id(presence, id); free(id); - const char *show = stanza_get_presence_string_from_type(presence_type); + const char* show = stanza_get_presence_string_from_type(presence_type); stanza_attach_show(ctx, presence, show); stanza_attach_status(ctx, presence, msg); if (signed_status) { - xmpp_stanza_t *x = xmpp_stanza_new(ctx); + xmpp_stanza_t* x = xmpp_stanza_new(ctx); xmpp_stanza_set_name(x, STANZA_NAME_X); xmpp_stanza_set_ns(x, STANZA_NS_SIGNED); - xmpp_stanza_t *signed_text = xmpp_stanza_new(ctx); + xmpp_stanza_t* signed_text = xmpp_stanza_new(ctx); xmpp_stanza_set_text(signed_text, signed_status); xmpp_stanza_add_child(x, signed_text); @@ -250,27 +249,27 @@ presence_send(const resource_presence_t presence_type, const int idle, char *sig xmpp_stanza_release(presence); // set last presence for account - const char *last = show; + const char* last = show; if (last == NULL) { last = STANZA_TEXT_ONLINE; } - char *account = session_get_account_name(); + char* account = session_get_account_name(); accounts_set_last_presence(account, last); accounts_set_last_status(account, msg); } static void -_send_room_presence(xmpp_stanza_t *presence) +_send_room_presence(xmpp_stanza_t* presence) { - GList *rooms = muc_rooms(); - GList *curr = rooms; + GList* rooms = muc_rooms(); + GList* curr = rooms; while (curr) { - const char *room = curr->data; - const char *nick = muc_nick(room); + const char* room = curr->data; + const char* nick = muc_nick(room); if (nick) { - char *full_room_jid = create_fulljid(room, nick); + char* full_room_jid = create_fulljid(room, nick); xmpp_stanza_set_to(presence, full_room_jid); log_debug("Sending presence to room: %s", full_room_jid); free(full_room_jid); @@ -284,18 +283,18 @@ _send_room_presence(xmpp_stanza_t *presence) } void -presence_join_room(const char *const room, const char *const nick, const char *const passwd) +presence_join_room(const char* const room, const char* const nick, const char* const passwd) { - Jid *jid = jid_create_from_bare_and_resource(room, nick); + Jid* jid = jid_create_from_bare_and_resource(room, nick); log_debug("Sending room join presence to: %s", jid->fulljid); resource_presence_t presence_type = accounts_get_last_presence(session_get_account_name()); - const char *show = stanza_get_presence_string_from_type(presence_type); - char *status = connection_get_presence_msg(); + const char* show = stanza_get_presence_string_from_type(presence_type); + char* status = connection_get_presence_msg(); int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); - xmpp_ctx_t *ctx = connection_get_ctx(); - xmpp_stanza_t *presence = stanza_create_room_join_presence(ctx, jid->fulljid, passwd); + xmpp_ctx_t* ctx = connection_get_ctx(); + xmpp_stanza_t* presence = stanza_create_room_join_presence(ctx, jid->fulljid, passwd); stanza_attach_show(ctx, presence, show); stanza_attach_status(ctx, presence, status); stanza_attach_priority(ctx, presence, pri); @@ -308,20 +307,20 @@ presence_join_room(const char *const room, const char *const nick, const char *c } void -presence_change_room_nick(const char *const room, const char *const nick) +presence_change_room_nick(const char* const room, const char* const nick) { assert(room != NULL); assert(nick != NULL); log_debug("Sending room nickname change to: %s, nick: %s", room, nick); resource_presence_t presence_type = accounts_get_last_presence(session_get_account_name()); - const char *show = stanza_get_presence_string_from_type(presence_type); - char *status = connection_get_presence_msg(); + const char* show = stanza_get_presence_string_from_type(presence_type); + char* status = connection_get_presence_msg(); int pri = accounts_get_priority_for_presence_type(session_get_account_name(), presence_type); - char *full_room_jid = create_fulljid(room, nick); + char* full_room_jid = create_fulljid(room, nick); - xmpp_ctx_t *ctx = connection_get_ctx(); - xmpp_stanza_t *presence = stanza_create_room_newnick_presence(ctx, full_room_jid); + xmpp_ctx_t* ctx = connection_get_ctx(); + xmpp_stanza_t* presence = stanza_create_room_newnick_presence(ctx, full_room_jid); stanza_attach_show(ctx, presence, show); stanza_attach_status(ctx, presence, status); stanza_attach_priority(ctx, presence, pri); @@ -334,11 +333,11 @@ presence_change_room_nick(const char *const room, const char *const nick) } void -presence_leave_chat_room(const char *const room_jid) +presence_leave_chat_room(const char* const room_jid) { assert(room_jid != NULL); - char *nick = muc_nick(room_jid); + char* nick = muc_nick(room_jid); if (!nick) { log_error("Could not get nickname for room: %s", room_jid); return; @@ -346,8 +345,8 @@ presence_leave_chat_room(const char *const room_jid) log_debug("Sending room leave presence to: %s", room_jid); - xmpp_ctx_t *ctx = connection_get_ctx(); - xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid, nick); + xmpp_ctx_t* ctx = connection_get_ctx(); + xmpp_stanza_t* presence = stanza_create_room_leave_presence(ctx, room_jid, nick); _send_presence_stanza(presence); @@ -355,11 +354,11 @@ presence_leave_chat_room(const char *const room_jid) } static int -_presence_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata) +_presence_handler(xmpp_conn_t* const conn, xmpp_stanza_t* const stanza, void* const userdata) { log_debug("Presence stanza handler fired"); - char *text = NULL; + char* text = NULL; size_t text_size; xmpp_stanza_to_text(stanza, &text, &text_size); @@ -369,7 +368,7 @@ _presence_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *co 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) { _presence_error_handler(stanza); @@ -391,7 +390,7 @@ _presence_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *co _unsubscribed_handler(stanza); } - xmpp_stanza_t *mucuser = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); + xmpp_stanza_t* mucuser = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); if (mucuser) { _muc_user_handler(stanza); } @@ -402,21 +401,21 @@ _presence_handler(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *co } static void -_presence_error_handler(xmpp_stanza_t *const stanza) +_presence_error_handler(xmpp_stanza_t* const stanza) { - const char *xmlns = NULL; - xmpp_stanza_t *x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); + const char* xmlns = NULL; + xmpp_stanza_t* x = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_X); if (x) { xmlns = xmpp_stanza_get_ns(x); } - const char *from = xmpp_stanza_get_from(stanza); - xmpp_stanza_t *error_stanza = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR); + const char* from = xmpp_stanza_get_from(stanza); + xmpp_stanza_t* error_stanza = xmpp_stanza_get_child_by_name(stanza, STANZA_NAME_ERROR); // handle MUC join errors if (g_strcmp0(xmlns, STANZA_NS_MUC) == 0) { - const char *error_cond = NULL; - xmpp_stanza_t *reason_st = xmpp_stanza_get_child_by_ns(error_stanza, STANZA_NS_STANZAS); + const char* error_cond = NULL; + xmpp_stanza_t* reason_st = xmpp_stanza_get_child_by_ns(error_stanza, STANZA_NS_STANZAS); if (reason_st) { error_cond = xmpp_stanza_get_name(reason_st); } @@ -424,7 +423,7 @@ _presence_error_handler(xmpp_stanza_t *const stanza) error_cond = "unknown"; } - Jid *fulljid = jid_create(from); + Jid* fulljid = jid_create(from); log_info("Error joining room: %s, reason: %s", fulljid->barejid, error_cond); if (muc_active(fulljid->barejid)) { muc_leave(fulljid->barejid); @@ -435,8 +434,8 @@ _presence_error_handler(xmpp_stanza_t *const stanza) return; } - GString *log_msg = g_string_new("presence stanza error received"); - const char *id = xmpp_stanza_get_id(stanza); + GString* log_msg = g_string_new("presence stanza error received"); + const char* id = xmpp_stanza_get_id(stanza); if (id) { g_string_append(log_msg, " id="); g_string_append(log_msg, id); @@ -446,7 +445,7 @@ _presence_error_handler(xmpp_stanza_t *const stanza) g_string_append(log_msg, from); } - const char *type = NULL; + const char* type = NULL; if (error_stanza) { type = xmpp_stanza_get_type(error_stanza); } @@ -456,7 +455,7 @@ _presence_error_handler(xmpp_stanza_t *const stanza) } // stanza_get_error never returns NULL - char *err_msg = stanza_get_error_message(stanza); + char* err_msg = stanza_get_error_message(stanza); g_string_append(log_msg, " error="); g_string_append(log_msg, err_msg); @@ -474,16 +473,16 @@ _presence_error_handler(xmpp_stanza_t *const stanza) } static void -_unsubscribed_handler(xmpp_stanza_t *const stanza) +_unsubscribed_handler(xmpp_stanza_t* const stanza) { - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_warning("Unsubscribed presence handler received with no from attribute"); return; } log_debug("Unsubscribed presence handler fired for %s", from); - Jid *from_jid = jid_create(from); + Jid* from_jid = jid_create(from); sv_ev_subscription(from_jid->barejid, PRESENCE_UNSUBSCRIBED); autocomplete_remove(sub_requests_ac, from_jid->barejid); @@ -491,16 +490,16 @@ _unsubscribed_handler(xmpp_stanza_t *const stanza) } static void -_subscribed_handler(xmpp_stanza_t *const stanza) +_subscribed_handler(xmpp_stanza_t* const stanza) { - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_warning("Subscribed presence handler received with no from attribute"); return; } log_debug("Subscribed presence handler fired for %s", from); - Jid *from_jid = jid_create(from); + Jid* from_jid = jid_create(from); sv_ev_subscription(from_jid->barejid, PRESENCE_SUBSCRIBED); autocomplete_remove(sub_requests_ac, from_jid->barejid); @@ -508,15 +507,15 @@ _subscribed_handler(xmpp_stanza_t *const stanza) } static void -_subscribe_handler(xmpp_stanza_t *const stanza) +_subscribe_handler(xmpp_stanza_t* const stanza) { - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_warning("Subscribe presence handler received with no from attribute", from); } log_debug("Subscribe presence handler fired for %s", from); - Jid *from_jid = jid_create(from); + Jid* from_jid = jid_create(from); if (from_jid == NULL) { return; } @@ -528,32 +527,32 @@ _subscribe_handler(xmpp_stanza_t *const stanza) } static void -_unavailable_handler(xmpp_stanza_t *const stanza) +_unavailable_handler(xmpp_stanza_t* const stanza) { inp_nonblocking(TRUE); - xmpp_conn_t *conn = connection_get_conn(); - const char *jid = xmpp_conn_get_jid(conn); - const char *from = xmpp_stanza_get_from(stanza); + xmpp_conn_t* conn = connection_get_conn(); + const char* jid = xmpp_conn_get_jid(conn); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_warning("Unavailable presence received with no from attribute"); } log_debug("Unavailable presence handler fired for %s", from); - Jid *my_jid = jid_create(jid); - Jid *from_jid = jid_create(from); + Jid* my_jid = jid_create(jid); + Jid* from_jid = jid_create(from); if (my_jid == NULL || from_jid == NULL) { jid_destroy(my_jid); jid_destroy(from_jid); return; } - if (strcmp(my_jid->barejid, from_jid->barejid) !=0) { - char *status_str = stanza_get_status(stanza, NULL); + if (strcmp(my_jid->barejid, from_jid->barejid) != 0) { + char* status_str = stanza_get_status(stanza, NULL); if (from_jid->resourcepart) { sv_ev_contact_offline(from_jid->barejid, from_jid->resourcepart, status_str); - // hack for servers that do not send full jid with unavailable presence + // hack for servers that do not send full jid with unavailable presence } else { sv_ev_contact_offline(from_jid->barejid, "__prof_default", status_str); } @@ -569,7 +568,7 @@ _unavailable_handler(xmpp_stanza_t *const stanza) } static void -_handle_caps(const char *const jid, XMPPCaps *caps) +_handle_caps(const char* const jid, XMPPCaps* caps) { // hash supported, xep-0115, cache against ver if (g_strcmp0(caps->hash, "sha-1") == 0) { @@ -580,23 +579,23 @@ _handle_caps(const char *const jid, XMPPCaps *caps) caps_map_jid_to_ver(jid, caps->ver); } else { log_debug("Capabilities cache miss: %s, for %s, sending service discovery request", caps->ver, jid); - char *id = connection_create_stanza_id(); + char* id = connection_create_stanza_id(); iq_send_caps_request(jid, id, caps->node, caps->ver); free(id); } } - // unsupported hash, xep-0115, associate with JID, no cache + // unsupported hash, xep-0115, associate with JID, no cache } else if (caps->hash) { log_info("Hash %s not supported: %s, sending service discovery request", caps->hash, jid); - char *id = connection_create_stanza_id(); + char* id = connection_create_stanza_id(); iq_send_caps_request_for_jid(jid, id, caps->node, caps->ver); free(id); - // no hash, legacy caps, cache against node#ver - } else if (caps->node && caps->ver) { + // no hash, legacy caps, cache against node#ver + } else if (caps->node && caps->ver) { log_info("No hash specified: %s, legacy request made for %s#%s", jid, caps->node, caps->ver); - char *id = connection_create_stanza_id(); + char* id = connection_create_stanza_id(); iq_send_caps_request_legacy(jid, id, caps->node, caps->ver); free(id); } else { @@ -605,7 +604,7 @@ _handle_caps(const char *const jid, XMPPCaps *caps) } static void -_available_handler(xmpp_stanza_t *const stanza) +_available_handler(xmpp_stanza_t* const stanza) { inp_nonblocking(TRUE); @@ -615,10 +614,7 @@ _available_handler(xmpp_stanza_t *const stanza) } // handler still fires if other types - if ((g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_UNAVAILABLE) == 0) || - (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_SUBSCRIBE) == 0) || - (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_SUBSCRIBED) == 0) || - (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_UNSUBSCRIBED) == 0)) { + if ((g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_UNAVAILABLE) == 0) || (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_SUBSCRIBE) == 0) || (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_SUBSCRIBED) == 0) || (g_strcmp0(xmpp_stanza_get_type(stanza), STANZA_TYPE_UNSUBSCRIBED) == 0)) { return; } @@ -628,52 +624,52 @@ _available_handler(xmpp_stanza_t *const stanza) } int err = 0; - XMPPPresence *xmpp_presence = stanza_parse_presence(stanza, &err); + XMPPPresence* xmpp_presence = stanza_parse_presence(stanza, &err); if (!xmpp_presence) { - const char *from = NULL; - switch(err) { - case STANZA_PARSE_ERROR_NO_FROM: - log_warning("Available presence handler fired with no from attribute."); - break; - case STANZA_PARSE_ERROR_INVALID_FROM: - from = xmpp_stanza_get_from(stanza); - log_warning("Available presence handler fired with invalid from attribute: %s", from); - break; - default: - log_warning("Available presence handler fired, could not parse stanza."); - break; + const char* from = NULL; + switch (err) { + case STANZA_PARSE_ERROR_NO_FROM: + log_warning("Available presence handler fired with no from attribute."); + break; + case STANZA_PARSE_ERROR_INVALID_FROM: + from = xmpp_stanza_get_from(stanza); + log_warning("Available presence handler fired with invalid from attribute: %s", from); + break; + default: + log_warning("Available presence handler fired, could not parse stanza."); + break; } return; } else { - char *jid = jid_fulljid_or_barejid(xmpp_presence->jid); + char* jid = jid_fulljid_or_barejid(xmpp_presence->jid); log_debug("Presence available handler fired for: %s", jid); } - xmpp_conn_t *conn = connection_get_conn(); - const char *my_jid_str = xmpp_conn_get_jid(conn); - Jid *my_jid = jid_create(my_jid_str); + xmpp_conn_t* conn = connection_get_conn(); + const char* my_jid_str = xmpp_conn_get_jid(conn); + Jid* my_jid = jid_create(my_jid_str); - XMPPCaps *caps = stanza_parse_caps(stanza); + XMPPCaps* caps = stanza_parse_caps(stanza); if ((g_strcmp0(my_jid->fulljid, xmpp_presence->jid->fulljid) != 0) && caps) { log_debug("Presence contains capabilities."); - char *jid = jid_fulljid_or_barejid(xmpp_presence->jid); + char* jid = jid_fulljid_or_barejid(xmpp_presence->jid); _handle_caps(jid, caps); } stanza_free_caps(caps); - Resource *resource = stanza_resource_from_presence(xmpp_presence); + Resource* resource = stanza_resource_from_presence(xmpp_presence); if (g_strcmp0(xmpp_presence->jid->barejid, my_jid->barejid) == 0) { connection_add_available_resource(resource); } else { - char *pgpsig = NULL; - xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_SIGNED); + char* pgpsig = NULL; + xmpp_stanza_t* x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_SIGNED); if (x) { pgpsig = xmpp_stanza_get_text(x); } sv_ev_contact_online(xmpp_presence->jid->barejid, resource, xmpp_presence->last_activity, pgpsig); - xmpp_ctx_t *ctx = connection_get_ctx(); + xmpp_ctx_t* ctx = connection_get_ctx(); xmpp_free(ctx, pgpsig); } @@ -682,7 +678,7 @@ _available_handler(xmpp_stanza_t *const stanza) } void -_send_caps_request(char *node, char *caps_key, char *id, char *from) +_send_caps_request(char* node, char* caps_key, char* id, char* from) { if (!node) { log_debug("No node string, not sending discovery IQ."); @@ -696,8 +692,8 @@ _send_caps_request(char *node, char *caps_key, char *id, char *from) } log_debug("Capabilities not cached for '%s', sending discovery IQ.", from); - xmpp_ctx_t *ctx = connection_get_ctx(); - xmpp_stanza_t *iq = stanza_create_disco_info_iq(ctx, id, from, node); + xmpp_ctx_t* ctx = connection_get_ctx(); + xmpp_stanza_t* iq = stanza_create_disco_info_iq(ctx, id, from, node); iq_send_stanza(iq); @@ -705,51 +701,51 @@ _send_caps_request(char *node, char *caps_key, char *id, char *from) } static void -_muc_user_self_handler(xmpp_stanza_t *stanza) +_muc_user_self_handler(xmpp_stanza_t* stanza) { - const char *from = xmpp_stanza_get_from(stanza); - Jid *from_jid = jid_create(from); + const char* from = xmpp_stanza_get_from(stanza); + Jid* from_jid = jid_create(from); log_debug("Room self presence received from %s", from_jid->fulljid); - char *room = from_jid->barejid; + char* room = from_jid->barejid; - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (g_strcmp0(type, STANZA_TYPE_UNAVAILABLE) == 0) { // handle nickname change - const char *new_nick = stanza_get_new_nick(stanza); + const char* new_nick = stanza_get_new_nick(stanza); if (new_nick) { muc_nick_change_start(room, new_nick); - // handle left room + // handle left room } else { - GSList *status_codes = stanza_get_status_codes_by_ns(stanza, STANZA_NS_MUC_USER); + GSList* status_codes = stanza_get_status_codes_by_ns(stanza, STANZA_NS_MUC_USER); // room destroyed if (stanza_room_destroyed(stanza)) { - const char *new_jid = stanza_get_muc_destroy_alternative_room(stanza); - char *password = stanza_get_muc_destroy_alternative_password(stanza); - char *reason = stanza_get_muc_destroy_reason(stanza); + const char* new_jid = stanza_get_muc_destroy_alternative_room(stanza); + char* password = stanza_get_muc_destroy_alternative_password(stanza); + char* reason = stanza_get_muc_destroy_reason(stanza); sv_ev_room_destroyed(room, new_jid, password, reason); free(password); free(reason); - // kicked from room + // kicked from room } else if (g_slist_find_custom(status_codes, "307", (GCompareFunc)g_strcmp0)) { - const char *actor = stanza_get_actor(stanza); - char *reason = stanza_get_reason(stanza); + const char* actor = stanza_get_actor(stanza); + char* reason = stanza_get_reason(stanza); sv_ev_room_kicked(room, actor, reason); free(reason); - // banned from room + // banned from room } else if (g_slist_find_custom(status_codes, "301", (GCompareFunc)g_strcmp0)) { - const char *actor = stanza_get_actor(stanza); - char *reason = stanza_get_reason(stanza); + const char* actor = stanza_get_actor(stanza); + char* reason = stanza_get_reason(stanza); sv_ev_room_banned(room, actor, reason); free(reason); - // normal exit + // normal exit } else { sv_ev_leave_room(room); } @@ -758,17 +754,17 @@ _muc_user_self_handler(xmpp_stanza_t *stanza) } } else { gboolean config_required = stanza_muc_requires_config(stanza); - const char *actor = stanza_get_actor(stanza); - char *reason = stanza_get_reason(stanza); - char *nick = from_jid->resourcepart; - char *show_str = stanza_get_show(stanza, "online"); - char *status_str = stanza_get_status(stanza, NULL); - const char *jid = NULL; - const char *role = NULL; - const char *affiliation = NULL; - xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); + const char* actor = stanza_get_actor(stanza); + char* reason = stanza_get_reason(stanza); + char* nick = from_jid->resourcepart; + char* show_str = stanza_get_show(stanza, "online"); + char* status_str = stanza_get_status(stanza, NULL); + const char* jid = NULL; + const char* role = NULL; + const char* affiliation = NULL; + xmpp_stanza_t* x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); if (x) { - xmpp_stanza_t *item = xmpp_stanza_get_child_by_name(x, STANZA_NAME_ITEM); + xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(x, STANZA_NAME_ITEM); if (item) { jid = xmpp_stanza_get_attribute(item, "jid"); role = xmpp_stanza_get_attribute(item, "role"); @@ -785,44 +781,44 @@ _muc_user_self_handler(xmpp_stanza_t *stanza) } static void -_muc_user_occupant_handler(xmpp_stanza_t *stanza) +_muc_user_occupant_handler(xmpp_stanza_t* stanza) { - const char *from = xmpp_stanza_get_from(stanza); - Jid *from_jid = jid_create(from); + const char* from = xmpp_stanza_get_from(stanza); + Jid* from_jid = jid_create(from); log_debug("Room presence received from %s", from_jid->fulljid); - char *room = from_jid->barejid; - char *nick = from_jid->resourcepart; - char *status_str = stanza_get_status(stanza, NULL); + char* room = from_jid->barejid; + char* nick = from_jid->resourcepart; + char* status_str = stanza_get_status(stanza, NULL); - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); if (g_strcmp0(type, STANZA_TYPE_UNAVAILABLE) == 0) { // handle nickname change - const char *new_nick = stanza_get_new_nick(stanza); + const char* new_nick = stanza_get_new_nick(stanza); if (new_nick) { muc_occupant_nick_change_start(room, new_nick, nick); - // handle left room + // handle left room } else { - GSList *status_codes = stanza_get_status_codes_by_ns(stanza, STANZA_NS_MUC_USER); + GSList* status_codes = stanza_get_status_codes_by_ns(stanza, STANZA_NS_MUC_USER); // kicked from room if (g_slist_find_custom(status_codes, "307", (GCompareFunc)g_strcmp0)) { - const char *actor = stanza_get_actor(stanza); - char *reason = stanza_get_reason(stanza); + const char* actor = stanza_get_actor(stanza); + char* reason = stanza_get_reason(stanza); sv_ev_room_occupent_kicked(room, nick, actor, reason); free(reason); - // banned from room + // banned from room } else if (g_slist_find_custom(status_codes, "301", (GCompareFunc)g_strcmp0)) { - const char *actor = stanza_get_actor(stanza); - char *reason = stanza_get_reason(stanza); + const char* actor = stanza_get_actor(stanza); + char* reason = stanza_get_reason(stanza); sv_ev_room_occupent_banned(room, nick, actor, reason); free(reason); - // normal exit + // normal exit } else { sv_ev_room_occupant_offline(room, nick, "offline", status_str); } @@ -830,24 +826,24 @@ _muc_user_occupant_handler(xmpp_stanza_t *stanza) g_slist_free_full(status_codes, free); } - // room occupant online + // room occupant online } else { // send disco info for capabilities, if not cached - XMPPCaps *caps = stanza_parse_caps(stanza); + XMPPCaps* caps = stanza_parse_caps(stanza); if (caps) { _handle_caps(from, caps); } stanza_free_caps(caps); - const char *actor = stanza_get_actor(stanza); - char *show_str = stanza_get_show(stanza, "online"); - char *reason = stanza_get_reason(stanza); - const char *jid = NULL; - const char *role = NULL; - const char *affiliation = NULL; - xmpp_stanza_t *x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); + const char* actor = stanza_get_actor(stanza); + char* show_str = stanza_get_show(stanza, "online"); + char* reason = stanza_get_reason(stanza); + const char* jid = NULL; + const char* role = NULL; + const char* affiliation = NULL; + xmpp_stanza_t* x = xmpp_stanza_get_child_by_ns(stanza, STANZA_NS_MUC_USER); if (x) { - xmpp_stanza_t *item = xmpp_stanza_get_child_by_name(x, STANZA_NAME_ITEM); + xmpp_stanza_t* item = xmpp_stanza_get_child_by_name(x, STANZA_NAME_ITEM); if (item) { jid = xmpp_stanza_get_attribute(item, "jid"); role = xmpp_stanza_get_attribute(item, "role"); @@ -864,23 +860,23 @@ _muc_user_occupant_handler(xmpp_stanza_t *stanza) } static void -_muc_user_handler(xmpp_stanza_t *const stanza) +_muc_user_handler(xmpp_stanza_t* const stanza) { inp_nonblocking(TRUE); - const char *type = xmpp_stanza_get_type(stanza); + const char* type = xmpp_stanza_get_type(stanza); // handler still fires if error if (g_strcmp0(type, STANZA_TYPE_ERROR) == 0) { return; } - const char *from = xmpp_stanza_get_from(stanza); + const char* from = xmpp_stanza_get_from(stanza); if (!from) { log_warning("MUC User stanza received with no from attribute"); return; } - Jid *from_jid = jid_create(from); + Jid* from_jid = jid_create(from); if (from_jid == NULL || from_jid->resourcepart == NULL) { log_warning("MUC User stanza received with invalid from attribute: %s", from); jid_destroy(from_jid); @@ -896,14 +892,14 @@ _muc_user_handler(xmpp_stanza_t *const stanza) } static void -_send_presence_stanza(xmpp_stanza_t *const stanza) +_send_presence_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_presence_stanza_send(text); + xmpp_conn_t* conn = connection_get_conn(); + char* plugin_text = plugins_on_presence_stanza_send(text); if (plugin_text) { xmpp_send_raw_string(conn, "%s", plugin_text); free(plugin_text); |