X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=address.c;h=dffd3ee4a44a29aa33c5a69fbce71465c20a6ea5;hb=8e7f83aa5b6d910e80c56b31f4eb79b02e7ca67b;hp=633f40e682e0324a5366d9cf4a3645894e7dac6b;hpb=33ccd714ea9469b5b7d3b36bbe468ba1b0f31dfc;p=catta

diff --git a/address.c b/address.c
index 633f40e..dffd3ee 100644
--- a/address.c
+++ b/address.c
@@ -23,58 +23,93 @@ gint flx_address_cmp(const flxAddress *a, const flxAddress *b) {
     if (a->family != b->family)
         return -1;
 
-    return memcmp(a, b, flx_address_get_size(a));
+    return memcmp(a->data.data, b->data.data, flx_address_get_size(a));
 }
 
 gchar *flx_address_snprint(char *s, guint length, const flxAddress *a) {
     g_assert(s);
     g_assert(length);
     g_assert(a);
-    return (gchar*) inet_ntop(a->family, a->data, s, length);
+    return (gchar*) inet_ntop(a->family, a->data.data, s, length);
 }
 
-gchar* flx_reverse_lookup_name(const flxAddress *a) {
+gchar* flx_reverse_lookup_name_ipv4(const flxIPv4Address *a) {
+    guint32 n = ntohl(a->address);
     g_assert(a);
 
-    if (a->family == AF_INET) {
-        guint32 n = ntohl(a->ipv4.address);
-        return g_strdup_printf("%u.%u.%u.%u.in-addr.arpa", n & 0xFF, (n >> 8) & 0xFF, (n >> 16) & 0xFF, n >> 24);
-    } else if (a->family == AF_INET6) {
-        
-        return g_strdup_printf("%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.int",
-                               a->ipv6.address[15] & 0xF,
-                               a->ipv6.address[15] >> 4,
-                               a->ipv6.address[14] & 0xF,
-                               a->ipv6.address[14] >> 4,
-                               a->ipv6.address[13] & 0xF,
-                               a->ipv6.address[13] >> 4,
-                               a->ipv6.address[12] & 0xF,
-                               a->ipv6.address[12] >> 4,
-                               a->ipv6.address[11] & 0xF,
-                               a->ipv6.address[11] >> 4,
-                               a->ipv6.address[10] & 0xF,
-                               a->ipv6.address[10] >> 4,
-                               a->ipv6.address[9] & 0xF,
-                               a->ipv6.address[9] >> 4,
-                               a->ipv6.address[8] & 0xF,
-                               a->ipv6.address[8] >> 4,
-                               a->ipv6.address[7] & 0xF,
-                               a->ipv6.address[7] >> 4,
-                               a->ipv6.address[6] & 0xF,
-                               a->ipv6.address[6] >> 4,
-                               a->ipv6.address[5] & 0xF,
-                               a->ipv6.address[5] >> 4,
-                               a->ipv6.address[4] & 0xF,
-                               a->ipv6.address[4] >> 4,
-                               a->ipv6.address[3] & 0xF,
-                               a->ipv6.address[3] >> 4,
-                               a->ipv6.address[2] & 0xF,
-                               a->ipv6.address[2] >> 4,
-                               a->ipv6.address[1] & 0xF,
-                               a->ipv6.address[1] >> 4,
-                               a->ipv6.address[0] & 0xF,
-                               a->ipv6.address[0] >> 4);
-    }
-
-    return NULL;
+    return g_strdup_printf("%u.%u.%u.%u.in-addr.arpa", n & 0xFF, (n >> 8) & 0xFF, (n >> 16) & 0xFF, n >> 24);
+}
+
+static gchar *reverse_lookup_name_ipv6(const flxIPv6Address *a, const gchar *suffix) {
+    
+    return g_strdup_printf("%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%s",
+                           a->address[15] & 0xF,
+                           a->address[15] >> 4,
+                           a->address[14] & 0xF,
+                           a->address[14] >> 4,
+                           a->address[13] & 0xF,
+                           a->address[13] >> 4,
+                           a->address[12] & 0xF,
+                           a->address[12] >> 4,
+                           a->address[11] & 0xF,
+                           a->address[11] >> 4,
+                           a->address[10] & 0xF,
+                           a->address[10] >> 4,
+                           a->address[9] & 0xF,
+                           a->address[9] >> 4,
+                           a->address[8] & 0xF,
+                           a->address[8] >> 4,
+                           a->address[7] & 0xF,
+                           a->address[7] >> 4,
+                           a->address[6] & 0xF,
+                           a->address[6] >> 4,
+                           a->address[5] & 0xF,
+                           a->address[5] >> 4,
+                           a->address[4] & 0xF,
+                           a->address[4] >> 4,
+                           a->address[3] & 0xF,
+                           a->address[3] >> 4,
+                           a->address[2] & 0xF,
+                           a->address[2] >> 4,
+                           a->address[1] & 0xF,
+                           a->address[1] >> 4,
+                           a->address[0] & 0xF,
+                           a->address[0] >> 4,
+                           suffix);
+}
+
+gchar *flx_reverse_lookup_name_ipv6_arpa(const flxIPv6Address *a) {
+    return reverse_lookup_name_ipv6(a, "ip6.arpa");
+}
+
+gchar *flx_reverse_lookup_name_ipv6_int(const flxIPv6Address *a) {
+    return reverse_lookup_name_ipv6(a, "ip6.int");
+}
+
+flxAddress *flx_address_parse(const char *s, guchar family, flxAddress *ret_addr) {
+    g_assert(ret_addr);
+    g_assert(s);
+
+    if (inet_pton(family, s, ret_addr->data.data) < 0)
+        return NULL;
+
+    ret_addr->family = family;
+    
+    return ret_addr;
+}
+
+flxAddress *flx_address_from_sockaddr(const struct sockaddr* sa, flxAddress *ret_addr) {
+    g_assert(sa);
+    g_assert(ret_addr);
+
+    g_assert(sa->sa_family == AF_INET || sa->sa_family == AF_INET6);
+
+    ret_addr->family = sa->sa_family;
+
+    if (sa->sa_family == AF_INET)
+        memcpy(&ret_addr->data.ipv4, &((struct sockaddr_in*) sa)->sin_addr, sizeof(ret_addr->data.ipv4));
+    else
+        memcpy(&ret_addr->data.ipv6, &((struct sockaddr_in6*) sa)->sin6_addr, sizeof(ret_addr->data.ipv6));
+
+    return ret_addr;
 }