} addr;
};
+static gchar *
+g_inet4_address_to_string (GInetAddress *address)
+{
+ guint8 *addr;
+
+ g_return_val_if_fail (G_IS_INET4_ADDRESS (address), NULL);
+
+ addr = G_INET4_ADDRESS (address)->priv->addr.u4_addr8;
+
+ return g_strdup_printf ("%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+}
+
static gboolean
g_inet4_address_is_any (GInetAddress *address)
{
gobject_class->finalize = g_inet4_address_finalize;
gobject_class->dispose = g_inet4_address_dispose;
+ ginetaddress_class->to_string = g_inet4_address_to_string;
ginetaddress_class->is_any = g_inet4_address_is_any;
ginetaddress_class->is_linklocal = g_inet4_address_is_linklocal;
ginetaddress_class->is_loopback = g_inet4_address_is_loopback;
return g_inet4_address_from_bytes ((guint8 *) &(addr.s_addr));
}
-char *
-g_inet4_address_to_string (GInet4Address *address)
-{
- guint8 *addr;
-
- g_return_val_if_fail (G_IS_INET4_ADDRESS (address), NULL);
-
- addr = address->priv->addr.u4_addr8;
-
- return g_strdup_printf ("%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
-}
-
GInet4Address *
g_inet4_address_from_bytes (guint8 bytes[])
{
GInet4Address *
g_inet4_address_new_loopback (void)
{
- guint8 addr[8] = {127, 0, 0, 1};
+ guint8 addr[4] = {127, 0, 0, 1};
return g_inet4_address_from_bytes (addr);
}
GInet4Address *
g_inet4_address_new_any (void)
{
- guint8 addr[8] = {0, 0, 0, 0};
+ guint8 addr[4] = {0, 0, 0, 0};
return g_inet4_address_from_bytes (addr);
}
GInet4Address * g_inet4_address_from_string (const char *string);
-char * g_inet4_address_to_string (GInet4Address *address);
-
GInet4Address * g_inet4_address_from_bytes (guint8 bytes[]);
const guint8 * g_inet4_address_to_bytes (GInet4Address *address);
#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);
} 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)
{
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
return NULL;
}
-char *
-g_inet6_address_to_string (GInet6Address *address)
-{
- return NULL;
-}
-
GInet6Address *
g_inet6_address_from_bytes (guint8 bytes[])
{
GInet6Address * g_inet6_address_from_string (const char *string);
-char * g_inet6_address_to_string (GInet6Address *address);
-
GInet6Address * g_inet6_address_from_bytes (guint8 bytes[]);
const guint8 * g_inet6_address_to_bytes (GInet6Address *address);
}
+gchar *
+g_inet_address_to_string (GInetAddress *address)
+{
+ g_return_val_if_fail (G_IS_INET_ADDRESS (address), NULL);
+
+ return G_INET_ADDRESS_GET_CLASS (address)->to_string (address);
+}
+
/* ******************************************* */
/* Getters for properties */
{
GObjectClass parent_class;
+ gchar * (*to_string) (GInetAddress *address);
gboolean (*is_any) (GInetAddress *address);
gboolean (*is_linklocal) (GInetAddress *address);
gboolean (*is_loopback) (GInetAddress *address);
gboolean (*is_mc_sitelocal) (GInetAddress *address);
};
-GType g_inet_address_get_type (void) G_GNUC_CONST;
+GType g_inet_address_get_type (void) G_GNUC_CONST;
-/* accessors to gobject properties that get overridden by subclasses */
-gboolean g_inet_address_is_any (GInetAddress *address);
+gchar * g_inet_address_to_string (GInetAddress *address);
-gboolean g_inet_address_is_linklocal (GInetAddress *address);
+gboolean g_inet_address_is_any (GInetAddress *address);
-gboolean g_inet_address_is_loopback (GInetAddress *address);
+gboolean g_inet_address_is_linklocal (GInetAddress *address);
-gboolean g_inet_address_is_sitelocal (GInetAddress *address);
+gboolean g_inet_address_is_loopback (GInetAddress *address);
-gboolean g_inet_address_is_multicast (GInetAddress *address);
+gboolean g_inet_address_is_sitelocal (GInetAddress *address);
-gboolean g_inet_address_is_mc_global (GInetAddress *address);
+gboolean g_inet_address_is_multicast (GInetAddress *address);
-gboolean g_inet_address_is_mc_linklocal (GInetAddress *address);
+gboolean g_inet_address_is_mc_global (GInetAddress *address);
-gboolean g_inet_address_is_mc_nodelocal (GInetAddress *address);
+gboolean g_inet_address_is_mc_linklocal (GInetAddress *address);
-gboolean g_inet_address_is_mc_orglocal (GInetAddress *address);
+gboolean g_inet_address_is_mc_nodelocal (GInetAddress *address);
-gboolean g_inet_address_is_mc_sitelocal (GInetAddress *address);
+gboolean g_inet_address_is_mc_orglocal (GInetAddress *address);
+
+gboolean g_inet_address_is_mc_sitelocal (GInetAddress *address);
G_END_DECLS
}
#endif
+#if !defined(HAVE_GETADDRINFO)
static void
g_set_error_from_last_error (GError **error)
{
g_set_error (error, G_IO_ERROR, code, hstrerror (err));
#endif
}
+#endif
#if !defined(HAVE_GETADDRINFO)
static GList *
void
print_address (GInetAddress *address, gpointer data)
{
- gchar *string = g_inet4_address_to_string (G_INET4_ADDRESS (address));
+ gchar *string = g_inet_address_to_string (G_INET_ADDRESS (address));
g_printf ("%s\n", string);
address = (GInetAddress *) g_inet4_address_from_string ("127.0.0.1");
- g_printf ("%s:\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+ g_printf ("%s:\n", g_inet_address_to_string (address));
g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));
address = (GInetAddress *) g_inet4_address_from_string ("0.0.0.0");
- g_printf ("\n%s:\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+ g_printf ("\n%s:\n", g_inet_address_to_string (address));
g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));
address = (GInetAddress *) g_inet4_address_from_string ("169.254.0.0");
- g_printf ("\n%s:\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+ g_printf ("\n%s:\n", g_inet_address_to_string (address));
g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));
return 0;
}
- g_printf ("\nwww.yahoo.com: %s\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+ g_printf ("\nwww.yahoo.com: %s\n", g_inet_address_to_string (address));
g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));