From 4f4fbb8f834527ee6d1ff552a147981debd54c3e Mon Sep 17 00:00:00 2001 From: David Barksdale Date: Fri, 27 Nov 2015 16:08:26 -0600 Subject: Update gnunet to rev 36695 --- gnunet-build/packages/gnunet/gnunet/Buildrules | 2 +- .../gnunet/gnunet/files/gnunet-svn-36670-all.patch | 1001 -------------------- .../gnunet/gnunet/files/gnunet-svn-36695-all.patch | 1001 ++++++++++++++++++++ 3 files changed, 1002 insertions(+), 1002 deletions(-) delete mode 100644 gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36670-all.patch create mode 100644 gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36695-all.patch diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules index 17468d7..d7f169f 100644 --- a/gnunet-build/packages/gnunet/gnunet/Buildrules +++ b/gnunet-build/packages/gnunet/gnunet/Buildrules @@ -1,4 +1,4 @@ -REVISION="36670" +REVISION="36695" VERSION="svn-${REVISION}" RELEASE="0" DESCRIPTION="GNUnet is a framework for secure peer-to-peer networking that does not use any centralized or otherwise trusted services." diff --git a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36670-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36670-all.patch deleted file mode 100644 index 1a2dfa4..0000000 --- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36670-all.patch +++ /dev/null @@ -1,1001 +0,0 @@ -Index: gnunet-svn-36670/configure.ac -=================================================================== ---- gnunet-svn-36670/configure.ac (revision 36670) -+++ gnunet-svn-36670/configure.ac (working copy) -@@ -636,7 +636,7 @@ - AC_CHECK_HEADERS(ltdl.h, - AC_CHECK_LIB([ltdl], [lt_dlopenext], - ltdl=1))]) --if test x$ltdl = x1 -+if true - then - AC_MSG_RESULT([libltdl found]) - else -Index: gnunet-svn-36670/src/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/Makefile.am (working copy) -@@ -81,10 +81,8 @@ - peerinfo-tool \ - core \ - $(TESTBED) \ -- ats-tests \ - nse \ - dht \ -- hostlist \ - topology \ - regex \ - cadet \ -@@ -96,14 +94,9 @@ - gnsrecord \ - namecache \ - namestore \ -- vpn \ -- gns \ - $(CONVERSATION_DIR) \ - peerstore \ - fs \ -- exit \ -- pt \ -- integration-tests \ - $(EXP_DIR) - - endif -Index: gnunet-svn-36670/src/datastore/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/datastore/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/datastore/Makefile.am (working copy) -@@ -104,7 +104,8 @@ - $(SQLITE_PLUGIN) \ - $(MYSQL_PLUGIN) \ - $(POSTGRES_PLUGIN) \ -- libgnunet_plugin_datastore_heap.la -+ libgnunet_plugin_datastore_heap.la \ -+ libgnunet_plugin_datastore_emscripten.la - - # Real plugins should of course go into - # plugin_LTLIBRARIES -@@ -130,6 +131,13 @@ - libgnunet_plugin_datastore_heap_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - -+libgnunet_plugin_datastore_emscripten_la_SOURCES = \ -+ plugin_datastore_emscripten.c -+libgnunet_plugin_datastore_emscripten_la_LIBADD = \ -+ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ -+ $(LTLIBINTL) -+libgnunet_plugin_datastore_emscripten_la_LDFLAGS = \ -+ $(GN_PLUGIN_LDFLAGS) - - libgnunet_plugin_datastore_mysql_la_SOURCES = \ - plugin_datastore_mysql.c -Index: gnunet-svn-36670/src/dht/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/dht/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/dht/Makefile.am (working copy) -@@ -55,12 +55,6 @@ - gnunet-service-dht-whanau - endif - --noinst_PROGRAMS = \ -- gnunet-dht-monitor \ -- gnunet-dht-get \ -- gnunet-dht-put \ -- gnunet-dht-profiler -- - gnunet_service_dht_SOURCES = \ - gnunet-service-dht.c gnunet-service-dht.h \ - gnunet-service-dht_clients.c gnunet-service-dht_clients.h \ -Index: gnunet-svn-36670/src/dns/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/dns/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/dns/Makefile.am (working copy) -@@ -18,14 +18,6 @@ - pkgcfg_DATA = \ - dns.conf - --if LINUX --HIJACKBIN = gnunet-helper-dns --install-exec-hook: -- $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true --else --install-exec-hook: --endif -- - lib_LTLIBRARIES = \ - libgnunetdnsparser.la \ - libgnunetdnsstub.la \ -Index: gnunet-svn-36670/src/fs/fs_api.c -=================================================================== ---- gnunet-svn-36670/src/fs/fs_api.c (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_api.c (working copy) -@@ -452,19 +452,22 @@ - * to provide less data unless there is an error; - * a value of "0" will be used at the end to allow - * the reader to clean up its internal state -- * @param buf where the reader should write the data -- * @param emsg location for the reader to store an error message -- * @return number of bytes written, usually @a max, 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --size_t -+int - GNUNET_FS_data_reader_file_ (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg) -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls) - { - struct FileInfo *fi = cls; - ssize_t ret; -+ char **emsg = NULL; -+ char buf[max]; - - if (UINT64_MAX == offset) - { -@@ -473,7 +476,7 @@ - GNUNET_DISK_file_close (fi->fd); - fi->fd = NULL; - } -- return 0; -+ return GNUNET_SYSERR; - } - if (0 == max) - { -@@ -481,7 +484,7 @@ - GNUNET_DISK_file_close (fi->fd); - GNUNET_free (fi->filename); - GNUNET_free (fi); -- return 0; -+ return GNUNET_SYSERR; - } - if (NULL == fi->fd) - { -@@ -495,7 +498,9 @@ - _("Could not open file `%s': %s"), - fi->filename, - STRERROR (errno)); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, *emsg); -+ return GNUNET_OK; - } - } - if ( (GNUNET_SYSERR == -@@ -506,7 +511,9 @@ - _("Could not read file `%s': %s"), - fi->filename, - STRERROR (errno)); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, *emsg); -+ return GNUNET_OK; - } - if (ret != max) - { -@@ -513,9 +520,13 @@ - GNUNET_asprintf (emsg, - _("Short read reading from file `%s'!"), - fi->filename); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, *emsg); -+ return GNUNET_OK; - } -- return max; -+ if (cont) -+ cont (cont_cls, buf, max, NULL); -+ return GNUNET_OK; - } - - -@@ -557,28 +568,30 @@ - * to provide less data unless there is an error; - * a value of "0" will be used at the end to allow - * the reader to clean up its internal state -- * @param buf where the reader should write the data -- * @param emsg location for the reader to store an error message -- * @return number of bytes written, usually @a max, 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --size_t -+int - GNUNET_FS_data_reader_copy_ (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg) -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls) - { - char *data = cls; - - if (UINT64_MAX == offset) -- return 0; -+ return GNUNET_SYSERR; - if (0 == max) - { - GNUNET_free_non_null (data); -- return 0; -+ return GNUNET_SYSERR; - } -- memcpy (buf, &data[offset], max); -- return max; -+ if (cont) -+ cont (cont_cls, &data[offset], max, NULL); -+ return GNUNET_OK; - } - - -@@ -1246,43 +1259,6 @@ - - - /** -- * Copy all of the data from the reader to the write handle. -- * -- * @param wh write handle -- * @param fi file with reader -- * @return #GNUNET_OK on success -- */ --static int --copy_from_reader (struct GNUNET_BIO_WriteHandle *wh, -- struct GNUNET_FS_FileInformation *fi) --{ -- char buf[32 * 1024]; -- uint64_t off; -- size_t ret; -- size_t left; -- char *emsg; -- -- emsg = NULL; -- off = 0; -- while (off < fi->data.file.file_size) -- { -- left = GNUNET_MIN (sizeof (buf), fi->data.file.file_size - off); -- ret = -- fi->data.file.reader (fi->data.file.reader_cls, off, left, buf, &emsg); -- if (0 == ret) -- { -- GNUNET_free (emsg); -- return GNUNET_SYSERR; -- } -- if (GNUNET_OK != GNUNET_BIO_write (wh, buf, ret)) -- return GNUNET_SYSERR; -- off += ret; -- } -- return GNUNET_OK; --} -- -- --/** - * Create a temporary file on disk to store the current - * state of @a fi in. - * -@@ -1366,7 +1342,6 @@ - goto cleanup; - } - if ((GNUNET_NO == fi->is_published) && (NULL == fi->filename)) -- if (GNUNET_OK != copy_from_reader (wh, fi)) - { - GNUNET_break (0); - goto cleanup; -Index: gnunet-svn-36670/src/fs/fs_api.h -=================================================================== ---- gnunet-svn-36670/src/fs/fs_api.h (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_api.h (working copy) -@@ -686,16 +686,17 @@ - * to provide less data unless there is an error; - * a value of "0" will be used at the end to allow - * the reader to clean up its internal state -- * @param buf where the reader should write the data -- * @param emsg location for the reader to store an error message -- * @return number of bytes written, usually "max", 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --size_t -+int - GNUNET_FS_data_reader_file_ (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg); -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls); - - - /** -@@ -721,16 +722,17 @@ - * to provide less data unless there is an error; - * a value of "0" will be used at the end to allow - * the reader to clean up its internal state -- * @param buf where the reader should write the data -- * @param emsg location for the reader to store an error message -- * @return number of bytes written, usually @a max, 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --size_t -+int - GNUNET_FS_data_reader_copy_ (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg); -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls); - - - /** -Index: gnunet-svn-36670/src/fs/fs_download.c -=================================================================== ---- gnunet-svn-36670/src/fs/fs_download.c (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_download.c (working copy) -@@ -1820,33 +1820,36 @@ - * @param offset identifies which block to get - * @param max (maximum) number of bytes to get; returning - * fewer will also cause errors -- * @param buf where to copy the plaintext buffer -- * @param emsg location to store an error message (on error) -- * @return number of bytes copied to buf, 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --static size_t --fh_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg) -+static int -+fh_reader (void *cls, uint64_t offset, size_t max, -+ GNUNET_FS_ReaderContinuation cont, void *cont_cls) - { - struct GNUNET_FS_DownloadContext *dc = cls; - struct GNUNET_DISK_FileHandle *fh = dc->rfh; - ssize_t ret; -+ char buf[max]; - -- if (NULL != emsg) -- *emsg = NULL; - if (offset != GNUNET_DISK_file_seek (fh, offset, GNUNET_DISK_SEEK_SET)) - { -- if (NULL != emsg) -- *emsg = GNUNET_strdup (strerror (errno)); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, GNUNET_strdup (strerror (errno))); -+ return GNUNET_OK; - } - ret = GNUNET_DISK_file_read (fh, buf, max); - if (ret < 0) - { -- if (NULL != emsg) -- *emsg = GNUNET_strdup (strerror (errno)); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, GNUNET_strdup (strerror (errno))); -+ return GNUNET_OK; - } -- return ret; -+ if (cont) -+ cont (cont_cls, buf, max, NULL); -+ return GNUNET_OK; - } - - -Index: gnunet-svn-36670/src/fs/fs_publish.c -=================================================================== ---- gnunet-svn-36670/src/fs/fs_publish.c (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_publish.c (working copy) -@@ -364,24 +364,24 @@ - * @param emsg location to store an error message (on error) - * @return number of bytes copied to buf, 0 on error - */ --static size_t -+static int - block_reader (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg) -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls) - { - struct GNUNET_FS_PublishContext *pc = cls; - struct GNUNET_FS_FileInformation *p; - const char *dd; -- size_t pt_size; - - p = pc->fi_pos; - if (GNUNET_YES == p->is_directory) - { -- pt_size = GNUNET_MIN (max, p->data.dir.dir_size - offset); - dd = p->data.dir.dir_data; -- memcpy (buf, &dd[offset], pt_size); -+ if (cont) -+ cont (cont_cls, &dd[offset], max, NULL); -+ return GNUNET_OK; - } - else - { -@@ -392,18 +392,11 @@ - /* force closing the file to avoid keeping too many files open */ - p->data.file.reader (p->data.file.reader_cls, offset, 0, NULL, NULL); - } -- return 0; -+ return GNUNET_SYSERR; /* return value ignored in this case */ - } -- pt_size = GNUNET_MIN (max, p->data.file.file_size - offset); -- if (0 == pt_size) -- return 0; /* calling reader with pt_size==0 -- * might free buf, so don't! */ -- if (pt_size != -- p->data.file.reader (p->data.file.reader_cls, offset, pt_size, buf, -- emsg)) -- return 0; -+ return p->data.file.reader (p->data.file.reader_cls, offset, max, -+ cont, cont_cls); - } -- return pt_size; - } - - -@@ -613,7 +606,6 @@ - publish_content (struct GNUNET_FS_PublishContext *pc) - { - struct GNUNET_FS_FileInformation *p; -- char *emsg; - struct GNUNET_FS_DirectoryBuilder *db; - struct GNUNET_FS_FileInformation *dirpos; - void *raw_data; -@@ -638,22 +630,6 @@ - else - { - raw_data = NULL; -- if ((dirpos->data.file.file_size < MAX_INLINE_SIZE) && -- (dirpos->data.file.file_size > 0)) -- { -- raw_data = GNUNET_malloc (dirpos->data.file.file_size); -- emsg = NULL; -- if (dirpos->data.file.file_size != -- dirpos->data.file.reader (dirpos->data.file.reader_cls, 0, -- dirpos->data.file.file_size, raw_data, -- &emsg)) -- { -- GNUNET_free_non_null (emsg); -- GNUNET_free (raw_data); -- raw_data = NULL; -- } -- dirpos->data.file.reader (dirpos->data.file.reader_cls, UINT64_MAX, 0, 0, NULL); -- } - } - GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta, - raw_data); -Index: gnunet-svn-36670/src/fs/fs_test_lib.c -=================================================================== ---- gnunet-svn-36670/src/fs/fs_test_lib.c (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_test_lib.c (working copy) -@@ -275,26 +275,23 @@ - * @param cls pointer to uint32_t with publishing seed - * @param offset offset to generate data for - * @param max maximum number of bytes to generate -- * @param buf where to write generated data -- * @param emsg where to store error message (unused) -- * @return number of bytes written to buf -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --static size_t -+static int - file_generator (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg) -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls) - { - uint32_t *publish_seed = cls; - uint64_t pos; -- uint8_t *cbuf = buf; -+ uint8_t cbuf[max]; - int mod; - -- if (emsg != NULL) -- *emsg = NULL; -- if (buf == NULL) -- return 0; - for (pos = 0; pos < 8; pos++) - cbuf[pos] = (uint8_t) (offset >> pos * 8); - for (pos = 8; pos < max; pos++) -@@ -304,7 +301,9 @@ - mod = 1; - cbuf[pos] = (uint8_t) ((offset * (*publish_seed)) % mod); - } -- return max; -+ if (cont) -+ cont (cont_cls, cbuf, max, NULL); -+ return GNUNET_OK; - } - - -@@ -348,6 +347,24 @@ - - - /** -+ * Continuation for GNUNET_FS_DataReader -+ */ -+static void -+disk_write_cont (void *cls, -+ const void *pt_block, -+ uint16_t pt_size, -+ char *emsg) -+{ -+ struct GNUNET_DISK_FileHandle *fh = cls; -+ -+ GNUNET_assert (NULL != fh); -+ GNUNET_assert (NULL != pt_block); -+ GNUNET_assert (NULL == emsg); -+ GNUNET_assert (pt_size == GNUNET_DISK_file_write (fh, pt_block, pt_size)); -+} -+ -+ -+/** - * Callback to be called when testbed has connected to the fs service - * - * @param cls the 'struct TestPublishOperation' -@@ -365,9 +382,7 @@ - struct TestPublishOperation *po = cls; - struct GNUNET_FS_FileInformation *fi; - struct GNUNET_DISK_FileHandle *fh; -- char *em; - uint64_t off; -- char buf[DBLOCK_SIZE]; - size_t bsize; - struct GNUNET_FS_BlockOptions bo; - -@@ -399,11 +414,8 @@ - off = 0; - while (off < po->size) - { -- bsize = GNUNET_MIN (sizeof (buf), po->size - off); -- emsg = NULL; -- GNUNET_assert (bsize == file_generator (&po->publish_seed, off, bsize, buf, &em)); -- GNUNET_assert (em == NULL); -- GNUNET_assert (bsize == GNUNET_DISK_file_write (fh, buf, bsize)); -+ bsize = GNUNET_MIN (DBLOCK_SIZE, po->size - off); -+ GNUNET_assert (GNUNET_OK == file_generator (&po->publish_seed, off, bsize, disk_write_cont, fh)); - off += bsize; - } - GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh)); -Index: gnunet-svn-36670/src/fs/fs_tree.c -=================================================================== ---- gnunet-svn-36670/src/fs/fs_tree.c (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_tree.c (working copy) -@@ -322,59 +322,27 @@ - - - /** -- * Encrypt the next block of the file (and call proc and progress -- * accordingly; or of course "cont" if we have already completed -- * encoding of the entire file). -- * -- * @param te tree encoder to use -+ * Continuation for te->reader - */ --void --GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te) -+static void -+encrypt_block(void *cls, -+ const void *pt_block, -+ uint16_t pt_size, -+ char *emsg) - { -+ struct GNUNET_FS_TreeEncoder *te = cls; - struct ContentHashKey *mychk; -- const void *pt_block; -- uint16_t pt_size; -- char iob[DBLOCK_SIZE]; - char enc[DBLOCK_SIZE]; - struct GNUNET_CRYPTO_SymmetricSessionKey sk; - struct GNUNET_CRYPTO_SymmetricInitializationVector iv; - unsigned int off; - -- GNUNET_assert (GNUNET_NO == te->in_next); -- te->in_next = GNUNET_YES; -- if (te->chk_tree_depth == te->current_depth) -- { -- off = CHK_PER_INODE * (te->chk_tree_depth - 1); -- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TE done, reading CHK `%s' from %u\n", -- GNUNET_h2s (&te->chk_tree[off].query), off); -- te->uri = GNUNET_new (struct GNUNET_FS_Uri); -- te->uri->type = GNUNET_FS_URI_CHK; -- te->uri->data.chk.chk = te->chk_tree[off]; -- te->uri->data.chk.file_length = GNUNET_htonll (te->size); -+ if (NULL != emsg || NULL == pt_block) { -+ te->emsg = emsg; - te->in_next = GNUNET_NO; - te->cont (te->cls, NULL); - return; - } -- if (0 == te->current_depth) -- { -- /* read DBLOCK */ -- pt_size = GNUNET_MIN (DBLOCK_SIZE, te->size - te->publish_offset); -- if (pt_size != -- te->reader (te->cls, te->publish_offset, pt_size, iob, &te->emsg)) -- { -- te->in_next = GNUNET_NO; -- te->cont (te->cls, NULL); -- return; -- } -- pt_block = iob; -- } -- else -- { -- pt_size = -- GNUNET_FS_tree_compute_iblock_size (te->current_depth, -- te->publish_offset); -- pt_block = &te->chk_tree[(te->current_depth - 1) * CHK_PER_INODE]; -- } - off = compute_chk_offset (te->current_depth, te->publish_offset); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "TE is at offset %llu and depth %u with block size %u and target-CHK-offset %u\n", -@@ -416,6 +384,58 @@ - - - /** -+ * Encrypt the next block of the file (and call proc and progress -+ * accordingly; or of course "cont" if we have already completed -+ * encoding of the entire file). -+ * -+ * @param te tree encoder to use -+ */ -+void -+GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te) -+{ -+ const void *pt_block; -+ uint16_t pt_size; -+ unsigned int off; -+ -+ GNUNET_assert (GNUNET_NO == te->in_next); -+ te->in_next = GNUNET_YES; -+ if (te->chk_tree_depth == te->current_depth) -+ { -+ off = CHK_PER_INODE * (te->chk_tree_depth - 1); -+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TE done, reading CHK `%s' from %u\n", -+ GNUNET_h2s (&te->chk_tree[off].query), off); -+ te->uri = GNUNET_new (struct GNUNET_FS_Uri); -+ te->uri->type = GNUNET_FS_URI_CHK; -+ te->uri->data.chk.chk = te->chk_tree[off]; -+ te->uri->data.chk.file_length = GNUNET_htonll (te->size); -+ te->in_next = GNUNET_NO; -+ te->cont (te->cls, NULL); -+ return; -+ } -+ if (0 == te->current_depth) -+ { -+ /* read DBLOCK */ -+ pt_size = GNUNET_MIN (DBLOCK_SIZE, te->size - te->publish_offset); -+ if (GNUNET_OK != -+ te->reader (te->cls, te->publish_offset, pt_size, &encrypt_block, te)) -+ { -+ te->in_next = GNUNET_NO; -+ te->cont (te->cls, NULL); -+ return; -+ } -+ } -+ else -+ { -+ pt_size = -+ GNUNET_FS_tree_compute_iblock_size (te->current_depth, -+ te->publish_offset); -+ pt_block = &te->chk_tree[(te->current_depth - 1) * CHK_PER_INODE]; -+ encrypt_block(te, pt_block, pt_size, NULL); -+ } -+} -+ -+ -+/** - * Get the resulting URI from the encoding. - * - * @param te the tree encoder to clean up -@@ -446,7 +466,7 @@ - { - if (NULL != te->reader) - { -- (void) te->reader (te->cls, UINT64_MAX, 0, 0, NULL); -+ (void) te->reader (te->cls, UINT64_MAX, 0, NULL, NULL); - te->reader = NULL; - } - GNUNET_assert (GNUNET_NO == te->in_next); -Index: gnunet-svn-36670/src/fs/fs_unindex.c -=================================================================== ---- gnunet-svn-36670/src/fs/fs_unindex.c (revision 36670) -+++ gnunet-svn-36670/src/fs/fs_unindex.c (working copy) -@@ -43,32 +43,37 @@ - * @param offset identifies which block to get - * @param max (maximum) number of bytes to get; returning - * fewer will also cause errors -- * @param buf where to copy the plaintext buffer -- * @param emsg location to store an error message (on error) -- * @return number of bytes copied to buf, 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ --static size_t -+static int - unindex_reader (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg) -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls) - { - struct GNUNET_FS_UnindexContext *uc = cls; -- size_t pt_size; -+ char buf[max]; - -- pt_size = GNUNET_MIN (max, uc->file_size - offset); - if (offset != GNUNET_DISK_file_seek (uc->fh, offset, GNUNET_DISK_SEEK_SET)) - { -- *emsg = GNUNET_strdup (_("Failed to find given position in file")); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, -+ GNUNET_strdup (_("Failed to find given position in file"))); -+ return GNUNET_OK; - } -- if (pt_size != GNUNET_DISK_file_read (uc->fh, buf, pt_size)) -+ if (max != GNUNET_DISK_file_read (uc->fh, buf, max)) - { -- *emsg = GNUNET_strdup (_("Failed to read file")); -- return 0; -+ if (cont) -+ cont (cont_cls, NULL, max, GNUNET_strdup (_("Failed to read file"))); -+ return GNUNET_OK; - } -- return pt_size; -+ if (cont) -+ cont (cont_cls, buf, max, NULL); -+ return GNUNET_OK; - } - - -Index: gnunet-svn-36670/src/include/gnunet_fs_service.h -=================================================================== ---- gnunet-svn-36670/src/include/gnunet_fs_service.h (revision 36670) -+++ gnunet-svn-36670/src/include/gnunet_fs_service.h (working copy) -@@ -1838,6 +1838,20 @@ - - - /** -+ * Continuation for GNUNET_FS_DataReader -+ * -+ * @param cls closure -+ * @param pt_block pointer to bytes read by the reader -+ * @param pt_size the number of bytes read, must be equal to max -+ * @param emsg error message, NULL is there is no error -+ */ -+typedef void (*GNUNET_FS_ReaderContinuation) (void *cls, -+ const void *pt_block, -+ uint16_t pt_size, -+ char *emsg); -+ -+ -+/** - * Function that provides data. - * - * @param cls closure -@@ -1849,20 +1863,21 @@ - * clean up the reader's state); in this case, - * a value of '0' for max should be ignored - * @param max maximum number of bytes that should be -- * copied to buf; readers are not allowed -+ * passed to cont; readers are not allowed - * to provide less data unless there is an error; - * a value of "0" will be used at the end to allow - * the reader to clean up its internal state -- * @param buf where the reader should write the data -- * @param emsg location for the reader to store an error message -- * @return number of bytes written, usually @a max, 0 on error -+ * @param cont continuation to call with a pointer to the read bytes or an -+ * error message -+ * @param cont_cls closure to pass to the continuation -+ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise - */ - typedef size_t - (*GNUNET_FS_DataReader) (void *cls, - uint64_t offset, - size_t max, -- void *buf, -- char **emsg); -+ GNUNET_FS_ReaderContinuation cont, -+ void *cont_cls); - - - /** -Index: gnunet-svn-36670/src/nat/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/nat/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/nat/Makefile.am (working copy) -@@ -15,24 +15,6 @@ - dist_pkgcfg_DATA = \ - nat.conf - --if LINUX -- NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client -- NATSERVER = gnunet-helper-nat-server.c -- NATCLIENT = gnunet-helper-nat-client.c --install-exec-hook: -- $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true --else --if XFREEBSD -- NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client -- NATSERVER = gnunet-helper-nat-server.c -- NATCLIENT = gnunet-helper-nat-client.c --install-exec-hook: -- $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true --endif --else --install-exec-hook: --endif -- - bin_PROGRAMS = \ - gnunet-nat-server \ - gnunet-nat -Index: gnunet-svn-36670/src/peerstore/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/peerstore/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/peerstore/Makefile.am (working copy) -@@ -52,7 +52,7 @@ - $(GN_LIB_LDFLAGS) - - plugin_LTLIBRARIES = \ -- libgnunet_plugin_peerstore_sqlite.la -+ libgnunet_plugin_peerstore_emscripten.la - - libgnunet_plugin_peerstore_sqlite_la_SOURCES = \ - plugin_peerstore_sqlite.c -@@ -63,6 +63,18 @@ - libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \ - $(GN_PLUGIN_LDFLAGS) - -+libgnunet_plugin_peerstore_emscripten_la_SOURCES = \ -+ plugin_peerstore_emscripten.c -+libgnunet_plugin_peerstore_emscripten_la_LIBADD = \ -+ $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ -+ $(top_builddir)/src/util/libgnunetutil.la \ -+ $(LTLIBINTL) -+libgnunet_plugin_peerstore_emscripten_la_LDFLAGS = \ -+ $(GN_PLUGIN_LDFLAGS) -+libgnunet_plugin_peerstore_emscripten_la_DEPENDENCIES = \ -+ $(top_builddir)/src/util/libgnunetutil.la \ -+ libgnunetpeerstore.la -+ - check_PROGRAMS = \ - test_peerstore_api_store \ - test_peerstore_api_iterate \ -Index: gnunet-svn-36670/src/set/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/set/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/set/Makefile.am (working copy) -@@ -16,9 +16,6 @@ - AM_CFLAGS = -fprofile-arcs -ftest-coverage - endif - --noinst_PROGRAMS = \ -- gnunet-set-profiler gnunet-set-ibf-profiler -- - libexec_PROGRAMS = \ - gnunet-service-set - -Index: gnunet-svn-36670/src/transport/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/transport/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/transport/Makefile.am (working copy) -@@ -80,20 +80,6 @@ - endif - - if LINUX -- WLAN_BIN = gnunet-helper-transport-wlan -- WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy -- WLAN_BIN_SENDER = gnunet-transport-wlan-sender -- WLAN_BIN_RECEIVER = gnunet-transport-wlan-receiver -- WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la -- WLAN_PLUGIN_TEST = test_plugin_wlan -- WLAN_API_TEST = test_transport_api_wlan -- WLAN_TIMEOUT_TEST = test_transport_api_timeout_wlan -- WLAN_REL_TEST = test_transport_api_reliability_wlan -- WLAN_QUOTA_TEST = test_quota_compliance_wlan \ -- test_quota_compliance_wlan_asymmetric --endif -- --if LINUX - install-exec-hook: - $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true - if HAVE_LIBBLUETOOTH -@@ -271,22 +257,8 @@ - $(CFLAGS) - # -DANALYZE - --plugin_LTLIBRARIES = \ -- libgnunet_plugin_transport_tcp.la \ -- libgnunet_plugin_transport_udp.la \ -- $(UNIX_PLUGIN_LA) \ -- $(HTTP_CLIENT_PLUGIN_LA) \ -- $(HTTPS_CLIENT_PLUGIN_LA) \ -- $(HTTP_SERVER_PLUGIN_LA) \ -- $(HTTPS_SERVER_PLUGIN_LA) \ -- $(WLAN_PLUGIN_LA) \ -- $(BT_PLUGIN_LA) -+plugin_LTLIBRARIES = libgnunet_plugin_transport_http_client.la - --# Note: real plugins of course need to be added --# to the plugin_LTLIBRARIES above --noinst_LTLIBRARIES = \ -- libgnunet_plugin_transport_template.la -- - libgnunet_plugin_transport_tcp_la_SOURCES = \ - plugin_transport_tcp.c - libgnunet_plugin_transport_tcp_la_LIBADD = \ -@@ -360,7 +332,7 @@ - - - libgnunet_plugin_transport_http_client_la_SOURCES = \ -- plugin_transport_http_client.c plugin_transport_http_common.c plugin_transport_http_common.h -+ plugin_transport_http_client_emscripten.c plugin_transport_http_common.c plugin_transport_http_common.h - libgnunet_plugin_transport_http_client_la_LIBADD = \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ -Index: gnunet-svn-36670/src/util/Makefile.am -=================================================================== ---- gnunet-svn-36670/src/util/Makefile.am (revision 36670) -+++ gnunet-svn-36670/src/util/Makefile.am (working copy) -@@ -59,14 +59,10 @@ - libgnunetutil_la_SOURCES = \ - bandwidth.c \ - bio.c \ -- client.c \ - client_manager.c \ - common_allocation.c \ - common_endian.c \ - common_logging.c \ -- configuration.c \ -- configuration_loader.c \ -- connection.c \ - container_bloomfilter.c \ - container_heap.c \ - container_meta_data.c \ -@@ -99,15 +95,11 @@ - os_network.c \ - os_priority.c \ - peer.c \ -- plugin.c \ -- program.c \ - resolver_api.c resolver.h \ - scheduler.c \ -- server.c \ - server_mst.c \ - server_nc.c \ - server_tc.c \ -- service.c \ - signal.c \ - strings.c \ - time.c \ diff --git a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36695-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36695-all.patch new file mode 100644 index 0000000..113e7b1 --- /dev/null +++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36695-all.patch @@ -0,0 +1,1001 @@ +Index: gnunet-svn-36695/configure.ac +=================================================================== +--- gnunet-svn-36695/configure.ac (revision 36695) ++++ gnunet-svn-36695/configure.ac (working copy) +@@ -637,7 +637,7 @@ + AC_CHECK_HEADERS(ltdl.h, + AC_CHECK_LIB([ltdl], [lt_dlopenext], + ltdl=1))]) +-if test x$ltdl = x1 ++if true + then + AC_MSG_RESULT([libltdl found]) + else +Index: gnunet-svn-36695/src/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/Makefile.am (working copy) +@@ -81,10 +81,8 @@ + peerinfo-tool \ + core \ + $(TESTBED) \ +- ats-tests \ + nse \ + dht \ +- hostlist \ + topology \ + regex \ + cadet \ +@@ -96,14 +94,9 @@ + gnsrecord \ + namecache \ + namestore \ +- vpn \ +- gns \ + $(CONVERSATION_DIR) \ + peerstore \ + fs \ +- exit \ +- pt \ +- integration-tests \ + $(EXP_DIR) + + endif +Index: gnunet-svn-36695/src/datastore/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/datastore/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/datastore/Makefile.am (working copy) +@@ -104,7 +104,8 @@ + $(SQLITE_PLUGIN) \ + $(MYSQL_PLUGIN) \ + $(POSTGRES_PLUGIN) \ +- libgnunet_plugin_datastore_heap.la ++ libgnunet_plugin_datastore_heap.la \ ++ libgnunet_plugin_datastore_emscripten.la + + # Real plugins should of course go into + # plugin_LTLIBRARIES +@@ -130,6 +131,13 @@ + libgnunet_plugin_datastore_heap_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + ++libgnunet_plugin_datastore_emscripten_la_SOURCES = \ ++ plugin_datastore_emscripten.c ++libgnunet_plugin_datastore_emscripten_la_LIBADD = \ ++ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ ++ $(LTLIBINTL) ++libgnunet_plugin_datastore_emscripten_la_LDFLAGS = \ ++ $(GN_PLUGIN_LDFLAGS) + + libgnunet_plugin_datastore_mysql_la_SOURCES = \ + plugin_datastore_mysql.c +Index: gnunet-svn-36695/src/dht/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/dht/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/dht/Makefile.am (working copy) +@@ -55,12 +55,6 @@ + gnunet-service-dht-whanau + endif + +-noinst_PROGRAMS = \ +- gnunet-dht-monitor \ +- gnunet-dht-get \ +- gnunet-dht-put \ +- gnunet-dht-profiler +- + gnunet_service_dht_SOURCES = \ + gnunet-service-dht.c gnunet-service-dht.h \ + gnunet-service-dht_clients.c gnunet-service-dht_clients.h \ +Index: gnunet-svn-36695/src/dns/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/dns/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/dns/Makefile.am (working copy) +@@ -18,14 +18,6 @@ + pkgcfg_DATA = \ + dns.conf + +-if LINUX +-HIJACKBIN = gnunet-helper-dns +-install-exec-hook: +- $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true +-else +-install-exec-hook: +-endif +- + lib_LTLIBRARIES = \ + libgnunetdnsparser.la \ + libgnunetdnsstub.la \ +Index: gnunet-svn-36695/src/fs/fs_api.c +=================================================================== +--- gnunet-svn-36695/src/fs/fs_api.c (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_api.c (working copy) +@@ -452,19 +452,22 @@ + * to provide less data unless there is an error; + * a value of "0" will be used at the end to allow + * the reader to clean up its internal state +- * @param buf where the reader should write the data +- * @param emsg location for the reader to store an error message +- * @return number of bytes written, usually @a max, 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-size_t ++int + GNUNET_FS_data_reader_file_ (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg) ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls) + { + struct FileInfo *fi = cls; + ssize_t ret; ++ char **emsg = NULL; ++ char buf[max]; + + if (UINT64_MAX == offset) + { +@@ -473,7 +476,7 @@ + GNUNET_DISK_file_close (fi->fd); + fi->fd = NULL; + } +- return 0; ++ return GNUNET_SYSERR; + } + if (0 == max) + { +@@ -481,7 +484,7 @@ + GNUNET_DISK_file_close (fi->fd); + GNUNET_free (fi->filename); + GNUNET_free (fi); +- return 0; ++ return GNUNET_SYSERR; + } + if (NULL == fi->fd) + { +@@ -495,7 +498,9 @@ + _("Could not open file `%s': %s"), + fi->filename, + STRERROR (errno)); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, *emsg); ++ return GNUNET_OK; + } + } + if ( (GNUNET_SYSERR == +@@ -506,7 +511,9 @@ + _("Could not read file `%s': %s"), + fi->filename, + STRERROR (errno)); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, *emsg); ++ return GNUNET_OK; + } + if (ret != max) + { +@@ -513,9 +520,13 @@ + GNUNET_asprintf (emsg, + _("Short read reading from file `%s'!"), + fi->filename); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, *emsg); ++ return GNUNET_OK; + } +- return max; ++ if (cont) ++ cont (cont_cls, buf, max, NULL); ++ return GNUNET_OK; + } + + +@@ -557,28 +568,30 @@ + * to provide less data unless there is an error; + * a value of "0" will be used at the end to allow + * the reader to clean up its internal state +- * @param buf where the reader should write the data +- * @param emsg location for the reader to store an error message +- * @return number of bytes written, usually @a max, 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-size_t ++int + GNUNET_FS_data_reader_copy_ (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg) ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls) + { + char *data = cls; + + if (UINT64_MAX == offset) +- return 0; ++ return GNUNET_SYSERR; + if (0 == max) + { + GNUNET_free_non_null (data); +- return 0; ++ return GNUNET_SYSERR; + } +- memcpy (buf, &data[offset], max); +- return max; ++ if (cont) ++ cont (cont_cls, &data[offset], max, NULL); ++ return GNUNET_OK; + } + + +@@ -1246,43 +1259,6 @@ + + + /** +- * Copy all of the data from the reader to the write handle. +- * +- * @param wh write handle +- * @param fi file with reader +- * @return #GNUNET_OK on success +- */ +-static int +-copy_from_reader (struct GNUNET_BIO_WriteHandle *wh, +- struct GNUNET_FS_FileInformation *fi) +-{ +- char buf[32 * 1024]; +- uint64_t off; +- size_t ret; +- size_t left; +- char *emsg; +- +- emsg = NULL; +- off = 0; +- while (off < fi->data.file.file_size) +- { +- left = GNUNET_MIN (sizeof (buf), fi->data.file.file_size - off); +- ret = +- fi->data.file.reader (fi->data.file.reader_cls, off, left, buf, &emsg); +- if (0 == ret) +- { +- GNUNET_free (emsg); +- return GNUNET_SYSERR; +- } +- if (GNUNET_OK != GNUNET_BIO_write (wh, buf, ret)) +- return GNUNET_SYSERR; +- off += ret; +- } +- return GNUNET_OK; +-} +- +- +-/** + * Create a temporary file on disk to store the current + * state of @a fi in. + * +@@ -1366,7 +1342,6 @@ + goto cleanup; + } + if ((GNUNET_NO == fi->is_published) && (NULL == fi->filename)) +- if (GNUNET_OK != copy_from_reader (wh, fi)) + { + GNUNET_break (0); + goto cleanup; +Index: gnunet-svn-36695/src/fs/fs_api.h +=================================================================== +--- gnunet-svn-36695/src/fs/fs_api.h (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_api.h (working copy) +@@ -686,16 +686,17 @@ + * to provide less data unless there is an error; + * a value of "0" will be used at the end to allow + * the reader to clean up its internal state +- * @param buf where the reader should write the data +- * @param emsg location for the reader to store an error message +- * @return number of bytes written, usually "max", 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-size_t ++int + GNUNET_FS_data_reader_file_ (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg); ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls); + + + /** +@@ -721,16 +722,17 @@ + * to provide less data unless there is an error; + * a value of "0" will be used at the end to allow + * the reader to clean up its internal state +- * @param buf where the reader should write the data +- * @param emsg location for the reader to store an error message +- * @return number of bytes written, usually @a max, 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-size_t ++int + GNUNET_FS_data_reader_copy_ (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg); ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls); + + + /** +Index: gnunet-svn-36695/src/fs/fs_download.c +=================================================================== +--- gnunet-svn-36695/src/fs/fs_download.c (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_download.c (working copy) +@@ -1820,33 +1820,36 @@ + * @param offset identifies which block to get + * @param max (maximum) number of bytes to get; returning + * fewer will also cause errors +- * @param buf where to copy the plaintext buffer +- * @param emsg location to store an error message (on error) +- * @return number of bytes copied to buf, 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-static size_t +-fh_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg) ++static int ++fh_reader (void *cls, uint64_t offset, size_t max, ++ GNUNET_FS_ReaderContinuation cont, void *cont_cls) + { + struct GNUNET_FS_DownloadContext *dc = cls; + struct GNUNET_DISK_FileHandle *fh = dc->rfh; + ssize_t ret; ++ char buf[max]; + +- if (NULL != emsg) +- *emsg = NULL; + if (offset != GNUNET_DISK_file_seek (fh, offset, GNUNET_DISK_SEEK_SET)) + { +- if (NULL != emsg) +- *emsg = GNUNET_strdup (strerror (errno)); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, GNUNET_strdup (strerror (errno))); ++ return GNUNET_OK; + } + ret = GNUNET_DISK_file_read (fh, buf, max); + if (ret < 0) + { +- if (NULL != emsg) +- *emsg = GNUNET_strdup (strerror (errno)); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, GNUNET_strdup (strerror (errno))); ++ return GNUNET_OK; + } +- return ret; ++ if (cont) ++ cont (cont_cls, buf, max, NULL); ++ return GNUNET_OK; + } + + +Index: gnunet-svn-36695/src/fs/fs_publish.c +=================================================================== +--- gnunet-svn-36695/src/fs/fs_publish.c (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_publish.c (working copy) +@@ -364,24 +364,24 @@ + * @param emsg location to store an error message (on error) + * @return number of bytes copied to buf, 0 on error + */ +-static size_t ++static int + block_reader (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg) ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls) + { + struct GNUNET_FS_PublishContext *pc = cls; + struct GNUNET_FS_FileInformation *p; + const char *dd; +- size_t pt_size; + + p = pc->fi_pos; + if (GNUNET_YES == p->is_directory) + { +- pt_size = GNUNET_MIN (max, p->data.dir.dir_size - offset); + dd = p->data.dir.dir_data; +- memcpy (buf, &dd[offset], pt_size); ++ if (cont) ++ cont (cont_cls, &dd[offset], max, NULL); ++ return GNUNET_OK; + } + else + { +@@ -392,18 +392,11 @@ + /* force closing the file to avoid keeping too many files open */ + p->data.file.reader (p->data.file.reader_cls, offset, 0, NULL, NULL); + } +- return 0; ++ return GNUNET_SYSERR; /* return value ignored in this case */ + } +- pt_size = GNUNET_MIN (max, p->data.file.file_size - offset); +- if (0 == pt_size) +- return 0; /* calling reader with pt_size==0 +- * might free buf, so don't! */ +- if (pt_size != +- p->data.file.reader (p->data.file.reader_cls, offset, pt_size, buf, +- emsg)) +- return 0; ++ return p->data.file.reader (p->data.file.reader_cls, offset, max, ++ cont, cont_cls); + } +- return pt_size; + } + + +@@ -613,7 +606,6 @@ + publish_content (struct GNUNET_FS_PublishContext *pc) + { + struct GNUNET_FS_FileInformation *p; +- char *emsg; + struct GNUNET_FS_DirectoryBuilder *db; + struct GNUNET_FS_FileInformation *dirpos; + void *raw_data; +@@ -638,22 +630,6 @@ + else + { + raw_data = NULL; +- if ((dirpos->data.file.file_size < MAX_INLINE_SIZE) && +- (dirpos->data.file.file_size > 0)) +- { +- raw_data = GNUNET_malloc (dirpos->data.file.file_size); +- emsg = NULL; +- if (dirpos->data.file.file_size != +- dirpos->data.file.reader (dirpos->data.file.reader_cls, 0, +- dirpos->data.file.file_size, raw_data, +- &emsg)) +- { +- GNUNET_free_non_null (emsg); +- GNUNET_free (raw_data); +- raw_data = NULL; +- } +- dirpos->data.file.reader (dirpos->data.file.reader_cls, UINT64_MAX, 0, 0, NULL); +- } + } + GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta, + raw_data); +Index: gnunet-svn-36695/src/fs/fs_test_lib.c +=================================================================== +--- gnunet-svn-36695/src/fs/fs_test_lib.c (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_test_lib.c (working copy) +@@ -275,26 +275,23 @@ + * @param cls pointer to uint32_t with publishing seed + * @param offset offset to generate data for + * @param max maximum number of bytes to generate +- * @param buf where to write generated data +- * @param emsg where to store error message (unused) +- * @return number of bytes written to buf ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-static size_t ++static int + file_generator (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg) ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls) + { + uint32_t *publish_seed = cls; + uint64_t pos; +- uint8_t *cbuf = buf; ++ uint8_t cbuf[max]; + int mod; + +- if (emsg != NULL) +- *emsg = NULL; +- if (buf == NULL) +- return 0; + for (pos = 0; pos < 8; pos++) + cbuf[pos] = (uint8_t) (offset >> pos * 8); + for (pos = 8; pos < max; pos++) +@@ -304,7 +301,9 @@ + mod = 1; + cbuf[pos] = (uint8_t) ((offset * (*publish_seed)) % mod); + } +- return max; ++ if (cont) ++ cont (cont_cls, cbuf, max, NULL); ++ return GNUNET_OK; + } + + +@@ -348,6 +347,24 @@ + + + /** ++ * Continuation for GNUNET_FS_DataReader ++ */ ++static void ++disk_write_cont (void *cls, ++ const void *pt_block, ++ uint16_t pt_size, ++ char *emsg) ++{ ++ struct GNUNET_DISK_FileHandle *fh = cls; ++ ++ GNUNET_assert (NULL != fh); ++ GNUNET_assert (NULL != pt_block); ++ GNUNET_assert (NULL == emsg); ++ GNUNET_assert (pt_size == GNUNET_DISK_file_write (fh, pt_block, pt_size)); ++} ++ ++ ++/** + * Callback to be called when testbed has connected to the fs service + * + * @param cls the 'struct TestPublishOperation' +@@ -365,9 +382,7 @@ + struct TestPublishOperation *po = cls; + struct GNUNET_FS_FileInformation *fi; + struct GNUNET_DISK_FileHandle *fh; +- char *em; + uint64_t off; +- char buf[DBLOCK_SIZE]; + size_t bsize; + struct GNUNET_FS_BlockOptions bo; + +@@ -399,11 +414,8 @@ + off = 0; + while (off < po->size) + { +- bsize = GNUNET_MIN (sizeof (buf), po->size - off); +- emsg = NULL; +- GNUNET_assert (bsize == file_generator (&po->publish_seed, off, bsize, buf, &em)); +- GNUNET_assert (em == NULL); +- GNUNET_assert (bsize == GNUNET_DISK_file_write (fh, buf, bsize)); ++ bsize = GNUNET_MIN (DBLOCK_SIZE, po->size - off); ++ GNUNET_assert (GNUNET_OK == file_generator (&po->publish_seed, off, bsize, disk_write_cont, fh)); + off += bsize; + } + GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh)); +Index: gnunet-svn-36695/src/fs/fs_tree.c +=================================================================== +--- gnunet-svn-36695/src/fs/fs_tree.c (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_tree.c (working copy) +@@ -322,59 +322,27 @@ + + + /** +- * Encrypt the next block of the file (and call proc and progress +- * accordingly; or of course "cont" if we have already completed +- * encoding of the entire file). +- * +- * @param te tree encoder to use ++ * Continuation for te->reader + */ +-void +-GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te) ++static void ++encrypt_block(void *cls, ++ const void *pt_block, ++ uint16_t pt_size, ++ char *emsg) + { ++ struct GNUNET_FS_TreeEncoder *te = cls; + struct ContentHashKey *mychk; +- const void *pt_block; +- uint16_t pt_size; +- char iob[DBLOCK_SIZE]; + char enc[DBLOCK_SIZE]; + struct GNUNET_CRYPTO_SymmetricSessionKey sk; + struct GNUNET_CRYPTO_SymmetricInitializationVector iv; + unsigned int off; + +- GNUNET_assert (GNUNET_NO == te->in_next); +- te->in_next = GNUNET_YES; +- if (te->chk_tree_depth == te->current_depth) +- { +- off = CHK_PER_INODE * (te->chk_tree_depth - 1); +- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TE done, reading CHK `%s' from %u\n", +- GNUNET_h2s (&te->chk_tree[off].query), off); +- te->uri = GNUNET_new (struct GNUNET_FS_Uri); +- te->uri->type = GNUNET_FS_URI_CHK; +- te->uri->data.chk.chk = te->chk_tree[off]; +- te->uri->data.chk.file_length = GNUNET_htonll (te->size); ++ if (NULL != emsg || NULL == pt_block) { ++ te->emsg = emsg; + te->in_next = GNUNET_NO; + te->cont (te->cls, NULL); + return; + } +- if (0 == te->current_depth) +- { +- /* read DBLOCK */ +- pt_size = GNUNET_MIN (DBLOCK_SIZE, te->size - te->publish_offset); +- if (pt_size != +- te->reader (te->cls, te->publish_offset, pt_size, iob, &te->emsg)) +- { +- te->in_next = GNUNET_NO; +- te->cont (te->cls, NULL); +- return; +- } +- pt_block = iob; +- } +- else +- { +- pt_size = +- GNUNET_FS_tree_compute_iblock_size (te->current_depth, +- te->publish_offset); +- pt_block = &te->chk_tree[(te->current_depth - 1) * CHK_PER_INODE]; +- } + off = compute_chk_offset (te->current_depth, te->publish_offset); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "TE is at offset %llu and depth %u with block size %u and target-CHK-offset %u\n", +@@ -416,6 +384,58 @@ + + + /** ++ * Encrypt the next block of the file (and call proc and progress ++ * accordingly; or of course "cont" if we have already completed ++ * encoding of the entire file). ++ * ++ * @param te tree encoder to use ++ */ ++void ++GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te) ++{ ++ const void *pt_block; ++ uint16_t pt_size; ++ unsigned int off; ++ ++ GNUNET_assert (GNUNET_NO == te->in_next); ++ te->in_next = GNUNET_YES; ++ if (te->chk_tree_depth == te->current_depth) ++ { ++ off = CHK_PER_INODE * (te->chk_tree_depth - 1); ++ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TE done, reading CHK `%s' from %u\n", ++ GNUNET_h2s (&te->chk_tree[off].query), off); ++ te->uri = GNUNET_new (struct GNUNET_FS_Uri); ++ te->uri->type = GNUNET_FS_URI_CHK; ++ te->uri->data.chk.chk = te->chk_tree[off]; ++ te->uri->data.chk.file_length = GNUNET_htonll (te->size); ++ te->in_next = GNUNET_NO; ++ te->cont (te->cls, NULL); ++ return; ++ } ++ if (0 == te->current_depth) ++ { ++ /* read DBLOCK */ ++ pt_size = GNUNET_MIN (DBLOCK_SIZE, te->size - te->publish_offset); ++ if (GNUNET_OK != ++ te->reader (te->cls, te->publish_offset, pt_size, &encrypt_block, te)) ++ { ++ te->in_next = GNUNET_NO; ++ te->cont (te->cls, NULL); ++ return; ++ } ++ } ++ else ++ { ++ pt_size = ++ GNUNET_FS_tree_compute_iblock_size (te->current_depth, ++ te->publish_offset); ++ pt_block = &te->chk_tree[(te->current_depth - 1) * CHK_PER_INODE]; ++ encrypt_block(te, pt_block, pt_size, NULL); ++ } ++} ++ ++ ++/** + * Get the resulting URI from the encoding. + * + * @param te the tree encoder to clean up +@@ -446,7 +466,7 @@ + { + if (NULL != te->reader) + { +- (void) te->reader (te->cls, UINT64_MAX, 0, 0, NULL); ++ (void) te->reader (te->cls, UINT64_MAX, 0, NULL, NULL); + te->reader = NULL; + } + GNUNET_assert (GNUNET_NO == te->in_next); +Index: gnunet-svn-36695/src/fs/fs_unindex.c +=================================================================== +--- gnunet-svn-36695/src/fs/fs_unindex.c (revision 36695) ++++ gnunet-svn-36695/src/fs/fs_unindex.c (working copy) +@@ -43,32 +43,37 @@ + * @param offset identifies which block to get + * @param max (maximum) number of bytes to get; returning + * fewer will also cause errors +- * @param buf where to copy the plaintext buffer +- * @param emsg location to store an error message (on error) +- * @return number of bytes copied to buf, 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ +-static size_t ++static int + unindex_reader (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg) ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls) + { + struct GNUNET_FS_UnindexContext *uc = cls; +- size_t pt_size; ++ char buf[max]; + +- pt_size = GNUNET_MIN (max, uc->file_size - offset); + if (offset != GNUNET_DISK_file_seek (uc->fh, offset, GNUNET_DISK_SEEK_SET)) + { +- *emsg = GNUNET_strdup (_("Failed to find given position in file")); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, ++ GNUNET_strdup (_("Failed to find given position in file"))); ++ return GNUNET_OK; + } +- if (pt_size != GNUNET_DISK_file_read (uc->fh, buf, pt_size)) ++ if (max != GNUNET_DISK_file_read (uc->fh, buf, max)) + { +- *emsg = GNUNET_strdup (_("Failed to read file")); +- return 0; ++ if (cont) ++ cont (cont_cls, NULL, max, GNUNET_strdup (_("Failed to read file"))); ++ return GNUNET_OK; + } +- return pt_size; ++ if (cont) ++ cont (cont_cls, buf, max, NULL); ++ return GNUNET_OK; + } + + +Index: gnunet-svn-36695/src/include/gnunet_fs_service.h +=================================================================== +--- gnunet-svn-36695/src/include/gnunet_fs_service.h (revision 36695) ++++ gnunet-svn-36695/src/include/gnunet_fs_service.h (working copy) +@@ -1838,6 +1838,20 @@ + + + /** ++ * Continuation for GNUNET_FS_DataReader ++ * ++ * @param cls closure ++ * @param pt_block pointer to bytes read by the reader ++ * @param pt_size the number of bytes read, must be equal to max ++ * @param emsg error message, NULL is there is no error ++ */ ++typedef void (*GNUNET_FS_ReaderContinuation) (void *cls, ++ const void *pt_block, ++ uint16_t pt_size, ++ char *emsg); ++ ++ ++/** + * Function that provides data. + * + * @param cls closure +@@ -1849,20 +1863,21 @@ + * clean up the reader's state); in this case, + * a value of '0' for max should be ignored + * @param max maximum number of bytes that should be +- * copied to buf; readers are not allowed ++ * passed to cont; readers are not allowed + * to provide less data unless there is an error; + * a value of "0" will be used at the end to allow + * the reader to clean up its internal state +- * @param buf where the reader should write the data +- * @param emsg location for the reader to store an error message +- * @return number of bytes written, usually @a max, 0 on error ++ * @param cont continuation to call with a pointer to the read bytes or an ++ * error message ++ * @param cont_cls closure to pass to the continuation ++ * @return GNUNET_SYSERR if cont will not be called, GNUNET_OK otherwise + */ + typedef size_t + (*GNUNET_FS_DataReader) (void *cls, + uint64_t offset, + size_t max, +- void *buf, +- char **emsg); ++ GNUNET_FS_ReaderContinuation cont, ++ void *cont_cls); + + + /** +Index: gnunet-svn-36695/src/nat/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/nat/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/nat/Makefile.am (working copy) +@@ -15,24 +15,6 @@ + dist_pkgcfg_DATA = \ + nat.conf + +-if LINUX +- NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client +- NATSERVER = gnunet-helper-nat-server.c +- NATCLIENT = gnunet-helper-nat-client.c +-install-exec-hook: +- $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true +-else +-if XFREEBSD +- NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client +- NATSERVER = gnunet-helper-nat-server.c +- NATCLIENT = gnunet-helper-nat-client.c +-install-exec-hook: +- $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true +-endif +-else +-install-exec-hook: +-endif +- + bin_PROGRAMS = \ + gnunet-nat-server \ + gnunet-nat +Index: gnunet-svn-36695/src/peerstore/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/peerstore/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/peerstore/Makefile.am (working copy) +@@ -52,7 +52,7 @@ + $(GN_LIB_LDFLAGS) + + plugin_LTLIBRARIES = \ +- libgnunet_plugin_peerstore_sqlite.la ++ libgnunet_plugin_peerstore_emscripten.la + + libgnunet_plugin_peerstore_sqlite_la_SOURCES = \ + plugin_peerstore_sqlite.c +@@ -63,6 +63,18 @@ + libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + ++libgnunet_plugin_peerstore_emscripten_la_SOURCES = \ ++ plugin_peerstore_emscripten.c ++libgnunet_plugin_peerstore_emscripten_la_LIBADD = \ ++ $(top_builddir)/src/peerstore/libgnunetpeerstore.la \ ++ $(top_builddir)/src/util/libgnunetutil.la \ ++ $(LTLIBINTL) ++libgnunet_plugin_peerstore_emscripten_la_LDFLAGS = \ ++ $(GN_PLUGIN_LDFLAGS) ++libgnunet_plugin_peerstore_emscripten_la_DEPENDENCIES = \ ++ $(top_builddir)/src/util/libgnunetutil.la \ ++ libgnunetpeerstore.la ++ + check_PROGRAMS = \ + test_peerstore_api_store \ + test_peerstore_api_iterate \ +Index: gnunet-svn-36695/src/set/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/set/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/set/Makefile.am (working copy) +@@ -16,9 +16,6 @@ + AM_CFLAGS = -fprofile-arcs -ftest-coverage + endif + +-noinst_PROGRAMS = \ +- gnunet-set-profiler gnunet-set-ibf-profiler +- + libexec_PROGRAMS = \ + gnunet-service-set + +Index: gnunet-svn-36695/src/transport/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/transport/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/transport/Makefile.am (working copy) +@@ -80,20 +80,6 @@ + endif + + if LINUX +- WLAN_BIN = gnunet-helper-transport-wlan +- WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy +- WLAN_BIN_SENDER = gnunet-transport-wlan-sender +- WLAN_BIN_RECEIVER = gnunet-transport-wlan-receiver +- WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la +- WLAN_PLUGIN_TEST = test_plugin_wlan +- WLAN_API_TEST = test_transport_api_wlan +- WLAN_TIMEOUT_TEST = test_transport_api_timeout_wlan +- WLAN_REL_TEST = test_transport_api_reliability_wlan +- WLAN_QUOTA_TEST = test_quota_compliance_wlan \ +- test_quota_compliance_wlan_asymmetric +-endif +- +-if LINUX + install-exec-hook: + $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true + if HAVE_LIBBLUETOOTH +@@ -271,22 +257,8 @@ + $(CFLAGS) + # -DANALYZE + +-plugin_LTLIBRARIES = \ +- libgnunet_plugin_transport_tcp.la \ +- libgnunet_plugin_transport_udp.la \ +- $(UNIX_PLUGIN_LA) \ +- $(HTTP_CLIENT_PLUGIN_LA) \ +- $(HTTPS_CLIENT_PLUGIN_LA) \ +- $(HTTP_SERVER_PLUGIN_LA) \ +- $(HTTPS_SERVER_PLUGIN_LA) \ +- $(WLAN_PLUGIN_LA) \ +- $(BT_PLUGIN_LA) ++plugin_LTLIBRARIES = libgnunet_plugin_transport_http_client.la + +-# Note: real plugins of course need to be added +-# to the plugin_LTLIBRARIES above +-noinst_LTLIBRARIES = \ +- libgnunet_plugin_transport_template.la +- + libgnunet_plugin_transport_tcp_la_SOURCES = \ + plugin_transport_tcp.c + libgnunet_plugin_transport_tcp_la_LIBADD = \ +@@ -360,7 +332,7 @@ + + + libgnunet_plugin_transport_http_client_la_SOURCES = \ +- plugin_transport_http_client.c plugin_transport_http_common.c plugin_transport_http_common.h ++ plugin_transport_http_client_emscripten.c plugin_transport_http_common.c plugin_transport_http_common.h + libgnunet_plugin_transport_http_client_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ +Index: gnunet-svn-36695/src/util/Makefile.am +=================================================================== +--- gnunet-svn-36695/src/util/Makefile.am (revision 36695) ++++ gnunet-svn-36695/src/util/Makefile.am (working copy) +@@ -59,14 +59,10 @@ + libgnunetutil_la_SOURCES = \ + bandwidth.c \ + bio.c \ +- client.c \ + client_manager.c \ + common_allocation.c \ + common_endian.c \ + common_logging.c \ +- configuration.c \ +- configuration_loader.c \ +- connection.c \ + container_bloomfilter.c \ + container_heap.c \ + container_meta_data.c \ +@@ -99,15 +95,11 @@ + os_network.c \ + os_priority.c \ + peer.c \ +- plugin.c \ +- program.c \ + resolver_api.c resolver.h \ + scheduler.c \ +- server.c \ + server_mst.c \ + server_nc.c \ + server_tc.c \ +- service.c \ + signal.c \ + strings.c \ + time.c \ -- cgit v1.2.3-18-g5258