Changeset 4438:cd8f86bcbadc in roaraudio

Timestamp:

10/09/10 15:37:12 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use vars from configure, implement support for uname

Location:

roard

Files:

• Makefile (modified) (1 diff)
• req.c (modified) (3 diffs)

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)"
+PKGDEFINES= -DPACKAGE_VERSION="\"$(VERSION)\"" -DDEVICE_VENDOR_ID=$(DEV_VENDOR) -DDEVICE_VENDOR_NAME="\"$(DEV_VENDOR_NAME)\"" -DDEVICE_VENDOR_STRING="\"$(DEV_VENDOR_STRING)\""
 INCLUDE   = -I../include -I./include
 CFLAGS   += -g -Wall -O2 $(DEFINES) $(PKGDEFINES) $(INCLUDE) $(INCPATH)

roard/req.c

@@ -26 +26 @@
 #include "roard.h"
 
+// include for uname() used by req_on_server_info()
+#ifdef ROAR_HAVE_UNAME
+#include <sys/utsname.h>
+#endif
+
 static void * _dataspace(struct roar_message * mes, char ** data, uint32_t flags[2], size_t len) {
  if ( len <= LIBROAR_BUFFER_MSGDATA )
@@ -537 +542 @@
 
 int req_on_server_info (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+#ifdef ROAR_HAVE_UNAME
+ struct utsname utsname;
+#endif
  struct roar_server_info info;
  uint16_t * d16;
@@ -553 +561 @@
    memset(&info, 0, sizeof(info));
 
-   info.version = "roard/? <0/RoarAudio>";
+   info.version = "roard/" PACKAGE_VERSION " <" DEVICE_VENDOR_STRING ">";
    info.location = g_config->location;
    info.description = g_config->description;
+
+#ifdef ROAR_HAVE_UNAME
+   if ( uname(&utsname) == 0 ) {
+    info.un.sysname  = utsname.sysname;
+    info.un.release  = utsname.release;
+    info.un.nodename = utsname.nodename;
+    info.un.machine  = utsname.machine;
+   }
+#endif
 
    if ( roar_server_info_to_mes(mes, &info) == -1 )