Changeset 5031:ebd6fe192503 in roaraudio

Timestamp:

05/28/11 14:23:32 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support for ROAR_CMD_GETTIMEOFDAY

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/roartime.h (added)
• include/roaraudio/proto.h (modified) (1 diff)
• libroar/Makefile (modified) (1 diff)
• libroar/time.c (added)
• roarclients/roarctl.c (modified) (3 diffs)
• roard/commands.c (modified) (1 diff)
• roard/include/req.h (modified) (1 diff)
• roard/req.c (modified) (1 diff)

ChangeLog

@@ -5 +5 @@
         * Updated drivers to use new sync stream selection logic correctly (Closes: #136)
         * Converted most roarclients to to use VS API (See: #87)
+        * Added support for ROAR_CMD_GETTIMEOFDAY
 
 v. 0.4beta6 - Mon May 23 2011 19:49 CEST

include/libroar/libroar.h

@@ -167 +167 @@
 #include "ctl.h"
 #include "caps.h"
+#include "roartime.h"
 #include "meta.h"
 #include "file.h"

include/roaraudio/proto.h

@@ -195 +195 @@
 #define ROAR_ITST_UIURL             10
 
+// old: do not use.
 struct roar_timeofday {
  int64_t  t_sec;   // secund part of system time

libroar/Makefile

@@ -11 +11 @@
 PASSWORD=passwordapi.o pinentry.o sshaskpass.o
 CRYPTO=crypto.o random.o $(HASHES) crc.o
-OBJS=libroar.o config.o debug.o error.o basic.o stream.o client.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o $(PASSWORD) $(VIO) stack.o slp.o nnode.o roardl.o roarx11.o beep.o proto.o env.o keyval.o vs.o ltm.o notify.o notify_proxy.o asyncctl.o enumdev.o serverinfo.o $(CRYPTO) authfile.o caps.o roarfloat.o base64.o trap.o memmgr.o
+OBJS=libroar.o config.o debug.o error.o basic.o stream.o client.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o $(PASSWORD) $(VIO) stack.o slp.o nnode.o roardl.o roarx11.o beep.o proto.o env.o keyval.o vs.o ltm.o notify.o notify_proxy.o asyncctl.o enumdev.o serverinfo.o $(CRYPTO) authfile.o caps.o roarfloat.o base64.o trap.o memmgr.o time.o
 
 #DEFINES        = -DDEBUG

roarclients/roarctl.c

@@ -123 +123 @@
         "\n"
         "  serverinfo              - Gets general information about the server\n"
+        "  servertime              - Gets server's time\n"
         "  serveroinfo             - Gets Information about server output\n"
         "  serveroinfo2 DIR        - Gets Information about server output for stream direction dir\n"
@@ -243 +244 @@
 }
 #undef _pm
+
+void server_time (struct roar_connection * con) {
+ struct roar_time time;
+
+ if ( roar_get_time(con, &time) == -1 ) {
+  fprintf(stderr, "Error: can not get server time\n");
+  return;
+ }
+
+ if ( g_verbose ) {
+  printf("Server time           : %llu.%06llu [+%llu/2^64] sec\n",
+         (long long unsigned int)time.t_sec,
+         (long long unsigned int) time.t_ssec / 18446744073709LLU,
+         (long long unsigned int) time.t_ssec);
+ } else {
+  printf("Server time           : %llu.%06llu sec\n",
+         (long long unsigned int)time.t_sec,
+         (long long unsigned int) time.t_ssec / 18446744073709LLU);
+ }
+ if ( time.c_freq )
+  printf("Server clock frequency: %f Hz\n", (float)time.c_freq / 1000000000.f);
+ if ( time.c_drift )
+  printf("Server clock drift    : %llu:2^64 (~10^%f)\n",
+         (long long unsigned int)time.c_drift, logf((float)time.c_drift)/2.302585f);
+}
 
 void server_oinfo (struct roar_connection * con, int dir) {
@@ -1141 +1167 @@
   } else if ( !strcmp(k, "serverinfo") ) {
    server_info(&con);
+  } else if ( !strcmp(k, "servertime") ) {
+   server_time(&con);
   } else if ( !strcmp(k, "serveroinfo") ) {
    server_oinfo(&con, -1);

roard/commands.c

@@ -53 +53 @@
   {ROAR_CMD_PASSFH,       _NAME("PASSFH"),       req_on_passfh,       ACCLEV_PWRUSER},
 
+  {ROAR_CMD_GETTIMEOFDAY, _NAME("GETTIMEOFDAY"), req_on_gettimeofday, ACCLEV_NONE},
   {ROAR_CMD_SERVER_INFO,  _NAME("SERVER_INFO"),  req_on_server_info,  ACCLEV_NONE},    // allow this early so the client
                                                                                        // can device ealry if this server

roard/include/req.h

@@ -52 +52 @@
 int req_on_exit        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]);
 
+int req_on_gettimeofday(int client, struct roar_message * mes, char ** data, uint32_t flags[2]);
 int req_on_server_info (int client, struct roar_message * mes, char ** data, uint32_t flags[2]);
 

roard/req.c

@@ -682 +682 @@
 #endif
 
+int req_on_gettimeofday (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+#if defined(ROAR_HAVE_GETTIMEOFDAY) || defined(ROAR_HAVE_TIME)
+ struct roar_time curtime;
+#ifdef ROAR_HAVE_GETTIMEOFDAY
+ struct timeval tv;
+#elif defined(ROAR_HAVE_TIME)
+ time_t now = time(NULL);
+#endif
+
+ ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
+
+ if ( *data != NULL ) {
+  return -1;
+ }
+
+ ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
+
+ if ( mes->datalen && mes->datalen < 8 ) {
+  return -1;
+ }
+
+ ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
+
+ if ( mes->datalen >= 8 ) {
+  if ( *(uint64_t *)mes->data != 0 ) {
+   return -1;
+  }
+ }
+
+ ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
+
+ memset(&curtime, 0, sizeof(curtime));
+
+#ifdef ROAR_HAVE_GETTIMEOFDAY
+ if ( gettimeofday(&tv, NULL) == -1 )
+  return -1;
+ curtime.t_sec  = tv.tv_sec;
+ curtime.t_ssec = (uint64_t)tv.tv_usec * (uint64_t)18446744073709ULL;
+#elif defined(ROAR_HAVE_TIME)
+ curtime.t_sec = now;
+#endif
+
+ if ( roar_time_to_msg(mes, &curtime) == -1 )
+  return -1;
+
+ mes->cmd = ROAR_CMD_OK;
+
+ ROAR_DBG("req_on_gettimeofday(client=%i, mes=%p, data=%p, flags=%p) = ?", client, mes, data, flags);
+
+ return 0;
+#else
+ return -1;
+#endif
+}
+
 int req_on_server_info (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
 #ifdef ROAR_HAVE_UNAME