Changeset 5408:c6d31c2e4a51 in roaraudio for libroar/vio_stream.c

Timestamp:

02/13/12 22:17:17 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

re-ported to f* s* bla win32 !*!*Dd*S!, I hate this.

File:

• libroar/vio_stream.c (modified) (8 diffs)

libroar/vio_stream.c

@@ -183 +183 @@
  int socks[2]; // for socketpair()
 #endif
+ struct roar_sockname sockname;
 
  // make valgrind happy
@@ -190 +191 @@
 #endif
 
+ ROAR_DBG("_roar_simple_new_stream_obj(con=%p, s=%p, rate=%i, channels=%i, bits=%i, codec=%i, dir=%i, mixer=%i) = ?", con, s, (int)rate, (int)channels, (int)bits, (int)codec, dir, mixer);
+
  if ( config != NULL ) {
   if ( config->workaround.workarounds & ROAR_LIBROAR_CONFIG_WAS_USE_EXECED ) {
@@ -196 +199 @@
  }
 
-#ifdef ROAR_HAVE_BSDSOCKETS
+ ROAR_DBG("_roar_simple_new_stream_obj(con=%p, s=%p, rate=%i, channels=%i, bits=%i, codec=%i, dir=%i, mixer=%i) = ?", con, s, (int)rate, (int)channels, (int)bits, (int)codec, dir, mixer);
+
  roar_libroar_nowarn();
- if ( getsockname(roar_get_connection_fh(con), (struct sockaddr *)&socket_addr, &len) == -1 ) {
+ if ( roar_vio_ctl(roar_get_connection_vio2(con), ROAR_VIO_CTL_GET_SOCKNAME, &sockname) == -1 ) {
   roar_libroar_warn();
-  return -1;
+#ifdef ROAR_OS_OPENBSD
+  sockname.type = ROAR_SOCKET_TYPE_UNIX;
+#else
+  ROAR_DBG("_roar_simple_new_stream_obj(con=%p, s=%p, rate=%i, channels=%i, bits=%i, codec=%i, dir=%i, mixer=%i) = -1", con, s, (int)rate, (int)channels, (int)bits, (int)codec, dir, mixer);
+
+  return -1;
+#endif
  }
  roar_libroar_warn();
-#else
- return -1;
-#endif
-
- if ( len == 0 ) {
-#ifdef ROAR_OS_OPENBSD
-  ROAR_WARN("roar_simple_new_stream_obj(*): Unknown address family: guess AF_UNIX because OS is OpenBSD");
-  ((struct sockaddr*)&socket_addr)->sa_family = AF_UNIX;
-#else
-  return -1;
-#endif
- }
-
- switch (((struct sockaddr*)&socket_addr)->sa_family) {
-#ifdef ROAR_HAVE_UNIX
-  case AF_UNIX:   type = ROAR_SOCKET_TYPE_UNIX; break;
-#endif
-#ifdef ROAR_HAVE_IPV4
-  case AF_INET:   type = ROAR_SOCKET_TYPE_INET; break;
-#endif
-#ifdef ROAR_HAVE_LIBDNET
-  case AF_DECnet: type = ROAR_SOCKET_TYPE_DECNET; break;
-#endif
-  default:
-    return -1;
-   break;
- }
-
- if ( type == ROAR_SOCKET_TYPE_DECNET ) {
+
+ ROAR_DBG("_roar_simple_new_stream_obj(con=%p, s=%p, rate=%i, channels=%i, bits=%i, codec=%i, dir=%i, mixer=%i) = ?", con, s, (int)rate, (int)channels, (int)bits, (int)codec, dir, mixer);
+
+ if ( sockname.type == ROAR_SOCKET_TYPE_DECNET ) {
   if ( roar_socket_get_local_nodename() ) {
    snprintf(file, 24, "%s::roar$TMP%04x%02x", roar_socket_get_local_nodename(), getpid(), count++);
@@ -243 +228 @@
  }
 
- if ( type != ROAR_SOCKET_TYPE_UNIX ) {
-  if ( (listen = roar_socket_listen(type, file, port)) == -1 ) {
+ if ( sockname.type != ROAR_SOCKET_TYPE_UNIX ) {
+  if ( (listen = roar_socket_listen(sockname.type, file, port)) == -1 ) {
    return -1;
   }
  }
 
- if ( type == ROAR_SOCKET_TYPE_INET ) {
+ if ( sockname.type == ROAR_SOCKET_TYPE_INET ) {
 #ifdef ROAR_HAVE_IPV4
   setsockopt(listen, SOL_SOCKET, SO_REUSEADDR, (void*)&opt, sizeof(int));
@@ -262 +247 @@
   return -1;
 #endif
- } else if ( type == ROAR_SOCKET_TYPE_DECNET ) {
+ } else if ( sockname.type == ROAR_SOCKET_TYPE_DECNET ) {
 #ifdef ROAR_HAVE_LIBDNET
   setsockopt(listen, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
@@ -278 +263 @@
  }
 
- if ( type != ROAR_SOCKET_TYPE_UNIX ) {
+ if ( sockname.type != ROAR_SOCKET_TYPE_UNIX ) {
 #ifdef ROAR_HAVE_SELECT
-  if ( roar_stream_connect_to_ask(con, s, type, file, port) != -1 ) {
+  if ( roar_stream_connect_to_ask(con, s, sockname.type, file, port) != -1 ) {
 
    FD_ZERO(&fds);
@@ -354 +339 @@
   return -1;
 #endif
- } else { // this is type == ROAR_SOCKET_TYPE_UNIX
+ } else { // this is sockname.type == ROAR_SOCKET_TYPE_UNIX
 #ifdef ROAR_HAVE_UNIX
   if ( socketpair(AF_UNIX, SOCK_STREAM, 0, socks) == -1 ) {
@@ -388 +373 @@
  s->fh = fh;
 
+ ROAR_DBG("_roar_simple_new_stream_obj(con=%p, s=%p, rate=%i, channels=%i, bits=%i, codec=%i, dir=%i, mixer=%i) = %i", con, s, (int)rate, (int)channels, (int)bits, (int)codec, dir, mixer, fh);
  return fh;
 }