Patch from Samuel Cormier-Iijima <sciyoshi@gmail.com>:

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

diff --git a/gnio/ginet6address.c b/gnio/ginet6address.c
index 7016ff0..3fff994 100644 (file)
--- a/gnio/ginet6address.c
+++ b/gnio/ginet6address.c
@@ -21,31 +21,26 @@
  */
 
 #include <config.h>
+#include <string.h>
 #include <glib.h>
 
 #include "ginet6address.h"
 
-
 G_DEFINE_TYPE (GInet6Address, g_inet6_address, G_TYPE_INET_ADDRESS);
 
 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];
+  } 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 +48,21 @@ 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);
-  
+
   g_type_class_add_private (klass, sizeof (GInet6AddressPrivate));
-  
+
   gobject_class->finalize = g_inet6_address_finalize;
   gobject_class->dispose = g_inet6_address_dispose;
-
 }
 
 static void
@@ -88,7 +79,7 @@ g_inet6_address_init (GInet6Address *address)
 GInet6Address *
 g_inet6_address_from_string (const char *string)
 {
-    return NULL;
+  return NULL;
 }
 
 char *
@@ -100,7 +91,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 +104,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; 
 }
-