Changeset 520:97b25e01e6a7 in roaraudio

Timestamp:

08/15/08 15:09:11 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

this code changes seems not to work for me but are 100% correct acccording to the manpages I have here, as far as I understand, strange.

File:

• libroar/socket.c (modified) (3 diffs)

libroar/socket.c

@@ -302 +302 @@
 
 
- if ( type == ROAR_SOCKET_TYPE_INET ) {
+ if ( type == ROAR_SOCKET_TYPE_INET || type == ROAR_SOCKET_TYPE_INET6 ) {
 
   if ( (he = gethostbyname(host)) == NULL ) {
@@ -310 +310 @@
   }
 
-  memcpy((struct in_addr *)&socket_addr.in.sin_addr, he->h_addr, sizeof(struct in_addr));
-
-  /* set the connect information */
-  socket_addr.in.sin_family = AF_INET;
-  socket_addr.in.sin_port = htons( port );
-
-  fh = roar_socket_new_tcp();
-
-  if ( mode_func(fh, (struct sockaddr *)&socket_addr.in, sizeof(struct sockaddr_in)) == -1 ) {
-   ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
-   close(fh);
+  if ( he->h_addrtype == AF_INET ) {
+   if ( type != ROAR_SOCKET_TYPE_INET )
+    return -1;
+
+   memcpy((struct in_addr *)&socket_addr.in.sin_addr, he->h_addr, sizeof(struct in_addr));
+
+   /* set the connect information */
+   socket_addr.in.sin_family = AF_INET;
+   socket_addr.in.sin_port   = ROAR_HOST2NET16(port);
+
+   fh = roar_socket_new_tcp();
+
+   if ( mode_func(fh, (struct sockaddr *)&socket_addr.in, sizeof(struct sockaddr_in)) == -1 ) {
+    ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
+    close(fh);
+    return -1;
+   }
+  } if ( he->h_addrtype == AF_INET6 ) {
+   if ( type != ROAR_SOCKET_TYPE_INET6 )
+    return -1;
+
+   memcpy((struct in6_addr *)&socket_addr.in6.sin6_addr, he->h_addr, sizeof(struct in6_addr));
+
+   /* set the connect information */
+   socket_addr.in6.sin6_family = AF_INET6;
+   socket_addr.in6.sin6_port   = ROAR_HOST2NET16(port);
+
+   fh = roar_socket_new_tcp6();
+
+   if ( mode_func(fh, (struct sockaddr *)&socket_addr.in6, sizeof(struct sockaddr_in6)) == -1 ) {
+    ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
+    close(fh);
+    return -1;
+   }
+  } else {
    return -1;
   }
@@ -335 +359 @@
    return -1;
   }
- } else if ( type == ROAR_SOCKET_TYPE_INET6 ) {
-  return -1;
  } else if ( type == ROAR_SOCKET_TYPE_FORK ) {
   return roar_socket_open_fork(mode, host, port);