Changeset 5373:8da157c10483 in roaraudio for libroar/config.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/config.c (modified) (3 diffs)

libroar/config.c

@@ -50 +50 @@
 
 #ifdef ROAR_SUPPORT_TRAP
-  config.trap_policy = ROAR_TRAP_IGNORE;
+  config.trap_policy      = ROAR_TRAP_IGNORE;
 #endif
-  config.opmode      = ROAR_LIBROAR_CONFIG_OPMODE_NORMAL;
-  config.server   = NULL;
-  config.authfile = NULL;
+  config.opmode           = ROAR_LIBROAR_CONFIG_OPMODE_NORMAL;
+  config.server           = NULL;
+  config.authfile         = NULL;
+  config.forkapi          = NULL;
+  config.connect_internal = NULL;
+  config.daemonimage      = NULL;
 
   if ( home != NULL ) {
-   snprintf(authfile, 1023, "%s/.roarauth", home);
-   authfile[1023]     = 0;
+   snprintf(authfile, sizeof(authfile)-1, "%s/.roarauth", home);
+   authfile[sizeof(authfile)-1] = 0;
    config.authfile    = authfile;
    config.serversfile = NULL;
@@ -304 +307 @@
   } else if ( !strcmp(k, "x11-display") ) {
    config->x11.display = v;
+  } else if ( !strcmp(k, "daemonimage") ) {
+   config->daemonimage = v;
+  } else if ( !strcmp(k, "serverflags") ) {
+   if ( !strcmp(v, "nonblock") ) {
+    config->serverflags |= ROAR_ENUM_FLAG_NONBLOCK;
+   } else if ( !strcmp(v, "hardnonblock") ) {
+    config->serverflags |= ROAR_ENUM_FLAG_HARDNONBLOCK;
+   } else if ( !strcmp(v, "localonly") ) {
+    config->serverflags |= ROAR_ENUM_FLAG_LOCALONLY;
+   } else {
+    ROAR_WARN("roar_libroar_config_parse(*): Unknown serverflag: %s", v);
+   }
   } else {
    ROAR_WARN("roar_libroar_config_parse(*): Unknown option: %s", k);
@@ -389 +404 @@
 }
 
+int    roar_libroar_set_forkapi(struct roar_libroar_forkapi * api) {
+ roar_libroar_get_config_ptr()->forkapi = api;
+ return 0;
+}
+
+int    roar_libroar_set_connect_internal(struct roar_vio_calls * (*func)(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout)) {
+ roar_libroar_get_config_ptr()->connect_internal = func;
+ return 0;
+}
+
 void   roar_libroar_nowarn(void) {
  roar_libroar_get_config_ptr()->nowarncounter++;