Changeset 2762 for pjproject/trunk/pjsip/src/pjsip-simple/presence_body.c

Timestamp:

Jun 15, 2009 4:03:40 PM (15 years ago)

Author:

bennylp

Message:

Ticket #873: Include the parsed XML tuple in the pjsip_pres_status, and include it in the pjsua_buddy_info in PJSUA-LIB, in case the PIDF document contains other info that is needed by application (thanks Johan Lantz for the suggestion)

File:

• pjproject/trunk/pjsip/src/pjsip-simple/presence_body.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/presence_body.c

@@ -101 +101 @@
         pjpidf_status_set_basic_open(pidf_status, 
                                      status->info[i].basic_open);
+
+        /* Add <timestamp> if configured */
+#if defined(PJSIP_PRES_PIDF_ADD_TIMESTAMP) && PJSIP_PRES_PIDF_ADD_TIMESTAMP
+        if (PJSIP_PRES_PIDF_ADD_TIMESTAMP) {
+          char buf[50];
+          int tslen = 0;
+          pj_time_val tv;
+          pj_parsed_time pt;
+
+          pj_gettimeofday(&tv);
+          /* TODO: convert time to GMT! (unsupported by pjlib) */
+          pj_time_decode( &tv, &pt);
+
+          tslen = pj_ansi_snprintf(buf, sizeof(buf),
+                                   "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
+                                   pt.year, pt.mon, pt.day, 
+                                   pt.hour, pt.min, pt.sec, pt.msec);
+          if (tslen > 0 && tslen < sizeof(buf)) {
+              pj_str_t time = pj_str(buf);
+              pjpidf_tuple_set_timestamp(pool, pidf_tuple, &time);
+          }
+        }
+#endif
     }
 
@@ -180 +203 @@
 
     pidf_tuple = pjpidf_pres_get_first_tuple(pidf);
-    while (pidf_tuple) {
+    while (pidf_tuple && pres_status->info_cnt < PJSIP_PRES_STATUS_MAX_INFO) {
         pjpidf_status *pidf_status;
+
+        pres_status->info[pres_status->info_cnt].tuple_node = 
+            pj_xml_clone(pool, pidf_tuple);
 
         pj_strdup(pool, 
@@ -232 +258 @@
     pres_status->info[0].basic_open = pjxpidf_get_status(xpidf);
     pres_status->info[0].id.slen = 0;
+    pres_status->info[0].tuple_node = NULL;
 
     return PJ_SUCCESS;