Changeset 371

Timestamp:

05/09/07 17:05:29 (15 months ago)

Author:

smoku

Message:

Implemented XEP-0202: Entity Time. Closes #144

Location:

trunk

Files:

• sm/mod_iq_time.c (modified) (3 diffs)
• sm/sm.c (modified) (1 diff)
• util/uri.h (modified) (3 diffs)

trunk/sm/mod_iq_time.c

@@ -28 +28 @@
   */
 
-#define uri_TIME    "jabber:iq:time"
+#ifdef ENABLE_SUPERSEDED
 static int ns_TIME = 0;
+#endif
+static int ns_URN_TIME = 0;
 
 #ifdef HAVE_TZNAME
@@ -43 +45 @@
 
     /* we only want to play with iq:time gets */
-    if(pkt->type != pkt_IQ || pkt->ns != ns_TIME)
+#ifdef ENABLE_SUPERSEDED
+    if(pkt->type != pkt_IQ || (pkt->ns != ns_TIME && pkt->ns != ns_URN_TIME))
+#else
+    if(pkt->type != pkt_IQ || pkt->ns != ns_URN_TIME)
+#endif
         return mod_PASS;
 
     t = time(NULL);
+    tm = localtime(&t);
+#ifdef HAVE_TZSET
+    tzset();
+#endif
 
-    sm_timestamp(t, buf);
+#ifdef ENABLE_SUPERSEDED
+    if(pkt->ns == ns_TIME) {
+        datetime_out(t, dt_LEGACY, buf, 64);
+        nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
+
+        strcpy(buf, asctime(tm));
+        c = strchr(buf, '\n');
+        if(c != NULL)
+            *c = '\0';
+        nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "display", buf);
+#if defined(HAVE_STRUCT_TM_TM_ZONE)
+        nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tz", (char *) tm->tm_zone);
+#elif defined(HAVE_TZNAME)
+        nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tz", tzname[0]);
+#endif
+    } else {
+#endif /* ENABLE_SUPERSEDED */
+
+    datetime_out(t, dt_DATETIME, buf, 64);
     nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
 
-    tm = localtime(&t);
+    snprintf(buf, 64, "%+03d:%02d", (int) -timezone/(60*60), (int) -timezone%(60*60));
+    nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tzo", buf);
 
-    strcpy(buf, asctime(tm));
-    c = strchr(buf, '\n');
-    if(c != NULL)
-        *c = '\0';
-    nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "display", buf);
-    
-    tzset();
-#if defined(HAVE_STRUCT_TM_TM_ZONE)
-    nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tz", (char *) tm->tm_zone);
-#elif defined(HAVE_TZNAME)
-    nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "tz", tzname[0]);
+#ifdef ENABLE_SUPERSEDED
+    }
 #endif
-
     /* tell them */
     nad_set_attr(pkt->nad, 1, -1, "type", "result", 6);
@@ -86 +105 @@
     mod->free = _iq_time_free;
 
+#ifdef ENABLE_SUPERSEDED
     ns_TIME = sm_register_ns(mod->mm->sm, uri_TIME);
     feature_register(mod->mm->sm, uri_TIME);
+#endif
+    ns_URN_TIME = sm_register_ns(mod->mm->sm, uri_URN_TIME);
+    feature_register(mod->mm->sm, uri_URN_TIME);
 
     return 0;

trunk/sm/sm.c

@@ -262 +262 @@
 }
 
-/** this was jutil_timestamp in a former life */
-void sm_timestamp(time_t t, char timestamp[18])
-{
-    struct tm *gm = gmtime(&t);
-
-    snprintf(timestamp, 18, "%d%02d%02dT%02d:%02d:%02d", 1900 + gm->tm_year,
-             gm->tm_mon + 1, gm->tm_mday, gm->tm_hour, gm->tm_min, gm->tm_sec);
-
-    return;
-}
-
 /** send a new action route */
 void sm_c2s_action(sess_t dest, char *action, char *target) {

trunk/util/uri.h

@@ -29 +29 @@
 #define INCL_UTIL_URI_H 1
 
+#define uri_XML         "http://www.w3.org/XML/1998/namespace"
+
 /* known namespace uri */
 #define uri_STREAMS     "http://etherx.jabber.org/streams"
@@ -34 +36 @@
 #define uri_SERVER      "jabber:server"
 #define uri_DIALBACK    "jabber:server:dialback"
+#define uri_DIALBACK_L  22      /* strlen(uri_DIALBACK) */
 #define uri_TLS         "urn:ietf:params:xml:ns:xmpp-tls"
 #define uri_SASL        "urn:ietf:params:xml:ns:xmpp-sasl"
 #define uri_BIND        "urn:ietf:params:xml:ns:xmpp-bind"
 #define uri_XSESSION    "urn:ietf:params:xml:ns:xmpp-session"
+#define uri_COMPRESS    "http://jabber.org/protocol/compress"
+#define uri_IQAUTH      "http://jabber.org/features/iq-auth"
+#define uri_IQREGISTER  "http://jabber.org/features/iq-register"
 #define uri_STREAM_ERR  "urn:ietf:params:xml:ns:xmpp-streams"
 #define uri_STANZA_ERR  "urn:ietf:params:xml:ns:xmpp-stanzas"
@@ -44 +50 @@
 #define uri_RESOLVER    "http://jabberd.jabberstudio.org/ns/resolver/1.0"
 #define uri_XDATA       "jabber:x:data"
-#define uri_XML         "http://www.w3.org/XML/1998/namespace"
 #define uri_OOB         "jabber:x:oob"
 
+/* these are used by SM mainly */
+#define uri_AUTH        "jabber:iq:auth"
+#define uri_REGISTER    "jabber:iq:register"
+#define uri_ROSTER      "jabber:iq:roster"
+#define uri_AGENTS      "jabber:iq:agents"
+#define uri_DELAY       "jabber:x:delay"
+#define uri_URN_DELAY   "urn:xmpp:delay"
+#define uri_TIME        "jabber:iq:time"
+#define uri_URN_TIME    "urn:xmpp:time"
+#define uri_BROWSE      "jabber:iq:browse"
+#define uri_EVENT       "jabber:x:event"
+#define uri_GATEWAY     "jabber:iq:gateway"
+#define uri_EXPIRE      "jabber:x:expire"
+#define uri_SEARCH      "jabber:iq:search"
+#define uri_DISCO       "http://jabber.org/protocol/disco"
+#define uri_DISCO_ITEMS "http://jabber.org/protocol/disco#items"
+#define uri_DISCO_INFO  "http://jabber.org/protocol/disco#info"
+
+#define uri_AMP                         "http://jabber.org/protocol/amp"
+#define uri_AMP_ERRORS                  "http://jabber.org/protocol/amp#errors"
+#define uri_AMP_ACTION_DROP             "http://jabber.org/protocol/amp?action=drop"
+#define uri_AMP_ACTION_ERROR            "http://jabber.org/protocol/amp?action=error"
+#define uri_AMP_ACTION_NOTIFY           "http://jabber.org/protocol/amp?action=notify"
+#define uri_AMP_CONDITION_DELIVER       "http://jabber.org/protocol/amp?condition=deliver"
+#define uri_AMP_CONDITION_EXPIREAT      "http://jabber.org/protocol/amp?condition=expire-at"
+#define uri_AMP_CONDITION_MATCHRESOURCE "http://jabber.org/protocol/amp?condition=match-resource"
+
 #endif