Beginnings of GSocket API, small fixes for InetAddress

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

diff --git a/gnio/ginet6address.c b/gnio/ginet6address.c
index 7016ff0..6598572 100644 (file)
--- a/gnio/ginet6address.c
+++ b/gnio/ginet6address.c
@@ -1,6 +1,6 @@
 /* GNIO - GLib Network Layer of GIO
  * 
- * Copyright (C) 2008 Christian Kellner 
+ * Copyright (C) 2008 Christian Kellner, Samuel Cormier-Iijima
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,35 +17,47 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Christian Kellner <gicmo@gnome.org>
+ * Authors: Christian Kellner <gicmo@gnome.org>
+ *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
  */
 
 #include <config.h>
+#include <string.h>
 #include <glib.h>
 
-#include "ginet6address.h"
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
+#include "ginet6address.h"
 
 G_DEFINE_TYPE (GInet6Address, g_inet6_address, G_TYPE_INET_ADDRESS);
 
-struct _GInet6AddressPrivate {
+struct _GInet6AddressPrivate
+{
+  union {
+    guint8  u6_addr8[16];
+    guint16 u6_addr16[8];
+    guint32 u6_addr32[4];
+  } addr;
+};
 
-    union {
-        guint8 u6_addr8[16];
-       guint16 u6_addr16[8];
-       guint32 u6_addr32[4];
+static gchar *
+g_inet6_address_to_string (GInetAddress *address)
+{
+  gchar *addr = g_malloc (48);
 
-    } addr;
-};
+  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)
 {
-  GInet6Address *address;
+  GInet6Address *address G_GNUC_UNUSED = G_INET6_ADDRESS (object);
 
-  address = G_INET6_ADDRESS (object);
-  
   if (G_OBJECT_CLASS (g_inet6_address_parent_class)->finalize)
     (*G_OBJECT_CLASS (g_inet6_address_parent_class)->finalize) (object);
 }
@@ -53,25 +65,33 @@ g_inet6_address_finalize (GObject *object)
 static void
 g_inet6_address_dispose (GObject *object)
 {
-  GInet6Address *address;
+  GInet6Address *address G_GNUC_UNUSED = G_INET6_ADDRESS (object);
 
-  address = G_INET6_ADDRESS (object);
-  
   if (G_OBJECT_CLASS (g_inet6_address_parent_class)->dispose)
     (*G_OBJECT_CLASS (g_inet6_address_parent_class)->dispose) (object);
 }
 
-
 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
@@ -87,12 +107,6 @@ g_inet6_address_init (GInet6Address *address)
 
 GInet6Address *
 g_inet6_address_from_string (const char *string)
-{
-    return NULL;
-}
-
-char *
-g_inet6_address_to_string (GInet6Address *address)
 {
   return NULL;
 }
@@ -100,7 +114,11 @@ g_inet6_address_to_string (GInet6Address *address)
 GInet6Address *
 g_inet6_address_from_bytes (guint8 bytes[])
 {
-  return NULL;
+  GInet6Address *address = G_INET6_ADDRESS (g_object_new (G_TYPE_INET6_ADDRESS, NULL));
+
+  g_memmove (address->priv->addr.u6_addr8, bytes, 16);
+
+  return address;
 }
 
 const guint8 *
@@ -109,15 +127,16 @@ g_inet6_address_to_bytes (GInet6Address *address)
   return NULL;
 }
 
-GInetAddress  *
-g_inet6address_new_loopback (void)
+GInet6Address *
+g_inet6_address_new_loopback (void)
 {
-  return NULL;
+  guint8 bytes[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+
+  return g_inet6_address_from_bytes (bytes);
 }
 
-GInetAddress  *
-g_inet6address_new_any (void)
+GInet6Address *
+g_inet6_address_new_any (void)
 {
   return NULL; 
 }
-