diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-20 14:46:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-20 14:46:58 +0000 |
commit | 73386bf214d986f9944b74efdf15bb37ed1b10af (patch) | |
tree | 83b5cbfdaa2aad7c56b80c70ea0a01a2c8f85ec7 | |
parent | 1907190af59e4b093bac391a4b8b9637e67d2b48 (diff) | |
download | gnunet-73386bf214d986f9944b74efdf15bb37ed1b10af.tar.gz gnunet-73386bf214d986f9944b74efdf15bb37ed1b10af.zip |
-fix GNS2DNS resolution, make SOA test pass
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 9 | ||||
-rwxr-xr-x | src/gns/test_gns_soa_lookup.sh | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 2e7c7086c..6ff4857f6 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -1262,6 +1262,8 @@ handle_gns_resolution_result (void *cls, | |||
1262 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: | 1262 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: |
1263 | { | 1263 | { |
1264 | /* delegation to DNS */ | 1264 | /* delegation to DNS */ |
1265 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1266 | "Found GNS2DNS record, delegating to DNS!\n"); | ||
1265 | goto do_recurse; | 1267 | goto do_recurse; |
1266 | } | 1268 | } |
1267 | default: | 1269 | default: |
@@ -1469,6 +1471,13 @@ handle_gns_resolution_result (void *cls, | |||
1469 | } | 1471 | } |
1470 | } | 1472 | } |
1471 | break; | 1473 | break; |
1474 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: | ||
1475 | { | ||
1476 | /* delegation to DNS */ | ||
1477 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1478 | "Found GNS2DNS record, delegating to DNS!\n"); | ||
1479 | goto do_recurse; | ||
1480 | } | ||
1472 | default: | 1481 | default: |
1473 | rd_off++; | 1482 | rd_off++; |
1474 | break; | 1483 | break; |
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/gns/test_gns_soa_lookup.sh index a7606dbdc..513e557a4 100755 --- a/src/gns/test_gns_soa_lookup.sh +++ b/src/gns/test_gns_soa_lookup.sh | |||
@@ -11,15 +11,15 @@ gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t A -V $TEST_IP_GNS2DNS | |||
11 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf | 11 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf |
12 | RES_SOA=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t SOA -c test_gns_lookup.conf) | 12 | RES_SOA=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t SOA -c test_gns_lookup.conf) |
13 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t A -V $TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf | 13 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t A -V $TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf |
14 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf | 14 | gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V $TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf &> /dev/null |
15 | gnunet-identity -D testego -c test_gns_lookup.conf | 15 | gnunet-identity -D testego -c test_gns_lookup.conf |
16 | gnunet-arm -e -c test_gns_lookup.conf | 16 | gnunet-arm -e -c test_gns_lookup.conf |
17 | 17 | ||
18 | if [ "$RES_SOA" == " " ] | 18 | if [ "x$RES_SOA" != "x" ] |
19 | then | 19 | then |
20 | echo "PASS: Resolved $TEST_DOMAIN to $RES_SOA." | 20 | echo "PASS: Resolved SOA for $TEST_DOMAIN to $RES_SOA." |
21 | exit 0 | 21 | exit 0 |
22 | else | 22 | else |
23 | echo "Failed to resolve to proper SOA for $TEST_DOMAIN." | 23 | echo "Failed to resolve to proper SOA for $TEST_DOMAIN, got no result." |
24 | exit 1 | 24 | exit 1 |
25 | fi | 25 | fi |