Changeset 60:d1fa94aadc08 in roaraudio

Timestamp:

07/12/08 12:19:08 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added basic UNIX Domain Socket code

Files:

• include/roaraudio.h (modified) (1 diff)
• libroar/socket.c (modified) (3 diffs)
• roard/roard.c (modified) (8 diffs)

include/roaraudio.h

@@ -12 +12 @@
 #include <limits.h>
 #include <sys/mman.h>
+
+// TODO: can we move the next block into roard specific includes?
+#include <grp.h>
+#include <pwd.h>
+#include <sys/stat.h>
 
 #include <arpa/inet.h>

libroar/socket.c

@@ -65 +65 @@
  int fh;
  struct sockaddr_in   socket_addr;
+ struct sockaddr_un   socket_addr_un;
  struct hostent     * he;
  //unsigned int host_div = 0;
@@ -82 +83 @@
              type == ROAR_SOCKET_TYPE_UNIX ? "UNIX" : "INET", host, port);
 
- memset(&socket_addr, 0, sizeof(socket_addr));
- memset(&he,          0, sizeof(he));
+ memset(&socket_addr   , 0, sizeof(socket_addr));
+ memset(&socket_addr_un, 0, sizeof(socket_addr_un));
+ memset(&he,             0, sizeof(he));               // FIXME: we have a valid pointer in here????
 
 
@@ -109 +111 @@
   // hey! we have a socket...
  } else {
+  socket_addr_un.sun_family = AF_UNIX;
+  strncpy(socket_addr_un.sun_path, host, sizeof(socket_addr_un.sun_path) - 1);
+
   fh = roar_socket_new_unix();
-  close(fh);
-  return -1;
+
+  if ( mode_func(fh, (struct sockaddr *)&socket_addr_un, sizeof(struct sockaddr_un)) == -1 ) {
+   ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
+   close(fh);
+   return -1;
+  }
  }
 

roard/roard.c

@@ -2 +2 @@
 
 #include "roard.h"
+
+char * server = ROAR_DEFAULT_SOCK_GLOBAL; // global server address
 
 void usage (void) {
@@ -32 +34 @@
         " -b  --bind            - IP/Hostname to bind to\n"
         " -s  --sock            - Filename for UNIX Domain Socket\n"
+        " -G  GROUP             - Sets the group for the UNIX Domain Socket, (default: audio)\n"
+        "                         You need the permittions to change the GID\n"
        );
 // printf("\n Options:\n\n");
@@ -40 +44 @@
  int i;
  char * k;
+ char user_sock[80] = {0};
  struct roar_audio_info sa;
  char * driver = NULL;
  char * device = NULL;
  char * opts   = NULL;
- char * server = ROAR_DEFAULT_HOST;
+// char * server = ROAR_DEFAULT_SOCK_GLOBAL;
  int      port = ROAR_DEFAULT_PORT;
  int               drvid;
@@ -51 +56 @@
  char * s_opt  = NULL;
  int    s_prim = 0;
+ char * sock_grp = "audio";
+ struct group * grp;
  DRIVER_USERDATA_T drvinst;
  struct roar_client * self = NULL;
@@ -63 +70 @@
 
  g_sa = &sa;
+
+
+ if ( getuid() != 0 && getenv("HOME") ) {
+  snprintf(user_sock, 79, "%s/%s", getenv("HOME"), ROAR_DEFAULT_SOCK_USER);
+  server = user_sock;
+ }
 
  if ( sources_init() == -1 ) {
@@ -113 +126 @@
   } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 ) {
    server = argv[++i];
+  } else if ( strcmp(k, "-G") == 0 ) {
+   sock_grp = argv[++i];
 
   } else {
@@ -128 +143 @@
  }
 
+ if ( *server == '/' ) {
+  if ( (grp = getgrnam(sock_grp)) == NULL ) {
+   ROAR_ERR("Can not get GID for group %s: %s", sock_grp, strerror(errno));
+  } else {
+   chown(server, -1, grp->gr_gid);
+   if ( getuid() == 0 )
+    chmod(server, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
+  }
+ }
+
  if ( output_buffer_init(&sa) == -1 ) {
   ROAR_ERR("Can not init output buffer!");
@@ -185 +210 @@
 void clean_quit_prep (void) {
  close(g_listen_socket);
+
+ if ( *server == '/' )
+  unlink(server);
+
+
  sources_free();
  streams_free();