diff options
-rw-r--r-- | src/gns/gnunet-service-gns.c | 8 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 7 | ||||
-rw-r--r-- | src/gnsrecord/gnsrecord_misc.c | 2 | ||||
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 2 | ||||
-rw-r--r-- | src/reclaim/test_reclaim.conf | 2 | ||||
-rwxr-xr-x | src/reclaim/test_reclaim_consume.sh | 14 |
6 files changed, 20 insertions, 15 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 5833f4d0b..b28236fed 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -420,15 +420,11 @@ handle_lookup (void *cls, | |||
420 | const struct LookupMessage *sh_msg) | 420 | const struct LookupMessage *sh_msg) |
421 | { | 421 | { |
422 | struct GnsClient *gc = cls; | 422 | struct GnsClient *gc = cls; |
423 | char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 1]; | ||
424 | struct ClientLookupHandle *clh; | 423 | struct ClientLookupHandle *clh; |
425 | char *nameptr = name; | 424 | const char *name; |
426 | const char *utf_in; | ||
427 | 425 | ||
428 | GNUNET_SERVICE_client_continue (gc->client); | 426 | GNUNET_SERVICE_client_continue (gc->client); |
429 | utf_in = (const char *) &sh_msg[1]; | 427 | name = (const char *) &sh_msg[1]; |
430 | GNUNET_STRINGS_utf8_tolower (utf_in, | ||
431 | nameptr); | ||
432 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 428 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
433 | "Received LOOKUP `%s' message\n", | 429 | "Received LOOKUP `%s' message\n", |
434 | name); | 430 | name); |
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 549230abd..67ed48815 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -2531,6 +2531,13 @@ handle_namecache_block_response (void *cls, | |||
2531 | 2531 | ||
2532 | GNUNET_assert (NULL != rh->namecache_qe); | 2532 | GNUNET_assert (NULL != rh->namecache_qe); |
2533 | rh->namecache_qe = NULL; | 2533 | rh->namecache_qe = NULL; |
2534 | if (NULL == block) | ||
2535 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2536 | "No block found\n"); | ||
2537 | else | ||
2538 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2539 | "Got block with expiration %s\n", | ||
2540 | GNUNET_STRINGS_absolute_time_to_string (GNUNET_GNSRECORD_block_get_expiration (block))); | ||
2534 | if (((GNUNET_GNS_LO_DEFAULT == rh->options) || | 2541 | if (((GNUNET_GNS_LO_DEFAULT == rh->options) || |
2535 | ((GNUNET_GNS_LO_LOCAL_MASTER == rh->options) && | 2542 | ((GNUNET_GNS_LO_LOCAL_MASTER == rh->options) && |
2536 | (ac != rh->ac_head))) && | 2543 | (ac != rh->ac_head))) && |
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c index 9b5e47c4c..4cc77b59f 100644 --- a/src/gnsrecord/gnsrecord_misc.c +++ b/src/gnsrecord/gnsrecord_misc.c | |||
@@ -52,7 +52,7 @@ GNUNET_GNSRECORD_string_normalize (const char *src) | |||
52 | { | 52 | { |
53 | char *res; | 53 | char *res; |
54 | res = GNUNET_strdup (src); | 54 | res = GNUNET_strdup (src); |
55 | GNUNET_STRINGS_utf8_tolower (src, res); | 55 | //GNUNET_STRINGS_utf8_tolower (src, res); |
56 | GNUNET_STRINGS_utf8_normalize (src, res); | 56 | GNUNET_STRINGS_utf8_normalize (src, res); |
57 | return res; | 57 | return res; |
58 | } | 58 | } |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index c3482cd6a..57147879f 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -968,7 +968,7 @@ refresh_block (struct NamestoreClient *nc, | |||
968 | return; | 968 | return; |
969 | } | 969 | } |
970 | exp_time = GNUNET_GNSRECORD_record_get_expiration_time (res_count, res, | 970 | exp_time = GNUNET_GNSRECORD_record_get_expiration_time (res_count, res, |
971 | GNUNET_TIME_UNIT_FOREVER_ABS); | 971 | GNUNET_TIME_UNIT_ZERO_ABS); |
972 | if (cache_keys) | 972 | if (cache_keys) |
973 | GNUNET_assert (GNUNET_OK == | 973 | GNUNET_assert (GNUNET_OK == |
974 | GNUNET_GNSRECORD_block_create2 (zone_key, exp_time, name, | 974 | GNUNET_GNSRECORD_block_create2 (zone_key, exp_time, name, |
diff --git a/src/reclaim/test_reclaim.conf b/src/reclaim/test_reclaim.conf index ec19056e4..2dc53fe81 100644 --- a/src/reclaim/test_reclaim.conf +++ b/src/reclaim/test_reclaim.conf | |||
@@ -15,7 +15,7 @@ PLUGINS = | |||
15 | 15 | ||
16 | [reclaim] | 16 | [reclaim] |
17 | START_ON_DEMAND = YES | 17 | START_ON_DEMAND = YES |
18 | TICKET_REFRESH_INTERVAL = 15s | 18 | TICKET_REFRESH_INTERVAL = 30 s |
19 | #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog | 19 | #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog |
20 | 20 | ||
21 | [gns] | 21 | [gns] |
diff --git a/src/reclaim/test_reclaim_consume.sh b/src/reclaim/test_reclaim_consume.sh index 9186d3cb1..c012862c3 100755 --- a/src/reclaim/test_reclaim_consume.sh +++ b/src/reclaim/test_reclaim_consume.sh | |||
@@ -32,12 +32,14 @@ TEST_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf) | |||
32 | gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf | 32 | gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf |
33 | gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf | 33 | gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf |
34 | TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}') | 34 | TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}') |
35 | gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf >/dev/null 2>&1 | 35 | gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf #>/dev/null 2>&1 |
36 | 36 | ||
37 | if test $? != 0 | 37 | RES=$? |
38 | gnunet-identity -D testego -c test_reclaim.conf | ||
39 | gnunet-identity -D rpego -c test_reclaim.conf | ||
40 | gnunet-arm -e -c test_reclaim.conf | ||
41 | if test $RES != 0 | ||
38 | then | 42 | then |
39 | "Failed." | 43 | echo "Failed." |
40 | exit 1 | ||
41 | fi | 44 | fi |
42 | #curl http://localhost:7776/reclaim/tickets/testego | 45 | |
43 | gnunet-arm -e -c test_reclaim.conf | ||