Changeset 4705:109ee6f17831 in roaraudio for libroar/vio.c

Timestamp:

01/06/11 02:37:55 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got gopher finally working, now moving myself into sleepingbag device...

File:

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

libroar/vio.c

@@ -369 +369 @@
  int tmp;
  int s_r = 0, s_w = 0;
+#if defined(ROAR_HAVE_GETSOCKNAME) || defined(ROAR_HAVE_GETPEERNAME)
+ union {
+  struct sockaddr     sa;
+#if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6)
+  struct sockaddr_in  in;
+#endif
+#ifdef ROAR_HAVE_UNIX
+  struct sockaddr_un  un;
+#endif
+#ifdef ROAR_HAVE_LIBDNET
+  struct sockaddr_dn  dn;
+#endif
+#ifdef ROAR_HAVE_IPV6
+  struct sockaddr_in6 in6;
+#endif
+#ifdef ROAR_HAVE_IPX
+  struct sockaddr_ipx ipx;
+#endif
+ } sockaddr;
+ socklen_t socklen;
+ struct roar_sockname * rsockname;
+#endif
 
  if ( vio == NULL || cmd == -1 )
@@ -442 +464 @@
     return ROAR_SHUTDOWN(roar_vio_get_fh(vio), tmp);
    break;
+#if defined(ROAR_HAVE_GETSOCKNAME) || defined(ROAR_HAVE_GETPEERNAME)
+  case ROAR_VIO_CTL_GET_SOCKNAME:
+  case ROAR_VIO_CTL_GET_PEERNAME:
+    if ( data == NULL )
+     return -1;
+
+    rsockname = data;
+
+    socklen = sizeof(sockaddr);
+
+    if ( cmd == ROAR_VIO_CTL_GET_SOCKNAME ) {
+#ifdef ROAR_HAVE_GETSOCKNAME
+     tmp = getsockname(roar_vio_get_fh(vio), &(sockaddr.sa), &socklen);
+#else
+     return -1;
+#endif
+    } else if ( cmd == ROAR_VIO_CTL_GET_PEERNAME ) {
+#ifdef ROAR_HAVE_GETPEERNAME
+     tmp = getpeername(roar_vio_get_fh(vio), &(sockaddr.sa), &socklen);
+#else
+     return -1;
+#endif
+    } else {
+     return -1;
+    }
+
+    if ( tmp == -1 )
+     return -1;
+
+    memset(rsockname, 0, sizeof(struct roar_sockname));
+
+    switch (sockaddr.sa.sa_family) {
+#ifdef AF_UNIX
+     case AF_UNIX:
+       rsockname->type = ROAR_SOCKET_TYPE_UNIX;
+       if ( sockaddr.un.sun_path[0] == 0 ) {
+        rsockname->addr = roar_mm_malloc(sizeof(sockaddr.un.sun_path));
+        if ( rsockname->addr == NULL )
+         return -1;
+        memcpy(rsockname->addr, sockaddr.un.sun_path, sizeof(sockaddr.un.sun_path));
+       } else {
+        rsockname->addr = roar_mm_strdup(sockaddr.un.sun_path);
+       }
+      break;
+#endif
+#ifdef AF_DECnet
+     case AF_DECnet:
+       rsockname->type = ROAR_SOCKET_TYPE_DECNET;
+
+       if ( sockaddr.dn.sdn_add.a_len != 2 )
+        return -1;
+
+       rsockname->addr = roar_mm_malloc(28);
+       if ( rsockname->addr == NULL )
+        return -1;
+
+       snprintf(rsockname->addr, 28, "%i.%i::",
+                 sockaddr.dn.sdn_add.a_addr[1] >> 2,
+                 sockaddr.dn.sdn_add.a_addr[0] + ((sockaddr.dn.sdn_add.a_addr[1] & 0x03) << 8));
+
+       rsockname->port = sockaddr.dn.sdn_objnum;
+       if ( sockaddr.dn.sdn_objnum == 0 ) {
+        tmp = strlen(rsockname->addr);
+        memcpy(rsockname->addr + tmp, sockaddr.dn.sdn_objname, sockaddr.dn.sdn_objnamel);
+        rsockname->addr[tmp + sockaddr.dn.sdn_objnamel] = 0;
+       }
+      break;
+#endif
+#ifdef AF_INET
+     case AF_INET:
+       rsockname->type = ROAR_SOCKET_TYPE_INET;
+       rsockname->port = ntohs(sockaddr.in.sin_port);
+       rsockname->addr = roar_mm_strdup(inet_ntoa(sockaddr.in.sin_addr));
+      break;
+#endif
+#ifdef AF_INET6
+     case AF_INET6:
+       rsockname->type = ROAR_SOCKET_TYPE_INET6;
+       rsockname->port = ntohs(sockaddr.in6.sin6_port);
+      break;
+#endif
+     default:
+       return -1;
+    }
+    return 0;
+#endif
+   break;
 #ifdef ROAR_HAVE_H_SYS_IOCTL
   case ROAR_VIO_CTL_SYSIO_IOCTL: