Changeset 5838:52ca1a88734e in roaraudio

Timestamp:

01/07/13 02:36:01 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

handle setting of server name in connection object in a better way. also added new command "servername" to roarctl to debug this a bit. This is one little step needed by ##337

Files:

• doc/man1/roarctl.1 (modified) (1 diff)
• libroar/basic.c (modified) (7 diffs)
• libroar/config.c (modified) (4 diffs)
• roarclients/roarctl.c (modified) (2 diffs)

doc/man1/roarctl.1

@@ -67 +67 @@
 
 This is not supported on all platforms.
+
+.TP
+\fBservername\fR
+This command shows the server address of the server currently connected to.
+This can be diffrent from what has given e.g. in case of special server
+names like +fork.
 
 .TP

libroar/basic.c

@@ -46 +46 @@
  int r;
  char fhstr[12];
+ size_t len;
 
  if ( !strncmp(server, "+fork=", 6) ) {
@@ -78 +79 @@
   daemonimage = "roard";
 
+ len = roar_mm_strlen(daemonimage) + 9; // 9 = '+fork=' + 'X:' + '\0'
+ con->server_name = roar_mm_malloc(len);
+ if ( con->server_name != NULL ) {
+  snprintf(con->server_name, len, "+fork=%s%s", mode == NORMAL ? "d:" : "!", daemonimage);
+ }
+
  if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
   roar_err_from_errno();
@@ -164 +171 @@
  int fh = -1;
  int err;
+ int ret;
 
  if ( con == NULL || server == NULL ) {
@@ -177 +185 @@
    return -1;
   con->flags |= ROAR_CON_FLAGS_VIO;
+  con->server_name = roar_mm_strdup(server);
   return 0;
  } 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);
+  ret = _connect_internal(con, server, type, flags, timeout);
+  if ( ret == 0 )
+   con->server_name = roar_mm_strdup(server);
+  return ret;
  }
 
@@ -217 +229 @@
 
   if ( *obj == 0 ) {
-#ifdef DN_MAXOBJL
    roar_mm_strlcat(user_sock, ROAR_DEFAULT_OBJECT, sizeof(user_sock)-1);
    user_sock[sizeof(user_sock)-1] = 0;
-#else
-   ROAR_ERR("roar_connect_raw(*): size of DECnet object unknown.");
-#endif
-  }
-   ROAR_DBG("roar_connect_raw(*): user_sock='%s'", user_sock);
+  }
+
+  ROAR_DBG("roar_connect_raw(*): user_sock='%s'", user_sock);
  }
 
@@ -265 +274 @@
  }
 
+ con->server_name = roar_mm_strdup(server);
+
  roar_err_set(ROAR_ERROR_NONE);
  return 0;
@@ -449 +460 @@
   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);
- }
-
  return 0;
 }

libroar/config.c

@@ -36 +36 @@
 #include "libroar.h"
 
+#define LEN_AUTHFILE 1024
+
 static struct roar_libroar_config_codec *
            roar_libroar_config_codec_get_conf(int32_t codec, int create, struct roar_libroar_config * config);
@@ -43 +45 @@
  static struct roar_libroar_config config;
  static int    inited = 0;
- static char   authfile[1024];
+ static char   authfile[LEN_AUTHFILE];
  const  char * home = roar_env_get_home(0);
 
@@ -102 +104 @@
   config->codecs.num = 0;
  }
+
+ if ( config->x11.display != NULL )
+  roar_mm_free(config->x11.display);
+ config->x11.display = NULL;
+
+ if ( config->daemonimage != NULL )
+  roar_mm_free(config->daemonimage);
+ config->daemonimage = NULL;
 
  return 0;
@@ -308 +318 @@
     roar_libroar_set_server(v);
   } else if ( !strcmp(k, "set-authfile") ) {
-   strncpy(config->authfile, v, 1023);
-   config->authfile[1023] = 0;
+   strncpy(config->authfile, v, LEN_AUTHFILE-1);
+   config->authfile[LEN_AUTHFILE-1] = 0;
   } else if ( !strcmp(k, "x11-display") ) {
-   config->x11.display = v;
+   if ( config->x11.display != NULL )
+    roar_mm_free(config->x11.display);
+   config->x11.display = roar_mm_strdup(v);
   } else if ( !strcmp(k, "daemonimage") ) {
-   config->daemonimage = v;
+   if ( config->daemonimage != NULL )
+    roar_mm_free(config->daemonimage);
+   config->daemonimage = roar_mm_strdup(v);
   } else if ( !strcmp(k, "serverflags") ) {
    if ( !strcmp(v, "nonblock") ) {

roarclients/roarctl.c

@@ -78 +78 @@
         "  ping  NUM               - Do NUM pings using NOOP commands\n"
 #endif
+        "  servername              - Show name of server currently connected to\n"
         "  whoami                  - Get own client ID\n"
         "\n"
@@ -1272 +1273 @@
     i++;
 #endif
+  } else if ( !strcmp(k, "servername") ) {
+   printf("Server Name           : %s\n", roar_get_connection_server(&con));
 
   } else if ( !strcmp(k, "standby") || !strcmp(k, "off") ) {