Changeset 1849c5b

Timestamp:

2021-03-29T14:08:27Z (4 years ago)

Author:

/ <>

Children:

a181ec1

Parents:

ef70f9f (diff), a42169b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'jabberblock' into integration_tests

Location:

protocols/jabber

Files:

• Makefile (modified) (1 diff)
• block.c (added)
• iq.c (modified) (3 diffs)
• jabber.h (modified) (3 diffs)

protocols/jabber/Makefile

@@ -13 +13 @@
 
 # [SH] Program variables
-objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o
+objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o s5bytestream.o sasl.o si.o hipchat.o block.o
 
 LFLAGS += -r

protocols/jabber/iq.c

@@ -388 +388 @@
         struct xt_node *response;
         struct jabber_data *jd = ic->proto_data;
-        
+
         response = jabber_make_packet("iq", "result", jd->me, NULL);
 
@@ -1007 +1007 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *query, *id;
+        struct xt_node *query, *id, *c;
+        char *feature;
 
         if (!(query = xt_find_node(node->children, "query"))) {
                 return XT_HANDLED;
+        }
+
+        c = query->children;
+
+        while ((c = xt_find_node(c, "feature"))) {
+                feature = xt_find_attr(c, "var");
+                if (feature) {
+                        jd->features = g_slist_append(jd->features, g_strdup(feature));
+                }
+                c = c->next;
         }
 
@@ -1040 +1051 @@
                 }
         }
+
+        jabber_block_feature(ic);
 
         return XT_HANDLED;

protocols/jabber/jabber.h

@@ -109 +109 @@
         GHashTable *buddies;
 
+        GSList *features;
         GSList *filetransfers;
         GSList *streamhosts;
@@ -244 +245 @@
 #define XMLNS_BYTESTREAMS  "http://jabber.org/protocol/bytestreams"              /* XEP-0065 */
 #define XMLNS_IBB          "http://jabber.org/protocol/ibb"                      /* XEP-0047 */
+#define XMLNS_BLOCK        "urn:xmpp:blocking"                                   /* XEP-0191 */
 
 /* Hipchat protocol extensions*/
@@ -283 +285 @@
 int presence_send_update(struct im_connection *ic);
 int presence_send_request(struct im_connection *ic, char *handle, char *request);
+
+/* block.c */
+void jabber_buddy_block(struct im_connection *ic, char *who);
+void jabber_buddy_unblock(struct im_connection *ic, char *who);
+void jabber_buddy_permit(struct im_connection *ic, char *who);
+void jabber_buddy_unpermit(struct im_connection *ic, char *who);
+int jabber_block_feature(struct im_connection *ic);
 
 /* jabber_util.c */