Make to_string virtual, fix some warnings

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

diff --git a/gnio/ginet6address.c b/gnio/ginet6address.c
index e46ff76..c8c1a39 100644 (file)
--- a/gnio/ginet6address.c
+++ b/gnio/ginet6address.c
@@ -25,6 +25,9 @@
 #include <string.h>
 #include <glib.h>
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include "ginet6address.h"
 
 G_DEFINE_TYPE (GInet6Address, g_inet6_address, G_TYPE_INET_ADDRESS);
@@ -37,6 +40,18 @@ struct _GInet6AddressPrivate {
   } addr;
 };
 
+static gchar *
+g_inet6_address_to_string (GInetAddress *address)
+{
+  gchar *addr = g_malloc (48);
+
+  g_return_val_if_fail (G_IS_INET6_ADDRESS (address), NULL);
+
+  inet_ntop (AF_INET6, G_INET6_ADDRESS (address)->priv->addr.u6_addr8, addr, 48);
+
+  return addr;
+}
+
 static void
 g_inet6_address_finalize (GObject *object)
 {
@@ -59,11 +74,23 @@ static void
 g_inet6_address_class_init (GInet6AddressClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GInetAddressClass *ginetaddress_class = G_INET_ADDRESS_CLASS (klass);
 
   g_type_class_add_private (klass, sizeof (GInet6AddressPrivate));
 
   gobject_class->finalize = g_inet6_address_finalize;
   gobject_class->dispose = g_inet6_address_dispose;
+  ginetaddress_class->to_string = g_inet6_address_to_string;
+/*  ginetaddress_class->is_any = g_inet6_address_is_any;
+  ginetaddress_class->is_linklocal = g_inet6_address_is_linklocal;
+  ginetaddress_class->is_loopback = g_inet6_address_is_loopback;
+  ginetaddress_class->is_sitelocal = g_inet6_address_is_sitelocal;
+  ginetaddress_class->is_multicast = g_inet6_address_is_multicast;
+  ginetaddress_class->is_mc_global = g_inet6_address_is_mc_global;
+  ginetaddress_class->is_mc_linklocal = g_inet6_address_is_mc_linklocal;
+  ginetaddress_class->is_mc_nodelocal = g_inet6_address_is_mc_nodelocal;
+  ginetaddress_class->is_mc_orglocal = g_inet6_address_is_mc_orglocal;
+  ginetaddress_class->is_mc_sitelocal = g_inet6_address_is_mc_sitelocal;*/
 }
 
 static void
@@ -83,12 +110,6 @@ g_inet6_address_from_string (const char *string)
   return NULL;
 }
 
-char *
-g_inet6_address_to_string (GInet6Address *address)
-{
-  return NULL;
-}
-
 GInet6Address *
 g_inet6_address_from_bytes (guint8 bytes[])
 {