Changeset 1178:3ec5d99364a2 in roaraudio for libroar/simple.c

Timestamp:

01/25/09 12:54:58 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some cleanup, guess AF_UNIX on getsockname() set len = 0 on OpenBSD

File:

• libroar/simple.c (modified) (2 diffs)

libroar/simple.c

@@ -123 +123 @@
  int fh = -1, listen = -1;
  static int count = 0;
- struct group   * grp  = NULL;
+// struct group   * grp  = NULL;
  int    type = ROAR_SOCKET_TYPE_UNIX;
  int    port = 0;
@@ -137 +137 @@
  }
 
- if ( socket_addr.sin_family == AF_INET ) {
-  type = ROAR_SOCKET_TYPE_INET;
- } else if ( socket_addr.sin_family == AF_UNIX ) {
-  type = ROAR_SOCKET_TYPE_UNIX;
- } else if ( socket_addr.sin_family == AF_DECnet ) {
-  type = ROAR_SOCKET_TYPE_DECNET;
- } else {
-  return -1;
+ if ( len == 0 ) {
+#ifdef ROAR_OS_OPENBSD
+  ROAR_WARN("roar_simple_new_stream_obj(*): Unknown address family: guess AF_UNIX because OS is OpenBSD");
+  socket_addr.sin_family = AF_UNIX;
+#else
+  return -1;
+#endif
+ }
+
+ switch (socket_addr.sin_family) {
+  case AF_UNIX:   type = ROAR_SOCKET_TYPE_UNIX; break;
+  case AF_INET:   type = ROAR_SOCKET_TYPE_INET; break;
+  case AF_DECnet: type = ROAR_SOCKET_TYPE_DECNET; break;
+  default:
+    return -1;
+   break;
  }