Changeset 4759:10a753806fd5 in roaraudio

Timestamp:

02/06/11 03:16:06 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added IPv6 support

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (1 diff)
• libroar/socket.c (modified) (7 diffs)

ChangeLog

@@ -6 +6 @@
         * Added time display to roarvorbis (Closes: #102)
         * Added support to roarshout to read password form user or file (Closes: #101)
+        * Added IPv6 support
 
 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET

configure

@@ -1494 +1494 @@
 test_func_defmake ROAR_HAVE_GETSOCKOPT getsockopt 'getsockopt(0, 0, 0, (void*)0, (void*)0)' -- sys/types.h sys/socket.h
 test_func_defmake ROAR_HAVE_SETSOCKOPT setsockopt 'setsockopt(0, 0, 0, (void*)0, (void*)0)' -- sys/types.h sys/socket.h
+test_func_defmake ROAR_HAVE_GETADDRINFO getaddrinfo 'getaddrinfo((void*)0, (void*)0, (void*)0, (void**)0)' -- sys/types.h sys/socket.h netdb.h
 test_func_defmake ROAR_HAVE_RAND      rand      'rand()'                     -- stdlib.h
 test_func_defmake ROAR_HAVE_RAND_R    rand_r    'rand_r((unsigned int*)0)'   -- stdlib.h

libroar/socket.c

@@ -512 +512 @@
 #endif
  } socket_addr;
+ socklen_t addrlen;
 #endif
 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6)
@@ -529 +530 @@
  char * del;
 #endif
+ int af_guessed = 0;
+#ifdef ROAR_HAVE_GETADDRINFO
+ struct addrinfo hints, *res = NULL;
+ char port_as_string[32];
+#endif
 
  ROAR_DBG("roar_socket_open(mode=%i, type=%i, host='%s', port=%i) = ?", mode, type, host, port);
@@ -536 +542 @@
 
  if ( type == ROAR_SOCKET_TYPE_UNKNOWN ) {
+  af_guessed = 1;
   type = ROAR_SOCKET_TYPE_INET;
   if ( *host == '/' ) {
@@ -614 +621 @@
   ROAR_DBG("roar_socket_open(*): type=INET|INET6, host='%s', port=%i", host, port);
 
+#ifdef ROAR_HAVE_GETADDRINFO
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_socktype = SOCK_STREAM;
+  if ( af_guessed ) {
+   hints.ai_family   = AF_UNSPEC;
+  } else {
+   hints.ai_family   = type == ROAR_SOCKET_TYPE_INET ? AF_INET : AF_INET6;
+  }
+
+  snprintf(port_as_string, sizeof(port_as_string), "%i", port);
+
+  if ( getaddrinfo(host, port_as_string, &hints, &res) != 0 )
+   return -1;
+
+  if ( af_guessed ) {
+   type = res->ai_family == AF_INET ? ROAR_SOCKET_TYPE_INET : ROAR_SOCKET_TYPE_INET6;
+  }
+
+  if ( type == ROAR_SOCKET_TYPE_INET ) {
+   fh = roar_socket_new_tcp();
+  } else {
+   fh = roar_socket_new_tcp6();
+  }
+
+  memcpy(&(socket_addr.sa), res->ai_addr, res->ai_addrlen);
+  addrlen = res->ai_addrlen;
+
+  if ( res != NULL )
+   freeaddrinfo(res);
+#else
   if ( (he = gethostbyname(host)) == NULL ) {
    ROAR_ERR("roar_socket_open(*): Can\'t resolve host name '%s'",
@@ -622 +659 @@
    ROAR_DBG("roar_socket_open(*): he=%p", he);
 
-   memcpy((struct in_addr *)&socket_addr.in.sin_addr, he->h_addr, sizeof(struct in_addr));
+   memcpy((struct in_addr *)&(socket_addr.in.sin_addr), he->h_addr, sizeof(struct in_addr));
 
    /* set the connect information */
@@ -629 +666 @@
 
   fh = roar_socket_new_tcp();
+  addrlen = sizeof(struct sockaddr_in);
+#endif
 
   ROAR_DBG("roar_socket_open(*): fh=%i", fh);
@@ -641 +680 @@
   ROAR_DBG("roar_socket_open(*): fh=%i", fh);
 
-   if ( mode_func(fh, (struct sockaddr *)&socket_addr.in, sizeof(struct sockaddr_in)) == -1 ) {
+   if ( mode_func(fh, (struct sockaddr *)&socket_addr.sa, addrlen) == -1 ) {
     ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno));
     close(fh);