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

[gnunet]

Author: grothoff
Date: 2013-10-20 16:46:58 +0200 (Sun, 20 Oct 2013)
New Revision: 30361

Modified:
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/gns/test_gns_soa_lookup.sh
Log:
-fix GNS2DNS resolution, make SOA test pass

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2013-10-20 14:35:47 UTC 
(rev 30360)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2013-10-20 14:46:58 UTC 
(rev 30361)
@@ -1262,6 +1262,8 @@
        case GNUNET_GNSRECORD_TYPE_GNS2DNS:
          {
            /* delegation to DNS */
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Found GNS2DNS record, delegating to DNS!\n");
            goto do_recurse;
          }
        default:
@@ -1469,6 +1471,13 @@
           }
         }
        break;
+      case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+        {
+          /* delegation to DNS */
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Found GNS2DNS record, delegating to DNS!\n");
+          goto do_recurse;
+        }
       default:
        rd_off++;
        break;

Modified: gnunet/src/gns/test_gns_soa_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_soa_lookup.sh       2013-10-20 14:35:47 UTC (rev 
30360)
+++ gnunet/src/gns/test_gns_soa_lookup.sh       2013-10-20 14:46:58 UTC (rev 
30361)
@@ -11,15 +11,15 @@
 gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
 RES_SOA=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t SOA -c 
test_gns_lookup.conf)
 gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t A -V $TEST_IP_GNS2DNS 
-e never -c test_gns_lookup.conf
-gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
+gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf &> /dev/null
 gnunet-identity -D testego -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf
 
-if [ "$RES_SOA" == " " ]
+if [ "x$RES_SOA" != "x" ]
 then
-  echo "PASS: Resolved $TEST_DOMAIN to $RES_SOA."
+  echo "PASS: Resolved SOA for $TEST_DOMAIN to $RES_SOA."
   exit 0
 else
-  echo "Failed to resolve to proper SOA for $TEST_DOMAIN."
+  echo "Failed to resolve to proper SOA for $TEST_DOMAIN, got no result."
   exit 1
 fi