Changeset 5373:8da157c10483 in roaraudio for libroar/basic.c

Timestamp:

12/21/11 19:02:52 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Updated config structure
• Added a flag to ask libroar to only connect to local servers
• Added a way to override fork()
• added support for +internal

File:

• libroar/basic.c (modified) (8 diffs)

libroar/basic.c

@@ -64 +64 @@
  }
 
- // TODO: FIXME: we should move this into the config structure.
  if ( daemonimage == NULL )
+  daemonimage = roar_libroar_get_config()->daemonimage;
+
+ // we keep this step to be compatible with older versions.
+ if ( daemonimage == NULL || *daemonimage == 0 ) {
   daemonimage = getenv("ROAR_DAEMONIMAGE");
+  if ( daemonimage != NULL ) {
+   ROAR_WARN("_start_server(*): Usage of $ROAR_DAEMONIMAGE is obsolete. Use ROAR_OPTIONS=daemonimage:...");
+  }
+ }
 
  if ( daemonimage == NULL || *daemonimage == 0 )
@@ -76 +83 @@
  }
 
- r = fork();
+ r = roar_fork(NULL);
 
  if ( r == -1 ) { // error!
-  roar_err_from_errno();
-  ROAR_ERR("roar_socket_open_fork(*): Can not fork: %s", strerror(errno));
+  ROAR_ERR("_start_server(*): Can not fork: %s", roar_error2str(roar_error));
   close(socks[0]);
   close(socks[1]);
@@ -106 +112 @@
 
   // we are still alive?
-  ROAR_ERR("roar_socket_open_fork(*): alive after exec(), that's bad!");
+  ROAR_ERR("_start_server(*): alive after exec(), that's bad!");
   _exit(1);
  } else { // we are the parent
@@ -121 +127 @@
  return -1;
 #else
- ROAR_ERR("roar_socket_open_fork(*): There is no UNIX Domain Socket support in win32, download a real OS.");
+ ROAR_ERR("_start_server(*): There is no UNIX Domain Socket support in win32, download a real OS.");
  return -1;
 #endif
+}
+
+static int _connect_internal(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
+ struct roar_vio_calls * vio;
+
+ if ( config->connect_internal != NULL ) {
+  vio = config->connect_internal(con, server, type, flags, timeout);
+  if ( vio == NULL )
+   return -1;
+
+  con->viocon = vio;
+  con->flags |= ROAR_CON_FLAGS_VIO;
+
+  return 0;
+ }
+
+ roar_err_set(ROAR_ERROR_BADHOST);
+ return -1;
 }
 
@@ -153 +178 @@
  } else if ( !strcmp(server, "+fork") || !strncmp(server, "+fork=", 6) ) {
   return _start_server(con, server, type, flags, timeout);
+ } else if ( !strcmp(server, "+internal") || !strncmp(server, "+internal=", 10) ) {
+  return _connect_internal(con, server, type, flags, timeout);
  }
 
@@ -346 +373 @@
 #ifdef ROAR_HAVE_LIBSLP
  if ( !(config->workaround.workarounds & ROAR_LIBROAR_CONFIG_WAS_NO_SLP) &&
-      !(flags & ROAR_ENUM_FLAG_NONBLOCK)
+      !(flags & ROAR_ENUM_FLAG_NONBLOCK) &&
+      !(flags & ROAR_ENUM_FLAG_LOCALONLY)
     ) {
   if ( (server = roar_slp_find_roard(0)) != NULL ) {
@@ -391 +419 @@
 
 int roar_connect     (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
+
  if ( con == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);
@@ -400 +430 @@
 
  roar_err_set(ROAR_ERROR_UNKNOWN);
- if ( roar_connect_raw(con, server, flags, timeout) == -1 )
-  return -1;
-
+ if ( roar_connect_raw(con, server, flags | config->serverflags, timeout) == -1 )
+  return -1;
+
+ // TODO: this should be moved to be within _connect_server() so it also stores server names of auto located servers.
  if ( server != NULL ) {
   con->server_name = roar_mm_strdup(server);