Changeset 8c1eb80

Timestamp:

2008-02-03T16:59:39Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8ff0a61

Parents:

979cfb4

Message:

Implemented XEP-0115. This adds some info to the <presence/> tags so
clients interested in capabilities can cache discovery info, so they don't
have to ask about it every time you/they log in.

Location:

protocols/jabber

Files:

• iq.c (modified) (1 diff)
• jabber.h (modified) (1 diff)
• presence.c (modified) (4 diffs)

protocols/jabber/iq.c

@@ -92 +92 @@
                 else if( strcmp( s, XMLNS_DISCOVER ) == 0 )
                 {
-                        const char *features[] = { XMLNS_VERSION,
+                        const char *features[] = { XMLNS_DISCOVER,
+                                                   XMLNS_VERSION,
                                                    XMLNS_TIME,
                                                    XMLNS_CHATSTATES,

protocols/jabber/jabber.h

@@ -166 +166 @@
 #define XMLNS_MUC          "http://jabber.org/protocol/muc"     /* XEP-0045 */
 #define XMLNS_MUC_USER     "http://jabber.org/protocol/muc#user"/* XEP-0045 */
+#define XMLNS_CAPS         "http://jabber.org/protocol/caps"    /* XEP-0115 */
 
 /* iq.c */

protocols/jabber/presence.c

@@ -29 +29 @@
         char *from = xt_find_attr( node, "from" );
         char *type = xt_find_attr( node, "type" );      /* NULL should mean the person is online. */
-        struct xt_node *c;
+        struct xt_node *c, *cap;
         struct jabber_buddy *bud, *send_presence = NULL;
         int is_chat = 0;
@@ -76 +76 @@
                 else
                         bud->priority = 0;
+                
+                if( bud && ( cap = xt_find_node( node->children, "c" ) ) &&
+                    ( s = xt_find_attr( cap, "xmlns" ) ) && strcmp( s, XMLNS_CAPS ) == 0 )
+                {
+                        /* This <presence> stanza includes an XEP-0115
+                           capabilities part. Not too interesting, but we can
+                           see if it has an ext= attribute. */
+                        s = xt_find_attr( cap, "ext" );
+                        if( s && ( strstr( s, "cstates" ) || strstr( s, "chatstate" ) ) )
+                                bud->flags |= JBFLAG_DOES_XEP85;
+                        
+                        /* This field can contain more information like xhtml
+                           support, but we don't support that ourselves.
+                           Officially the ext= tag was deprecated, but enough
+                           clients do send it.
+                           
+                           (I'm aware that this is not the right way to use
+                           this field.) See for an explanation of ext=:
+                           http://www.xmpp.org/extensions/attic/xep-0115-1.3.html*/
+                }
                 
                 if( is_chat )
@@ -186 +206 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *node;
+        struct xt_node *node, *cap;
         char *show = jd->away_state->code;
         char *status = jd->away_message;
@@ -199 +219 @@
                 xt_add_child( node, xt_new_node( "status", status, NULL ) );
         
+        /* This makes the packet slightly bigger, but clients interested in
+           capabilities can now cache the discovery info. This reduces the
+           usual post-login iq-flood. See XEP-0115. At least libpurple and
+           Trillian seem to do this right. */
+        cap = xt_new_node( "c", NULL, NULL );
+        xt_add_attr( cap, "xmlns", XMLNS_CAPS );
+        xt_add_attr( cap, "node", "http://bitlbee.org/xmpp/caps" );
+        xt_add_attr( cap, "ver", BITLBEE_VERSION ); /* The XEP wants this hashed, but nobody's doing that. */
+        xt_add_child( node, cap );
+        
         st = jabber_write_packet( ic, node );