Changeset 1358:1e4ca4a5e67c in roaraudio

Timestamp:

03/24/09 16:52:58 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

starting to make IPv4 optional

File:

• libroar/vio_socket.c (modified) (11 diffs)

libroar/vio_socket.c

@@ -46 +46 @@
 
  switch (def->d.socket.domain) {
+#ifdef ROAR_HAVE_IPV4
   case AF_INET:
     len = sizeof(struct sockaddr_in);
@@ -63 +64 @@
     }
    break;
+#endif
 #ifdef ROAR_HAVE_UNIX
   case AF_UNIX:
@@ -171 +173 @@
                                            struct roar_vio_defaults * odef) {
  char * host;
+#if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6)
  int    port;
+#endif
 
  if ( def == NULL )
@@ -202 +206 @@
    hint = AF_UNIX;
 #endif
+#ifdef ROAR_HAVE_IPV4
   } else if ( strstr(dstr, ":") != NULL ) { // host:port
    hint = AF_INET;
+#endif
   }
  }
@@ -252 +258 @@
 
  switch (hint) {
+#ifdef ROAR_HAVE_IPV4
   case AF_INET:
     host = dstr;
@@ -269 +276 @@
     }
    break;
+#endif
 #ifdef ROAR_HAVE_LIBDNET
   case AF_DECnet:
@@ -360 +368 @@
   case AF_INET6:
 #endif
+#ifdef ROAR_HAVE_IPV4
   case AF_INET:
+#endif
+#if defined(ROAR_HAVE_IPV6) || defined(ROAR_HAVE_IPV4)
     switch (type) {
      case SOCK_STREAM: proto = "tcp"; break;
@@ -368 +379 @@
     }
    break;
+#endif
 #ifdef ROAR_HAVE_LIBDNET
   case AF_DECnet:
@@ -501 +513 @@
 // AF_INET:
 int     roar_vio_socket_init_inet4host_def(struct roar_vio_defaults * def) {
+#ifdef ROAR_HAVE_IPV4
  struct hostent     * he;
  char               * ed;
@@ -525 +538 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }
 
 int     roar_vio_socket_init_inet4_def    (struct roar_vio_defaults * def, char * host, int port, int type) {
+#ifdef ROAR_HAVE_IPV4
  if ( roar_vio_socket_init_socket_def(def, AF_INET, type) == -1 )
   return -1;
@@ -536 +553 @@
 
  return 0;
+#else
+ return -1;
+#endif
 }