[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 02/03: merge conflict resolution
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 02/03: merge conflict resolution |
|
Date: |
Mon, 23 Apr 2018 15:59:06 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 3e2b9dc6d520b6be53a3c41a112f224df12d9f99
Merge: d6e1cea9a e1f46c052
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Apr 23 15:02:30 2018 +0200
merge conflict resolution
doc/man/Makefile.am | 4 +-
doc/man/gnunet-fs.1 | 7 +-
doc/man/gnunet-gns-import.1 | 17 -
doc/man/gnunet-zoneimport.1 | 45 ++
po/POTFILES.in | 122 ++--
src/dns/dnsstub.c | 688 ++++++++++---------
src/dns/gnunet-service-dns.c | 43 +-
src/dns/gnunet-zoneimport.c | 24 +-
src/exit/gnunet-daemon-exit.c | 29 +-
src/gns/gns_tld_api.c | 14 +-
src/gns/gnunet-dns2gns.c | 19 +-
src/gns/gnunet-gns-proxy-setup-ca | 8 +-
src/gns/gnunet-service-gns_resolver.c | 1077 ++++++++++++++++--------------
src/gns/test_gns_lookup.conf | 2 +-
src/include/gnunet_dnsstub_lib.h | 85 ++-
src/include/gnunet_gns_service.h | 9 +-
src/namestore/Makefile.am | 4 +-
src/namestore/gnunet-namestore.c | 2 +-
src/namestore/gnunet-service-namestore.c | 16 +-
src/namestore/gnunet-zoneimport.c | 70 +-
src/namestore/namestore_api.c | 2 +-
src/namestore/plugin_rest_namestore.c | 2 +-
22 files changed, 1270 insertions(+), 1019 deletions(-)
diff --cc src/namestore/gnunet-zoneimport.c
index a01772e67,89afeeeb1..2926fe9bd
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@@ -799,8 -786,8 +791,9 @@@ store_completed_cb (void *cls
int32_t success,
const char *emsg)
{
+ static unsigned int pdot;
struct Request *req = cls;
+ struct Record *rec;
req->qe = NULL;
pending--;
@@@ -816,10 -803,15 +809,18 @@@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Stored records under `%s'\n",
req->label);
+ pdot++;
+ if (0 == pdot % 1000)
+ fprintf (stderr, ".");
}
+ /* Free records */
+ while (NULL != (rec = req->rec_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (req->rec_head,
+ req->rec_tail,
+ rec);
+ GNUNET_free (rec);
+ }
}
@@@ -1176,9 -1125,8 +1166,9 @@@ ns_lookup_result_cb (void *cls
const struct GNUNET_GNSRECORD_Data *rd)
{
struct Request *req = cls;
-
+
req->qe = NULL;
+ pending--;
GNUNET_break (0 == memcmp (zone,
&req->zone->key,
sizeof (*zone)));
--
To stop receiving notification emails like this one, please contact
address@hidden