Changeset 68:797b3512e1d9 in roaraudio

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

added basic demon support, a option to not listen on any sockets and support to create clients out of given FHs

Location:

roard

Files:

• loop.c (modified) (1 diff)
• roard.c (modified) (8 diffs)

roard/loop.c

@@ -25 +25 @@
   ROAR_DBG("main_loop(*): looping...");
 
-  ROAR_DBG("main_loop(*): check for new clients...");
-  net_check_listen();
+  if ( g_listen_socket != -1 ) {
+   ROAR_DBG("main_loop(*): check for new clients...");
+   net_check_listen();
+  }
 
   ROAR_DBG("main_loop(*): check for new data...");

roard/roard.c

@@ -8 +8 @@
  printf("Usage: roard [OPTIONS]...\n\n");
 
- printf("Audio Options:\n\n");
+ printf("Misc Options:\n\n");
+ printf(
+        " --demon               - bring the server into background after init\n"
+       );
+
+ printf("\nAudio Options:\n\n");
  printf(
         " -R  --rate   RATE     - Set server rate\n"
@@ -36 +41 @@
         " -G  GROUP             - Sets the group for the UNIX Domain Socket, (default: audio)\n"
         "                         You need the permittions to change the GID\n"
+        " --no-listen           - Do not listen for new clients (only usefull for relaing)\n"
+        " --client-fh           - Communite with a client over this handle\n"
+        "                         (only usefull for relaing)\n"
        );
 // printf("\n Options:\n\n");
@@ -46 +54 @@
  char user_sock[80] = {0};
  struct roar_audio_info sa;
+ int    demon = 0;
  char * driver = NULL;
  char * device = NULL;
@@ -109 +118 @@
    return 0;
 
+  } else if ( strcmp(k, "--demon") == 0 ) {
+   demon = 1;
+
   } else if ( strcmp(k, "-R") == 0 || strcmp(k, "--rate") == 0 ) {
    sa.rate = atoi(argv[++i]);
@@ -144 +156 @@
   } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--port") == 0 ) {
    port = atoi(argv[++i]);
-  } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 ) {
+  } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 || strcmp(k, "-s") == 0 || strcmp(k, "--sock") == 0 ) {
    server = argv[++i];
   } else if ( strcmp(k, "-t") == 0 ) {
@@ -153 +165 @@
    sock_grp = argv[++i];
 
+  } else if ( strcmp(k, "--no-listen") == 0 ) {
+   *server = 0;
+  } else if ( strcmp(k, "--client-fh") == 0 ) {
+   if ( clients_set_fh(clients_new(), atoi(argv[++i])) == -1 ) {
+    ROAR_ERR("main(*): Can not set client's fh");
+    return 1;
+   }
+
   } else {
    usage();
@@ -162 +182 @@
  ROAR_DBG("Server config: rate=%i, bits=%i, chans=%i", sa.rate, sa.bits, sa.channels);
 
- if ( (g_listen_socket = roar_socket_listen(ROAR_SOCKET_TYPE_UNKNOWN, server, port)) == -1 ) {
-  ROAR_ERR("Can not open listen socket!");
-  return 1;
- }
-
- 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 ( *server != 0 ) {
+  if ( (g_listen_socket = roar_socket_listen(ROAR_SOCKET_TYPE_UNKNOWN, server, port)) == -1 ) {
+   ROAR_ERR("Can not open listen socket!");
+   return 1;
+  }
+
+  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);
+   }
   }
  }
@@ -206 +228 @@
 
  strcpy(self->name, "RoarAudio demon internal");
+
+ if ( demon ) {
+  close(ROAR_STDIN );
+  close(ROAR_STDOUT);
+  close(ROAR_STDERR);
+  if ( fork() )
+   _exit(0);
+ }
+
  // start main loop...
  main_loop(drvid, drvinst, &sa);