jsoninfo: include the relative time since olsrd started in the outer wrapper as ...
authorHans-Christoph Steiner <hans@eds.org>
Wed, 4 Jul 2012 20:50:27 +0000 (16:50 -0400)
committerHans-Christoph Steiner <hans@eds.org>
Wed, 4 Jul 2012 20:51:33 +0000 (16:51 -0400)
lib/jsoninfo/src/olsrd_jsoninfo.c

index 551739b..c3ba51c 100644 (file)
@@ -1265,13 +1265,13 @@ send_info(unsigned int send_what, int the_socket)
   if ((send_what & SIW_CONFIG) == SIW_CONFIG) {
     if (send_what != SIW_CONFIG) abuf_puts(&abuf, ",");
     ipc_print_config(&abuf);
-    //if (send_what != SIW_CONFIG) abuf_puts(&abuf, ",");
   }
   if ((send_what & SIW_PLUGINS) == SIW_PLUGINS) ipc_print_plugins(&abuf);
 
   /* output overarching meta data last so we can use abuf_json_* functions, they add a comma at the beginning */
   if (send_what & SIW_ALL) {
     abuf_json_int(&abuf, "systemTime", time(NULL));
+    abuf_json_int(&abuf, "timeSinceStartup", now_times);
     if(*uuid != 0)
       abuf_json_string(&abuf, "uuid", uuid);
     abuf_puts(&abuf, "}\n");