[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29513 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29513 - gnunet/src/gns |
Date: |
Tue, 24 Sep 2013 10:28:20 +0200 |
Author: grothoff
Date: 2013-09-24 10:28:19 +0200 (Tue, 24 Sep 2013)
New Revision: 29513
Modified:
gnunet/src/gns/gns.conf.in
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/gns/test_gns_delegated_lookup.sh
gnunet/src/gns/test_gns_lookup.conf
gnunet/src/gns/test_gns_lookup.sh
Log:
-keep reading from client to support multiple GNS requests in parallel
Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in 2013-09-24 08:03:45 UTC (rev 29512)
+++ gnunet/src/gns/gns.conf.in 2013-09-24 08:28:19 UTC (rev 29513)
@@ -8,13 +8,6 @@
ZONE_DIR = $SERVICEHOME/gns/
-# Should we hijack DNS queries using the Linux firewall?
-# (this only works on GNU/Linux systems)
-HIJACK_DNS = NO
-
-# Automatically import PKEYs we learn into the shorten zone?
-AUTO_IMPORT_PKEY = YES
-
# Do we require users that want to access GNS to run this process
# (usually not a good idea)
UNIX_MATCH_UID = NO
@@ -22,11 +15,6 @@
# Do we require users that want to access GNS to be in the 'gnunet' group?
UNIX_MATCH_GID = YES
-# When we automatically import PKEYs into shorten zone, require confirmation
-# before they become active? (Not useful right now as the GUI to confirm
-# doesn't exist -- and neither does the API...)
-AUTO_IMPORT_CONFIRMATION_REQ = NO
-
# How many queries is GADS allowed to perform in the background at the same
time?
MAX_PARALLEL_BACKGROUND_QUERIES = 25
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-09-24 08:03:45 UTC (rev 29512)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-09-24 08:28:19 UTC (rev 29513)
@@ -504,8 +504,6 @@
&rmsg->header,
GNUNET_NO);
GNUNET_free (rmsg);
- GNUNET_SERVER_receive_done (clh->client,
- GNUNET_OK);
GNUNET_CONTAINER_DLL_remove (clh_head, clh_tail, clh);
GNUNET_SERVER_client_set_user_context (clh->client, NULL);
GNUNET_free (clh);
@@ -564,6 +562,7 @@
return;
}
GNUNET_STRINGS_utf8_tolower (utf_in, &nameptr);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
clh = GNUNET_new (struct ClientLookupHandle);
GNUNET_SERVER_client_set_user_context (client, clh);
Modified: gnunet/src/gns/test_gns_delegated_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_delegated_lookup.sh 2013-09-24 08:03:45 UTC (rev
29512)
+++ gnunet/src/gns/test_gns_delegated_lookup.sh 2013-09-24 08:28:19 UTC (rev
29513)
@@ -10,7 +10,7 @@
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=$(gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf)
+RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u www.b.gnu -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
Modified: gnunet/src/gns/test_gns_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_lookup.conf 2013-09-24 08:03:45 UTC (rev 29512)
+++ gnunet/src/gns/test_gns_lookup.conf 2013-09-24 08:28:19 UTC (rev 29513)
@@ -12,7 +12,7 @@
SERVICEHOME = /tmp/test-gnunet-gns-peer-1/
[gns]
-PREFIX = valgrind --leak-check=full --track-origins=yes
+#PREFIX = valgrind --leak-check=full --track-origins=yes
AUTOSTART = YES
AUTO_IMPORT_PKEY = YES
MAX_PARALLEL_BACKGROUND_QUERIES = 10
Modified: gnunet/src/gns/test_gns_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_lookup.sh 2013-09-24 08:03:45 UTC (rev 29512)
+++ gnunet/src/gns/test_gns_lookup.sh 2013-09-24 08:28:19 UTC (rev 29513)
@@ -1,23 +1,19 @@
#!/bin/bash
trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-
+rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o SERVICEHOME`
TEST_IP="127.0.0.1"
-
gnunet-arm -s -c test_gns_lookup.conf
-
-#gnunet-identity -C testego -c test_gns_lookup.conf
-
+gnunet-identity -C testego -c test_gns_lookup.conf
gnunet-namestore -p -z testego -a -n www -t A -V $TEST_IP -e never -c
test_gns_lookup.conf
-RES_IP=$(gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf)
-
+RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u www.gnu -t A -c
test_gns_lookup.conf)
gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c
test_gns_lookup.conf
-
+gnunet-identity -D testego -c test_gns_lookup.conf
gnunet-arm -e -c test_gns_lookup.conf
if [ "$RES_IP" == "$TEST_IP" ]
then
exit 0
else
+ echo "Failed to resolve to proper IP, got $RES_IP."
exit 1
fi
-
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29513 - gnunet/src/gns,
gnunet <=