diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-11-22 19:01:09 +0100 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-11-22 19:01:09 +0100 |
commit | 20402ca50f0b5a890759377d61071c6184641e97 (patch) | |
tree | e157032f50248fcd41d552cf680e159d1706249f | |
parent | 26046fcc220bcec5186e0abaabae04fd4e068ab5 (diff) | |
download | gnunet-20402ca50f0b5a890759377d61071c6184641e97.tar.gz gnunet-20402ca50f0b5a890759377d61071c6184641e97.zip |
GNS: Fix dns2gns test with default gnunet.org GNS override we introduced
-rw-r--r-- | src/cli/gns/test_dns2gns.conf | 5 | ||||
-rwxr-xr-x | src/cli/gns/test_dns2gns.sh | 6 | ||||
-rw-r--r-- | src/service/gns/gnunet-dns2gns.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/cli/gns/test_dns2gns.conf b/src/cli/gns/test_dns2gns.conf index f484d4114..2f6bdc797 100644 --- a/src/cli/gns/test_dns2gns.conf +++ b/src/cli/gns/test_dns2gns.conf | |||
@@ -18,7 +18,7 @@ MAX_PARALLEL_BACKGROUND_QUERIES = 10 | |||
18 | DEFAULT_LOOKUP_TIMEOUT = 15 s | 18 | DEFAULT_LOOKUP_TIMEOUT = 15 s |
19 | RECORD_PUT_INTERVAL = 1 h | 19 | RECORD_PUT_INTERVAL = 1 h |
20 | ZONE_PUBLISH_TIME_WINDOW = 1 h | 20 | ZONE_PUBLISH_TIME_WINDOW = 1 h |
21 | DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 | 21 | .gnunet.org = |
22 | 22 | ||
23 | [namestore] | 23 | [namestore] |
24 | IMMEDIATE_START = YES | 24 | IMMEDIATE_START = YES |
@@ -65,4 +65,5 @@ IMMEDIATE_START = YES | |||
65 | RUN_PER_USER = YES | 65 | RUN_PER_USER = YES |
66 | BIND_TO = 127.0.0.1 | 66 | BIND_TO = 127.0.0.1 |
67 | BIND_TO6 = ::1 | 67 | BIND_TO6 = ::1 |
68 | OPTIONS = -d 1.1.1.1 -p 12000 | 68 | PORT = 12000 |
69 | OPTIONS = -d 1.1.1.1 | ||
diff --git a/src/cli/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh index 295bcc766..a6024ca3c 100755 --- a/src/cli/gns/test_dns2gns.sh +++ b/src/cli/gns/test_dns2gns.sh | |||
@@ -20,7 +20,7 @@ MY_EGO="localego" | |||
20 | TEST_IP="127.0.0.1" | 20 | TEST_IP="127.0.0.1" |
21 | TEST_IPV6="dead::beef" | 21 | TEST_IPV6="dead::beef" |
22 | LABEL="fnord" | 22 | LABEL="fnord" |
23 | TEST_DOMAIN="gnunet.org" | 23 | TEST_DOMAIN="taler.net" |
24 | 24 | ||
25 | gnunet-arm -s -c test_dns2gns.conf | 25 | gnunet-arm -s -c test_dns2gns.conf |
26 | PKEY=`gnunet-identity -V -C $MY_EGO -c test_dns2gns.conf` | 26 | PKEY=`gnunet-identity -V -C $MY_EGO -c test_dns2gns.conf` |
@@ -34,14 +34,16 @@ if nslookup -port=12000 $LABEL.$PKEY localhost && nslookup -port=12000 $LABEL.$M | |||
34 | echo "PASS: GNS records can be resolved using dns2gns bridge" | 34 | echo "PASS: GNS records can be resolved using dns2gns bridge" |
35 | else | 35 | else |
36 | echo "FAIL: GNS records can't be resolved using dns2gns bridge" | 36 | echo "FAIL: GNS records can't be resolved using dns2gns bridge" |
37 | gnunet-arm -e -c test_dns2gns.conf | ||
37 | rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME` | 38 | rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME` |
38 | exit 1 | 39 | exit 1 |
39 | fi | 40 | fi |
40 | 41 | ||
41 | if nslookup -port=12000 gnunet.org localhost; then | 42 | if nslookup -port=12000 $TEST_DOMAIN localhost; then |
42 | echo "PASS: DNS records can be resolved using dns2gns bridge" | 43 | echo "PASS: DNS records can be resolved using dns2gns bridge" |
43 | else | 44 | else |
44 | echo "FAIL: DNS records can't be resolved using dns2gns bridge" | 45 | echo "FAIL: DNS records can't be resolved using dns2gns bridge" |
46 | gnunet-arm -e -c test_dns2gns.conf | ||
45 | rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME` | 47 | rm -rf `gnunet-config -c test_dns2gns.conf -f -s paths -o GNUNET_TEST_HOME` |
46 | exit 1 | 48 | exit 1 |
47 | fi | 49 | fi |
diff --git a/src/service/gns/gnunet-dns2gns.c b/src/service/gns/gnunet-dns2gns.c index 04d320c62..8706bec3a 100644 --- a/src/service/gns/gnunet-dns2gns.c +++ b/src/service/gns/gnunet-dns2gns.c | |||
@@ -750,7 +750,7 @@ read_dns4 (void *cls) | |||
750 | "recvfrom"); | 750 | "recvfrom"); |
751 | return; | 751 | return; |
752 | } | 752 | } |
753 | GNUNET_break (size == sret); | 753 | GNUNET_break (size != sret); |
754 | handle_request (listen_socket4, | 754 | handle_request (listen_socket4, |
755 | &v4, | 755 | &v4, |
756 | addrlen, | 756 | addrlen, |
@@ -803,7 +803,7 @@ read_dns6 (void *cls) | |||
803 | "recvfrom"); | 803 | "recvfrom"); |
804 | return; | 804 | return; |
805 | } | 805 | } |
806 | GNUNET_break (size == sret); | 806 | GNUNET_break (size != sret); |
807 | handle_request (listen_socket6, | 807 | handle_request (listen_socket6, |
808 | &v6, | 808 | &v6, |
809 | addrlen, | 809 | addrlen, |