Changeset 7554702 for protocols/jabber

Timestamp:

2015-11-25T15:56:09Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

42a418e

Parents:

5b01e1a

Message:

jabber: Reply unknown IQs with service-unavailable instead

It was sending 'feature-not-implemented' for <query> with unknown xmlns
(which makes sense, but the RFC says that's wrong. idk.) and nothing at
all for IQs that don't have query/ping/time elements or an xmlns
attribute. Both get service-unavailable now.

Addresses the rest of trac ticket 533:

​https://bugs.bitlbee.org/bitlbee/ticket/533

File:

• protocols/jabber/iq.c (modified) (2 diffs)

protocols/jabber/iq.c

@@ -53 +53 @@
                       (c = xt_find_node(node->children, "time"))) ||
                     !(s = xt_find_attr(c, "xmlns"))) {
-                        /* Sigh. Who decided to suddenly invent new elements
-                           instead of just sticking with <query/>? */
-                        return XT_HANDLED;
+
+                        reply = jabber_make_error_packet(node, "service-unavailable", "cancel", NULL);
+                        st = jabber_write_packet(ic, reply);
+                        xt_free_node(reply);
+                        return st;
                 }
 
@@ -136 +138 @@
                 } else {
                         xt_free_node(reply);
-                        reply = jabber_make_error_packet(node, "feature-not-implemented", "cancel", NULL);
+                        reply = jabber_make_error_packet(node, "service-unavailable", "cancel", NULL);
                         pack = 0;
                 }