Changeset 7b40f17 for protocols


Ignore:
Timestamp:
2014-10-11T02:20:53Z (5 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.

Location:
protocols/jabber
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.h

    r0e35ff6 r7b40f17  
    229229#define XMLNS_RECEIPTS     "urn:xmpp:receipts"                                   /* XEP-0184 */
    230230#define XMLNS_VCARD        "vcard-temp"                                          /* XEP-0054 */
    231 #define XMLNS_DELAY        "jabber:x:delay"                                      /* XEP-0091 */
     231#define XMLNS_DELAY_OLD    "jabber:x:delay"                                      /* XEP-0091 */
     232#define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
    232233#define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
    233234#define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
  • protocols/jabber/jabber_util.c

    r0e35ff6 r7b40f17  
    726726        char *s = NULL;
    727727        struct tm tp;
    728        
    729         for( c = xt->children; ( c = xt_find_node( c, "x" ) ); c = c->next )
    730         {
    731                 if( ( s = xt_find_attr( c, "xmlns" ) ) && strcmp( s, XMLNS_DELAY ) == 0 )
    732                         break;
    733         }
    734        
    735         if( !c || !( s = xt_find_attr( c, "stamp" ) ) )
    736                 return 0;
     728        gboolean is_old = TRUE;
     729        const char *format;
     730
     731        /* XEP-0091 has <x> */
     732        c = xt_find_node_by_attr( xt->children, "x", "xmlns", XMLNS_DELAY_OLD );
     733
     734        if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
     735                is_old = FALSE;
     736
     737                /* XEP-0203 has <delay> */
     738                c = xt_find_node_by_attr( xt->children, "delay", "xmlns", XMLNS_DELAY );
     739                if( !c || !( s = xt_find_attr( c, "stamp" ) ) ) {
     740                        return 0;
     741                }
     742        }
    737743       
    738744        memset( &tp, 0, sizeof( tp ) );
    739         if( sscanf( s, "%4d%2d%2dT%2d:%2d:%2d", &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
    740                                                 &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
     745
     746        /* The other main difference between XEPs is the timestamp format */
     747        format = (is_old) ? "%4d%2d%2dT%2d:%2d:%2d" : "%4d-%2d-%2dT%2d:%2d:%2dZ";
     748
     749        if( sscanf( s, format, &tp.tm_year, &tp.tm_mon, &tp.tm_mday,
     750                               &tp.tm_hour, &tp.tm_min, &tp.tm_sec ) != 6 )
    741751                return 0;
    742752       
Note: See TracChangeset for help on using the changeset viewer.