Changeset 517:1b5f48c1dc8c in roaraudio

Timestamp:

08/15/08 14:00:45 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

set socket type if we know it

File:

• roard/roard.c (modified) (5 diffs)

roard/roard.c

@@ -88 +88 @@
  char * sock_grp  = ROAR_DEFAULT_SOCKGRP;
  char * sock_user = NULL;
+ int    sock_type = ROAR_SOCKET_TYPE_UNKNOWN;
  char * chrootdir = NULL;
  int    setids    = 0;
@@ -219 +220 @@
    server = argv[++i];
   } else if ( strcmp(k, "-t") == 0 ) {
+   sock_type = ROAR_SOCKET_TYPE_TCP;
    if ( *server == '/' )
     server = ROAR_DEFAULT_HOST;
   } else if ( strcmp(k, "-u") == 0 ) {
    // ignore this case as it is the default behavor.
+   sock_type = ROAR_SOCKET_TYPE_UNIX;
   } else if ( strcmp(k, "-n") == 0 ) {
 #ifdef ROAR_HAVE_LIBDNET
@@ -228 +231 @@
     strcpy(decnethost, ROAR_DEFAULT_LISTEN_OBJECT);
     server = decnethost;
+    sock_type = ROAR_SOCKET_TYPE_DECNET;
 #else
     ROAR_ERR("No DECnet support compiled in!");
@@ -260 +264 @@
 
  if ( *server != 0 ) {
-  if ( (g_listen_socket = roar_socket_listen(ROAR_SOCKET_TYPE_UNKNOWN, server, port)) == -1 ) {
+  if ( (g_listen_socket = roar_socket_listen(sock_type, server, port)) == -1 ) {
    if ( *server == '/' ) {
     if ( (i = roar_socket_connect(server, port)) != -1 ) {
@@ -268 +272 @@
     } else {
      unlink(server);
-     if ( (g_listen_socket = roar_socket_listen(ROAR_SOCKET_TYPE_UNKNOWN, server, port)) == -1 ) {
+     if ( (g_listen_socket = roar_socket_listen(sock_type, server, port)) == -1 ) {
       ROAR_ERR("Can not open listen socket!");
       return 1;