Changeset 9ead105 for protocols/jabber/jabber_util.c

Timestamp:

2014-10-17T22:37:41Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fef97af

Parents:

4f7255d (diff), 46511b3 (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:

Bunch of merges from dx.

File:

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

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;