diff options
-rwxr-xr-x | src/gns/test_gns_cname_lookup.sh | 5 | ||||
-rwxr-xr-x | src/gns/test_gns_delegated_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_lookup.sh | 3 | ||||
-rwxr-xr-x | src/gns/test_gns_mx_lookup.sh | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/gns/test_gns_cname_lookup.sh b/src/gns/test_gns_cname_lookup.sh index d6b82a4b0..14e14c570 100755 --- a/src/gns/test_gns_cname_lookup.sh +++ b/src/gns/test_gns_cname_lookup.sh | |||
@@ -11,14 +11,15 @@ TEST_RECORD_CNAME_DNS="gnunet.org" | |||
11 | TEST_RECORD_NAME_SERVER="server" | 11 | TEST_RECORD_NAME_SERVER="server" |
12 | TEST_RECORD_NAME_PLUS="www" | 12 | TEST_RECORD_NAME_PLUS="www" |
13 | TEST_RECORD_NAME_DNS="www3" | 13 | TEST_RECORD_NAME_DNS="www3" |
14 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | ||
14 | 15 | ||
15 | gnunet-arm -s -c test_gns_lookup.conf | 16 | gnunet-arm -s -c test_gns_lookup.conf |
16 | gnunet-identity -C testego -c test_gns_lookup.conf | 17 | gnunet-identity -C testego -c test_gns_lookup.conf |
17 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t CNAME -V $TEST_RECORD_CNAME_DNS -e never -c test_gns_lookup.conf | 18 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_DNS -t CNAME -V $TEST_RECORD_CNAME_DNS -e never -c test_gns_lookup.conf |
18 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_PLUS -t CNAME -V $TEST_RECORD_CNAME_PLUS -e never -c test_gns_lookup.conf | 19 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME_PLUS -t CNAME -V $TEST_RECORD_CNAME_PLUS -e never -c test_gns_lookup.conf |
19 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf | 20 | gnunet-namestore -p -z testego -a -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf |
20 | RES_CNAME=$(timeout 5 gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf) | 21 | RES_CNAME=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf` |
21 | RES_CNAME_DNS=$(timeout 5 gnunet-gns --raw -z testego -u www3.gnu -t A -c test_gns_lookup.conf) | 22 | RES_CNAME_DNS=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www3.gnu -t A -c test_gns_lookup.conf` |
22 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_NAME_DNS -t CNAME -V $TEST_RECORD_CNAME_DNS -e never -c test_gns_lookup.conf | 23 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_NAME_DNS -t CNAME -V $TEST_RECORD_CNAME_DNS -e never -c test_gns_lookup.conf |
23 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_NAME_PLUS -t CNAME -V $TEST_RECORD_CNAME_PLUS -e never -c test_gns_lookup.conf | 24 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_NAME_PLUS -t CNAME -V $TEST_RECORD_CNAME_PLUS -e never -c test_gns_lookup.conf |
24 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf | 25 | gnunet-namestore -p -z testego -d -n $TEST_RECORD_CNAME_SERVER -t A -V $TEST_IP_PLUS -e never -c test_gns_lookup.conf |
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh index 570c3d212..83710d28b 100755 --- a/src/gns/test_gns_delegated_lookup.sh +++ b/src/gns/test_gns_delegated_lookup.sh | |||
@@ -1,5 +1,6 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT | 2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT |
3 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | ||
3 | 4 | ||
4 | TEST_IP="127.0.0.1" | 5 | TEST_IP="127.0.0.1" |
5 | gnunet-arm -s -c test_gns_lookup.conf | 6 | gnunet-arm -s -c test_gns_lookup.conf |
@@ -8,7 +9,7 @@ DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep delegatedego | |||
8 | gnunet-identity -C testego -c test_gns_lookup.conf | 9 | gnunet-identity -C testego -c test_gns_lookup.conf |
9 | gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 10 | gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
10 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 11 | gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
11 | RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf) | 12 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf` |
12 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf | 13 | gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf |
13 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 14 | gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
14 | gnunet-arm -e -c test_gns_lookup.conf | 15 | gnunet-arm -e -c test_gns_lookup.conf |
diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh index bfb59c50f..499109fc5 100755 --- a/src/gns/test_gns_lookup.sh +++ b/src/gns/test_gns_lookup.sh | |||
@@ -1,11 +1,12 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT | 2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT |
3 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME` | 3 | rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME` |
4 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | ||
4 | TEST_IP="127.0.0.1" | 5 | TEST_IP="127.0.0.1" |
5 | gnunet-arm -s -c test_gns_lookup.conf | 6 | gnunet-arm -s -c test_gns_lookup.conf |
6 | gnunet-identity -C testego -c test_gns_lookup.conf | 7 | gnunet-identity -C testego -c test_gns_lookup.conf |
7 | gnunet-namestore -p -z testego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 8 | gnunet-namestore -p -z testego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
8 | RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf) | 9 | RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf` |
9 | gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf | 10 | gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf |
10 | gnunet-identity -D testego -c test_gns_lookup.conf | 11 | gnunet-identity -D testego -c test_gns_lookup.conf |
11 | gnunet-arm -e -c test_gns_lookup.conf | 12 | gnunet-arm -e -c test_gns_lookup.conf |
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/gns/test_gns_mx_lookup.sh index 79d4860c2..563f750c2 100755 --- a/src/gns/test_gns_mx_lookup.sh +++ b/src/gns/test_gns_mx_lookup.sh | |||
@@ -1,13 +1,14 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT | 2 | trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT |
3 | rm -fr `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME` | 3 | rm -fr `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME` |
4 | which timeout &> /dev/null && DO_TIMEOUT="timeout 5" | ||
4 | 5 | ||
5 | TEST_MX="5,mail.gnu" | 6 | TEST_MX="5,mail.gnu" |
6 | gnunet-arm -s -c test_gns_lookup.conf | 7 | gnunet-arm -s -c test_gns_lookup.conf |
7 | gnunet-identity -C testego -c test_gns_lookup.conf | 8 | gnunet-identity -C testego -c test_gns_lookup.conf |
8 | gnunet-namestore -p -z testego -a -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf | 9 | gnunet-namestore -p -z testego -a -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf |
9 | 10 | ||
10 | RES_MX=$(timeout 5 gnunet-gns --raw -z testego -u www.gnu -t MX -c test_gns_lookup.conf) | 11 | RES_MX=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.gnu -t MX -c test_gns_lookup.conf` |
11 | gnunet-namestore -z testego -d -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf | 12 | gnunet-namestore -z testego -d -n www -t MX -V "$TEST_MX" -e never -c test_gns_lookup.conf |
12 | gnunet-identity -D testego -c test_gns_lookup.conf | 13 | gnunet-identity -D testego -c test_gns_lookup.conf |
13 | gnunet-arm -e -c test_gns_lookup.conf | 14 | gnunet-arm -e -c test_gns_lookup.conf |