Changeset 5387:ec00c0a72024 in roaraudio

Timestamp:

01/16/12 18:33:43 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added function to get serverinfo for library as well as libinfo command for roarctl to list those infos

Files:

• Makefile.inc (modified) (1 diff)
• include/libroar/serverinfo.h (modified) (1 diff)
• libroar/Makefile (modified) (1 diff)
• libroar/serverinfo.c (modified) (2 diffs)
• roarclients/roarctl.c (modified) (5 diffs)
• roard/Makefile (modified) (1 diff)

Makefile.inc

@@ -6 +6 @@
 COMMON_VERSION  = $(COMMON_V_MM).$(COMMON_V_REV)
 COMMON_SOVERSION= 2
+
+PKGDEFINES      = -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" -DDISTRIBUTION_VERSION_STRING="\"$(DISTRIBUTION_VERSION_STRING)\""
 
 # libroar:

include/libroar/serverinfo.h

@@ -59 +59 @@
 
 struct roar_server_info * roar_server_info(struct roar_connection * con);
+struct roar_server_info * roar_library_info(void);
 int roar_server_info_free(struct roar_server_info * info);
 

libroar/Makefile

@@ -16 +16 @@
 #DEFINES+= -D_LIBROAR_NOATTR_WARNINGS
 INCLUDE = -I../include -I../include/libroar
-CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)
+CFLAGS += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH) $(SHARED_CF) $(fPIC)
 LDFLAGS+= -g -Wall $(SHARED) $(LDPATH)
 LIBS    = $(LIBROAR_NS)

libroar/serverinfo.c

@@ -36 +36 @@
 #include "libroar.h"
 
+// include for uname() used by roar_library_info()
+#ifdef ROAR_HAVE_UNAME
+#include <sys/utsname.h>
+#endif
+
 struct ie {
  int type;
@@ -71 +76 @@
 }
 
+#ifdef ROAR_HAVE_GETHOSTID
+#define _HOSTID_BUFLEN 64
+#else
+#define _HOSTID_BUFLEN 0
+#endif
+struct roar_server_info * roar_library_info(void) {
+ struct roar_server_info * ret = roar_mm_malloc(sizeof(struct roar_server_info) + _HOSTID_BUFLEN);
+#ifdef ROAR_HAVE_UNAME
+ static struct utsname utsname;
+ static int utsname_inited = 0;
+#endif
+#ifdef ROAR_HAVE_GETHOSTID
+ long hostid;
+ char * hostidbuf = ((void*)ret) + sizeof(*ret);
+#endif
+
+ if ( ret == NULL )
+  return NULL;
+
+ memset(ret, 0, sizeof(struct roar_server_info));
+
+#if 0
++ const char * version;
+X const char * location;
+X const char * description;
+X const char * contact;
+X const char * serial;
+X const char * address;
+X const char * uiurl;
+ const char * hostid;
++ const char * license;
++ const char * build;
++ struct {
++  const char * sysname;
++  const char * release;
++  const char * nodename;
++  const char * machine;
++ } un;
+#endif
+
+ if ( DISTRIBUTION_VERSION_STRING[0] == 0 ) {
+  ret->version = "libroar/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";
+ } else {
+  ret->version = "libroar/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING "> (" DISTRIBUTION_VERSION_STRING ")";
+ }
+#ifdef ROAR_HAVE_GETHOSTID
+ hostid = gethostid();
+ snprintf(hostidbuf, _HOSTID_BUFLEN, sizeof(long) == 8 ? "0x%.16lx" : "0x%.8lx", hostid);
+ ret->hostid = hostidbuf;
+#endif
+ ret->license = ROAR_LICENSE_GPLv3_0;
+ ret->build   = ROAR_BUILD_STAMP;
+
+#ifdef ROAR_HAVE_UNAME
+ if ( !utsname_inited )
+  if ( uname(&utsname) == 0 )
+   utsname_inited = 1;
+
+ if ( utsname_inited ) {
+  ret->un.sysname  = utsname.sysname;
+  ret->un.release  = utsname.release;
+  ret->un.nodename = utsname.nodename;
+  ret->un.machine  = utsname.machine;
+ }
+#endif
+#ifdef ROAR_HAVE_GETVERSIONEX
+ ret->un.sysname = "Windows";
+#endif
+
+ return ret;
+}
+
 int roar_server_info_free(struct roar_server_info * info) {
- if ( info == NULL )
+ if ( info == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  roar_mm_free(info);

roarclients/roarctl.c

@@ -127 +127 @@
         "\n"
         "  serverinfo              - Gets general information about the server\n"
+        "  libinfo                 - Gets general information about the library (libroar)\n"
         "  servertime              - Gets server's time\n"
         "  serveroinfo             - Gets Information about server output\n"
@@ -270 +271 @@
 #endif
 
-#define _pm(m,n) if ( info->m != NULL ) printf("Server %-15s: %s\n", (n), (info->m));
+#define _pm(m,n) if ( info->m != NULL ) printf(con != NULL ? "Server %-15s: %s\n" : "Library %-14s: %s\n", (n), (info->m));
 void server_info (struct roar_connection * con) {
- struct roar_server_info * info = roar_server_info(con);
+ struct roar_server_info * info = con != NULL ? roar_server_info(con) : roar_library_info();
  long hostid;
 
@@ -294 +295 @@
 
   if ( hostid ) {
-   printf("Server %-15s: %s (%li.%li.%li.%li)\n", "HostID", info->hostid,
+   printf(con != NULL ? "Server %-15s: %s (%li.%li.%li.%li)\n"
+                      : "Library %-14s: %s (%li.%li.%li.%li)\n", "HostID", info->hostid,
            ((hostid & 0x00FF0000UL) >> 16UL),
            ((hostid & 0xFF000000UL) >> 24UL),
@@ -301 +303 @@
          );
   } else {
-   printf("Server %-15s: %s\n", "HostID", info->hostid);
+   _pm(hostid, "HostID");
   }
  }
@@ -1310 +1312 @@
   } else if ( !strcmp(k, "serverinfo") ) {
    server_info(&con);
+  } else if ( !strcmp(k, "libinfo") ) {
+   server_info(NULL);
   } else if ( !strcmp(k, "servertime") ) {
    server_time(&con);

roard/Makefile

@@ -16 +16 @@
 #DEFINES        = -DDEBUG
 #DEFINES        = -DMONITOR_LATENCY
-PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\"" -DDISTRIBUTION_VERSION_STRING="\"$(DISTRIBUTION_VERSION_STRING)\""
 INCLUDE   = -I../include -I./include
 CFLAGS   += -g -Wall $(OPTI_O) $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH)