Changeset 5279:bb3ff1f2be28 in roaraudio for roard

Timestamp:

11/21/11 18:28:31 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to hostid and license to server info struct, added support for contact, serial and uiurl ITST to roard.

Location:

roard

Files:

• include/roard.h (modified) (1 diff)
• req.c (modified) (2 diffs)
• roard.c (modified) (3 diffs)

roard/include/roard.h

@@ -202 +202 @@
  char * location;
  char * description;
+ char * contact;
+ char * serial;
+ char * uiurl;
  size_t jumbo_mtu;
  int memlock_level;

roard/req.c

@@ -750 +750 @@
  struct roar_server_info info;
  uint16_t * d16;
+#ifdef ROAR_HAVE_GETHOSTID
+ long hostid;
+ char hostidbuf[64];
+#endif
 
  if ( mes->datalen != 4 )
@@ -771 +775 @@
    }
 
+   info.license = "GPL-3.0";
+
+#ifdef ROAR_HAVE_GETHOSTID
+   hostid = gethostid();
+   snprintf(hostidbuf, sizeof(hostidbuf), sizeof(long) == 8 ? "0x%.16lx" : "0x%.8lx", hostid);
+   info.hostid = hostidbuf;
+#endif
+
    if ( !!strcmp(g_config->location, CONF_DEF_STRING) )
     info.location = g_config->location;
 
    if ( !!strcmp(g_config->description, CONF_DEF_STRING) )
-   info.description = g_config->description;
+    info.description = g_config->description;
+
+   info.contact = g_config->contact;
+   info.serial  = g_config->serial;
+   info.uiurl   = g_config->uiurl;
 
 #ifdef ROAR_HAVE_UNAME

roard/roard.c

@@ -230 +230 @@
         " --location  LOC       - Set lion readable location of server\n"
         " --description  DESC   - Set lion readable description of server\n"
+        " --contact CONTACT     - Set contact for this server\n"
+        " --serial SERIAL       - Set serial for this device or server\n"
+        "                         (for embedded devices only)\n"
+        " --uiurl UIURL         - Set URL for userinterface of this device or server\n"
+        "                         (for embedded devices only)\n"
 #ifdef SUPPORT_PIDFILE
         " --pidfile PIDFILE     - Write a pidfile at PIDFILE\n"
@@ -513 +518 @@
  g_config->location    = CONF_DEF_STRING;
  g_config->description = CONF_DEF_STRING;
+ g_config->contact     = NULL;
+ g_config->serial      = NULL;
+ g_config->uiurl       = NULL;
 
  g_config->memlock_level = -1;
@@ -1657 +1665 @@
    _CKHAVEARGS(1);
    g_config->description = argv[++i];
+  } else if ( strcmp(k, "--contact") == 0 ) {
+   _CKHAVEARGS(1);
+   g_config->contact = argv[++i];
+  } else if ( strcmp(k, "--serial") == 0 ) {
+   _CKHAVEARGS(1);
+   g_config->serial = argv[++i];
+  } else if ( strcmp(k, "--uiurl") == 0 ) {
+   _CKHAVEARGS(1);
+   g_config->uiurl = argv[++i];
   } else if ( strcmp(k, "--pidfile") == 0 ) {
    _CKHAVEARGS(1);