X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Ftest_gns_zkey_lookup.sh;h=6262c1eb2596d82f89c4d38da10b75ce922775bd;hb=f9d80e03e9eb5d7956d60b8b7db2c36fd0be7b9e;hp=1a3de520bee449dbdeb34f588030cb22951a53db;hpb=5ad45d439b900ea388b93aca8547ad03c53ddc68;p=oweals%2Fgnunet.git diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/gns/test_gns_zkey_lookup.sh index 1a3de520b..6262c1eb2 100755 --- a/src/gns/test_gns_zkey_lookup.sh +++ b/src/gns/test_gns_zkey_lookup.sh @@ -1,7 +1,20 @@ #!/bin/bash trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT which timeout &> /dev/null && DO_TIMEOUT="timeout 5" -rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME` + +LOCATION=$(which gnunet-config) +if [ -z $LOCATION ] +then + LOCATION="gnunet-config" +fi +$LOCATION --version 1> /dev/null +if test $? != 0 +then + echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" + exit 77 +fi + +rm -rf /tmp/test-gnunet-gns-peer-1/ TEST_IP="127.0.0.1" gnunet-arm -s -c test_gns_lookup.conf @@ -10,15 +23,16 @@ DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep delegatedego gnunet-identity -C testego -c test_gns_lookup.conf gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf -RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.$DELEGATED_PKEY'.zkey' -t A -c test_gns_lookup.conf` +RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.${DELEGATED_PKEY}.zkey -t A -c test_gns_lookup.conf` gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf gnunet-arm -e -c test_gns_lookup.conf +rm -rf /tmp/test-gnunet-gns-peer-1/ if [ "$RES_IP" == "$TEST_IP" ] then exit 0 else - echo "Failed to resolve to proper IP, got $RES_IP." + echo "Failed to resolve to proper IP, got $RES_IP, wanted $TEST_IP." exit 1 fi