IPv6 support for to_native and from_native

diff --git a/gnio/ginetsocketaddress.c b/gnio/ginetsocketaddress.c
index 040064a..0bb6196 100644 (file)
--- a/gnio/ginetsocketaddress.c
+++ b/gnio/ginetsocketaddress.c
@@ -151,7 +151,12 @@ g_inet_socket_address_to_native (GSocketAddress *address,
     }
   else if (G_IS_INET6_ADDRESS (addr->priv->address))
     {
-      return FALSE;
+      struct sockaddr_in6 *sock = (struct sockaddr_in6 *) dest;
+      memset (sock, 0, sizeof (sock));
+      sock->sin6_family = AF_INET6;
+      sock->sin6_port = g_htons (addr->priv->port);
+      memcpy (&(sock->sin6_addr.s6_addr), g_inet6_address_to_bytes (G_INET6_ADDRESS (addr->priv->address)), sizeof (sock->sin6_addr));
+      return TRUE;
     }
   else
     return FALSE;

diff --git a/gnio/gsocketaddress.c b/gnio/gsocketaddress.c
index cd77127..ac5b39f 100644 (file)
--- a/gnio/gsocketaddress.c
+++ b/gnio/gsocketaddress.c
@@ -80,7 +80,14 @@ g_socket_address_from_native (gpointer native, gsize len)
 
       return G_SOCKET_ADDRESS (g_inet_socket_address_new (G_INET_ADDRESS (g_inet4_address_from_bytes ((guint8 *) &(addr->sin_addr))), g_ntohs (addr->sin_port)));
     }
-  // TODO: handle AF_INET6 and AF_UNIX
+
+  if (family == AF_INET6)
+    {
+      struct sockaddr_in6 *addr = (struct sockaddr_in6 *) native;
+      return G_SOCKET_ADDRESS (g_inet_socket_address_new (G_INET_ADDRESS (g_inet6_address_from_bytes ((guint8 *) &(addr->sin6_addr))), g_ntohs (addr->sin6_port)));
+    }
+
+  // TODO: handle AF_UNIX
 
   return NULL;
 }