[GNUnet-SVN] r32262 - gnunet/src/gns/nss

[gnunet]

Author: schanzen
Date: 2014-02-08 17:46:25 +0100 (Sat, 08 Feb 2014)
New Revision: 32262

Modified:
   gnunet/src/gns/nss/nss_gns.c
   gnunet/src/gns/nss/nss_gns_query.c
   gnunet/src/gns/nss/nss_gns_query.h
Log:
-no reverse GNS

Modified: gnunet/src/gns/nss/nss_gns.c
===================================================================
--- gnunet/src/gns/nss/nss_gns.c        2014-02-08 14:22:22 UTC (rev 32261)
+++ gnunet/src/gns/nss/nss_gns.c        2014-02-08 16:46:25 UTC (rev 32262)
@@ -253,103 +253,9 @@
     int *errnop,
     int *h_errnop) {
   
-    struct userdata u;
-    enum nss_status status = NSS_STATUS_UNAVAIL;
-    int r;
-    size_t addr_len, idx, astart;
-
     *errnop = EINVAL;
     *h_errnop = NO_RECOVERY;
-
-    u.count = 0;
-    u.data_len = 0;
-
-    addr_len = af == AF_INET ? sizeof(ipv4_address_t) : sizeof(ipv6_address_t);
-
-    if (len < (int) addr_len ||
-#ifdef NSS_IPV4_ONLY
-      af != AF_INET
-#elif NSS_IPV6_ONLY
-      af != AF_INET6
-#else
-      (af != AF_INET && af != AF_INET6)
-#endif
-      ) {
-      *errnop = EINVAL;
-      *h_errnop = NO_RECOVERY;
-
-      goto finish;
-    }
-
-    if (buflen < sizeof((char*) addr_len)) {
-      *errnop = ERANGE;
-      *h_errnop = NO_RECOVERY;
-      status = NSS_STATUS_TRYAGAIN;
-      goto finish;
-    }
-
-#if ! defined(NSS_IPV6_ONLY) && ! defined(NSS_IPV4_ONLY)
-    if (af == AF_INET)
-#endif
-#ifndef NSS_IPV6_ONLY
-    r = namecache_resolve_ip4((const ipv4_address_t*) addr, &u);
-#endif
-#if ! defined(NSS_IPV6_ONLY) && ! defined(NSS_IPV4_ONLY)
-    else
-#endif
-#ifndef NSS_IPV4_ONLY
-      r = namecache_resolve_ip6((const ipv6_address_t*) addr, &u);
-#endif
-    if (0 > r) {
-      *errnop = ETIMEDOUT;
-      *h_errnop = HOST_NOT_FOUND;
-      //NODE we allow to leak this into DNS so no NOTFOUND
-      status = NSS_STATUS_UNAVAIL;
-      goto finish;
-    }
-
-    *((char**) buffer) = NULL;
-    result->h_aliases = (char**) buffer;
-    idx = sizeof(char*);
-
-    assert(u.count > 0);
-    assert(u.data.name[0]);
-
-    if (buflen <
-        strlen(u.data.name[0])+1+ /* official names */
-        sizeof(char*)+ /* alias names */
-        addr_len+  /* address */
-        sizeof(void*)*2 + /* address list */
-        sizeof(void*)) {  /* padding to get the alignment right */
-      *errnop = ERANGE;
-      *h_errnop = NO_RECOVERY;
-      status = NSS_STATUS_TRYAGAIN;
-      goto finish;
-    }
-
-    /* Official name */
-    strcpy(buffer+idx, u.data.name[0]); 
-    result->h_name = buffer+idx;
-    idx += strlen(u.data.name[0])+1;
-    
-    result->h_addrtype = af;
-    result->h_length = addr_len;
-
-    /* Address */
-    astart = idx;
-    memcpy(buffer+astart, addr, addr_len);
-    idx += addr_len;
-
-    /* Address array, idx might not be at pointer alignment anymore, so we need
-     * to ensure it is*/
-    ALIGN(idx);
-
-    ((char**) (buffer+idx))[0] = buffer+astart;
-    ((char**) (buffer+idx))[1] = NULL;
-    result->h_addr_list = (char**) (buffer+idx);
-
-    status = NSS_STATUS_SUCCESS;
-finish:
-    return status;
+    //NOTE we allow to leak this into DNS so no NOTFOUND
+    return NSS_STATUS_UNAVAIL;
 }
 

Modified: gnunet/src/gns/nss/nss_gns_query.c
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.c  2014-02-08 14:22:22 UTC (rev 32261)
+++ gnunet/src/gns/nss/nss_gns_query.c  2014-02-08 16:46:25 UTC (rev 32262)
@@ -105,38 +105,4 @@
   free (cmd);
   return 0;
 }
-
-#ifndef NSS_IPV6_ONLY
-/**
- * Wrapper function that uses gnunet-namecache cli tool to resolve
- * an hostnames from IPv4/6 addresses.
- *
- * @param addr the ip to resolve
- * @param u the userdata (result struct)
- * @return -1 on error else 0
- */
-int
-namecache_resolve_ip4 (const ipv4_address_t* addr,
-                 struct userdata *u)
-{
-  return -1;
-}
-#endif
-
-#ifndef NSS_IPV4_ONLY
-/**
- * Wrapper function that uses gnunet-namecache cli tool to resolve
- * an hostnames from IPv4/6 addresses.
- *
- * @param addr the ip to resolve
- * @param u the userdata (result struct)
- * @return -1 on error else 0
- */
-int
-namecache_resolve_ip6 (const ipv6_address_t* addr,
-                 struct userdata *u)
-{
-  return -1;
-}
-#endif
 /* end of nss_gns_query.c */

Modified: gnunet/src/gns/nss/nss_gns_query.h
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.h  2014-02-08 14:22:22 UTC (rev 32261)
+++ gnunet/src/gns/nss/nss_gns_query.h  2014-02-08 16:46:25 UTC (rev 32262)
@@ -60,32 +60,4 @@
                const char *name,
                struct userdata *userdata);
 
-#ifndef NSS_IPV6_ONLY
-/**
- * Wrapper function that uses gnunet-namecache cli tool to resolve
- * an hostnames from IPv4/6 addresses.
- *
- * @param addr the ip to resolve
- * @param u the userdata (result struct)
- * @return -1 on error else 0
- */
-int
-namecache_resolve_ip4 (const ipv4_address_t* addr,
-                       struct userdata *u);
 #endif
-
-#ifndef NSS_IPV4_ONLY
-/**
- * Wrapper function that uses gnunet-namecache cli tool to resolve
- * an hostnames from IPv4/6 addresses.
- *
- * @param addr the ip to resolve
- * @param u the userdata (result struct)
- * @return -1 on error else 0
- */
-int
-namecache_resolve_ip6 (const ipv6_address_t* addr,
-                       struct userdata *u);
-#endif
-
-#endif