[GNUnet-SVN] r35422 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2015-03-23 16:36:01 +0100 (Mon, 23 Mar 2015)
New Revision: 35422

Modified:
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/gns/plugin_gnsrecord_gns.c
Log:
return GNS2DNS records if explicitly requested

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2015-03-23 15:19:59 UTC 
(rev 35421)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2015-03-23 15:36:01 UTC 
(rev 35422)
@@ -1710,6 +1710,11 @@
       case GNUNET_GNSRECORD_TYPE_GNS2DNS:
         {
           /* delegation to DNS */
+          if (GNUNET_GNSRECORD_TYPE_GNS2DNS == rh->record_type)
+          {
+            rd_off++;
+            break; /* do not follow to DNS, we wanted the GNS2DNS record! */
+          }
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "Found GNS2DNS record, delegating to DNS!\n");
           goto do_recurse;

Modified: gnunet/src/gns/plugin_gnsrecord_gns.c
===================================================================
--- gnunet/src/gns/plugin_gnsrecord_gns.c       2015-03-23 15:19:59 UTC (rev 
35421)
+++ gnunet/src/gns/plugin_gnsrecord_gns.c       2015-03-23 15:36:01 UTC (rev 
35422)
@@ -341,8 +341,9 @@
   unsigned int i;
 
   i=0;
-  while ( (gns_name_map[i].name != NULL) &&
-         (0 != strcasecmp (gns_typename, gns_name_map[i].name)) )
+  while ( (NULL != gns_name_map[i].name) &&
+         (0 != strcasecmp (gns_typename,
+                            gns_name_map[i].name)) )
     i++;
   return gns_name_map[i].number;
 }
@@ -362,7 +363,7 @@
   unsigned int i;
 
   i=0;
-  while ( (gns_name_map[i].name != NULL) &&
+  while ( (NULL != gns_name_map[i].name) &&
          (type != gns_name_map[i].number) )
     i++;
   return gns_name_map[i].name;