Merge commit 'scormi3/master'

[cascardo/gnio.git] / gnio / gsocketaddress.c

diff --git a/gnio/gsocketaddress.c b/gnio/gsocketaddress.c
index cd77127..2421108 100644 (file)
--- a/gnio/gsocketaddress.c
+++ b/gnio/gsocketaddress.c
@@ -30,6 +30,7 @@
 #include "gsocketaddress.h"
 #include "ginetsocketaddress.h"
 #include "ginet4address.h"
+#include "ginet6address.h"
 
 G_DEFINE_ABSTRACT_TYPE (GSocketAddress, g_socket_address, G_TYPE_INITIALLY_UNOWNED);
 
@@ -80,7 +81,15 @@ 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;
 }