Changeset 5369:dfc6cbfe8025 in roaraudio for libroar/socket.c

Timestamp:

12/21/11 01:08:49 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved +fork out of socket.c into basic.c, now also support +fork=d:daemon and +fork=!daemon_command

File:

• libroar/socket.c (modified) (2 diffs)

libroar/socket.c

@@ -795 +795 @@
 #endif
  } else if ( type == ROAR_SOCKET_TYPE_FORK ) {
-  return roar_socket_open_fork(mode, host, port);
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
  } else if ( type == ROAR_SOCKET_TYPE_FILE ) {
   return roar_socket_open_file(mode, host, port);
@@ -817 +818 @@
 
  return fh;
-}
-
-int roar_socket_open_fork  (int mode, const char * host, int port) {
-#if !defined(ROAR_TARGET_WIN32) && !defined(ROAR_TARGET_MICROCONTROLLER)
- char * daemonimage;
- int socks[2];
- int r;
- char fhstr[8];
-
- if ( mode == MODE_LISTEN )
-  return -1;
-
- // TODO: FIXME: we should move this into the config structure.
- daemonimage = getenv("ROAR_DAEMONIMAGE");
-
- if ( daemonimage == NULL || *daemonimage == 0 )
-  daemonimage = "roard";
-
- if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
-  return -1;
- }
-
- r = fork();
-
- if ( r == -1 ) { // error!
-  ROAR_ERR("roar_socket_open_fork(*): Can not fork: %s", strerror(errno));
-  close(socks[0]);
-  close(socks[1]);
-  return -1;
- } else if ( r == 0 ) { // we are the child
-  close(socks[0]);
-
-  close(ROAR_STDIN ); // we do not want roard to have any standard input
-  close(ROAR_STDOUT); // STDOUT is also not needed, so we close it,
-                      // but STDERR we keep open for error messages.
-
-  snprintf(fhstr, 7, "%i", socks[1]);
-
-  execlp(daemonimage, daemonimage, "--no-listen", "--client-fh", fhstr, (_LIBROAR_GOOD_CAST char*)NULL);
-
-  // we are still alive?
-  ROAR_ERR("roar_socket_open_fork(*): alive after exec(), that's bad!");
-  _exit(1);
- } else { // we are the parent
-  close(socks[1]);
-  return socks[0];
- }
-
- return -1;
-#else
- ROAR_ERR("roar_socket_open_fork(*): There is no UNIX Domain Socket support in win32, download a real OS.");
- return -1;
-#endif
 }