Changeset 7b40f17

Timestamp:

2014-10-11T02:20:53Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

46511b3

Parents:

0e35ff6

Message:

Add support for XEP-0203: Delayed delivery (message timestamps)

Very similar to XEP-0091 which is already supported, but was marked as
obsolete, replaced by XEP-0203. The main differences are the tag name
and the timestamp format.

Due to the similarities, both XEPs are still supported.

Files:

• lib/xmltree.c (modified) (1 diff)
• lib/xmltree.h (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (1 diff)

lib/xmltree.c

@@ -524 +524 @@
 }
 
+struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value ) {
+        struct xt_node *c;
+        char *s;
+
+        for( c = xt; ( c = xt_find_node( c, tag ) ); c = c->next )
+        {
+                if( ( s = xt_find_attr( c, key ) ) && strcmp( s, value ) == 0 )
+                {
+                        return c;
+                }
+        }
+        return NULL;
+}
+
+
 /* Strip a few non-printable characters that aren't allowed in XML streams
    (and upset some XMPP servers for example). */

lib/xmltree.h

@@ -92 +92 @@
 struct xt_node *xt_find_path( struct xt_node *node, const char *name );
 char *xt_find_attr( struct xt_node *node, const char *key );
+struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value );
 
 struct xt_node *xt_new_node( char *name, const char *text, struct xt_node *children );

protocols/jabber/jabber.h

@@ -229 +229 @@
 #define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
 #define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
-#define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
+#define XMLNS_DELAY_OLD    "jabber:x:delay"                                      /* XEP-0091 */
+#define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
 #define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */

protocols/jabber/jabber_util.c

@@ -726 +726 @@
         char *s = NULL;
         struct tm tp;
-        
-        for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
-        {
-                if( ( s = xt_find_attr( c, "xmlns" ) ) && strcmp( s, XMLNS_DELAY ) == 0 )
-                        break;
-        }
-        
-        if( !c || !( s = xt_find_attr( c, "stamp" ) ) )
-                return 0;
+        gboolean is_old = TRUE;
+        const char *format;
+
+        /* XEP-0091 has <x> */
+        c = xt_find_node_by_attr( xt->children, "x", "xmlns", XMLNS_DELAY_OLD );
+
+        if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
+                is_old = FALSE;
+
+                /* XEP-0203 has <delay> */
+                c = xt_find_node_by_attr( xt->children, "delay", "xmlns", XMLNS_DELAY );
+                if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
+                        return 0;
+                }
+        }
         
         memset( &tp, 0, sizeof( tp ) );
-        if( sscanf( s, "%4d%2d%2dT%2d:%2d:%2d", &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
-                                                &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
+
+        /* The other main difference between XEPs is the timestamp format */
+        format = (is_old) ? "%4d%2d%2dT%2d:%2d:%2d" : "%4d-%2d-%2dT%2d:%2d:%2dZ";
+
+        if( sscanf( s, format, &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
+                               &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
                 return 0;