Changeset 518:b4054527b555 in roaraudio

Timestamp:

08/15/08 14:13:10 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added options -4 and -6

File:

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

roard/roard.c

@@ -48 +48 @@
 #ifdef ROAR_HAVE_LIBDNET
         " -n  --decnet          - use DECnet listen socket\n"
+#endif
+        " -4                    - Use IPv4 connections (implies -t)\n"
+#ifdef PF_INET6
+        " -6                    - Use IPv6 connections (implies -t)\n"
+#endif
+#ifdef IPV6_ADDRFORM
+        " -64                   - Try to downgrade sockets from IPv6 into IPv4,\n"
+        "                         this is normaly not usefull.\n"
 #endif
         " -p  --port            - TCP Port to bind to\n"
@@ -219 +227 @@
   } else if ( strcmp(k, "-b") == 0 || strcmp(k, "--bind") == 0 || strcmp(k, "-s") == 0 || strcmp(k, "--sock") == 0 ) {
    server = argv[++i];
+
   } else if ( strcmp(k, "-t") == 0 ) {
+   if ( sock_type != ROAR_SOCKET_TYPE_TCP && sock_type != ROAR_SOCKET_TYPE_TCP6 )
+    sock_type = ROAR_SOCKET_TYPE_TCP;
+
+   if ( *server == '/' )
+    server = ROAR_DEFAULT_HOST;
+
+  } else if ( strcmp(k, "-4") == 0 ) {
    sock_type = ROAR_SOCKET_TYPE_TCP;
    if ( *server == '/' )
     server = ROAR_DEFAULT_HOST;
+  } else if ( strcmp(k, "-6") == 0 ) {
+   sock_type = ROAR_SOCKET_TYPE_TCP6;
+   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
@@ -236 +258 @@
     return 1;
 #endif
+
   } else if ( strcmp(k, "-G") == 0 ) {
    sock_grp  = argv[++i];