Changeset 1476:bcb075f757c8 in roaraudio

Timestamp:

03/30/09 19:40:10 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

do not try BSD Socket interface/POSIX IO if the arch/os does not support that

Location:

libroar

Files:

• simple.c (modified) (3 diffs)
• socket.c (modified) (5 diffs)

libroar/simple.c

@@ -99 +99 @@
  int fh;
 
- if ( (fh = roar_simple_stream_obj(s, rate, channels, bits, codec, NULL /* server, we hope this goes ok here... */,
+ if ( (fh = roar_simple_stream_obj(s, rate, channels, bits, codec, NULL /* server, we hope this is ok here... */,
                                    dir, "libroar temp stream")) == -1 )
   return -1;
 
  if ( roar_stream_attach_simple(con, s, roar_get_clientid(con)) == -1 ) {
+#ifdef ROAR_HAVE_IO_POSIX
   close(fh);
+#endif /* no else as we return -1 anyway */
   return -1;
  }
@@ -143 +145 @@
 #endif
 
+#ifdef ROAR_HAVE_BSDSOCKETS
  if ( getsockname(con->fh, (struct sockaddr *)&socket_addr, &len) == -1 ) {
   return -1;
  }
+#else
+ return -1;
+#endif
 
  if ( len == 0 ) {
@@ -323 +329 @@
 
 int roar_simple_close(int fh) {
+#ifdef ROAR_HAVE_IO_POSIX
  return close(fh);
+#else
+ return -1;
+#endif
 }
 

libroar/socket.c

@@ -456 +456 @@
  int ret;
 #endif
+#if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) || defined(ROAR_HAVE_UNIX) || defined(ROAR_HAVE_IPX)
  union {
   struct sockaddr     sa;
@@ -471 +472 @@
 #endif
  } socket_addr;
+#endif
 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6)
  struct hostent     * he;
@@ -626 +628 @@
  }
 
- if ( mode == MODE_LISTEN )
+ if ( mode == MODE_LISTEN ) {
+#ifdef ROAR_HAVE_BSDSOCKETS
   if ( listen(fh, ROAR_SOCKET_QUEUE_LEN) == -1 ) {
    close(fh);
    return -1;
   }
+#else
+  return -1;
+#endif
+ }
 
  return fh;
@@ -682 +689 @@
 
 int roar_socket_open_file  (int mode, char * host, int port) {
+#ifdef ROAR_HAVE_IO_POSIX
  int fh;
 
@@ -692 +700 @@
 
  return fh;
+#else
+ return -1;
+#endif
 }