[GNUnet-SVN] [gnunet] 02/13: Merge branch 'master' into cadet_option

[gnunet]

This is an automated email from the git hooks/post-receive script.

t3sserakt pushed a commit to branch master
in repository gnunet.

commit 28d3e0676f262e495c6d5c49bbedd5ce65502cee
Merge: d2ed51b63 17611641f
Author: t3sserakt <address@hidden>
AuthorDate: Tue Jun 25 15:53:30 2019 +0200

    Merge branch 'master' into cadet_option

 doc/handbook/chapters/developer.texi          | 338 ++++++++------------
 doc/handbook/chapters/installation.texi       |  15 +-
 doc/handbook/chapters/keyconcepts.texi        |   1 +
 doc/handbook/chapters/user.texi               | 273 ++++++----------
 doc/handbook/images/ascension_interaction.png | Bin 0 -> 1992878 bytes
 doc/handbook/images/ascension_ssd.png         | Bin 0 -> 69446 bytes
 doc/man/gnunet-config.1                       |   3 +
 src/arm/arm_api.c                             | 287 +++++++----------
 src/arm/arm_monitor_api.c                     |  55 ++--
 src/arm/gnunet-arm.c                          |  21 +-
 src/arm/mockup-service.c                      |  49 +--
 src/cadet/cadet.h                             |  53 ++--
 src/cadet/cadet_api.c                         | 285 +++++++----------
 src/cadet/gnunet-service-cadet.c              |   1 -
 src/core/core_api.c                           |   5 +-
 src/core/core_api_monitor_peers.c             |  34 +-
 src/core/gnunet-core.c                        |  80 ++---
 src/gns/Makefile.am                           |   2 +-
 src/gns/gnunet-gns-proxy-ca.template          | 303 ++++++++++++++++++
 src/gns/gnunet-gns-proxy-setup-ca.in          |  45 ++-
 src/include/gnunet_getopt_lib.h               |  65 ++--
 src/namestore/gnunet-namestore.c              |  18 +-
 src/namestore/gnunet-service-namestore.c      |  67 ++--
 src/nse/gnunet-nse.c                          |  38 +--
 src/nse/gnunet-service-nse.c                  |  21 +-
 src/nse/nse_api.c                             |  43 +--
 src/util/crypto_random.c                      |  84 ++---
 src/util/getopt.c                             | 192 ++++++-----
 src/util/getopt_helpers.c                     | 440 ++++++++++++--------------
 src/util/gnunet-config.c                      | 195 ++++++------
 src/util/gnunet-scrypt.c                      | 213 ++++++-------
 src/util/gnunet-uri.c                         |  84 ++---
 src/util/test_common_logging_dummy.c          |  59 ++--
 src/util/tun.c                                | 163 +++++-----
 34 files changed, 1850 insertions(+), 1682 deletions(-)

diff --cc src/cadet/cadet_api.c
index 8638be27d,e141787a0..b16520429
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@@ -583,10 -575,10 +570,9 @@@ handle_channel_created 
      return;
    }
  
-   ch = create_channel (h,
-                        &ccn);
+   ch = create_channel (h, &ccn);
    ch->peer = msg->peer;
    ch->incoming_port = port;
 -  ch->options = ntohl (msg->opt);
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Creating incoming channel %X [%s] %p\n",
         ntohl (ccn.channel_of_client),
@@@ -1124,13 -1100,13 +1073,12 @@@ GNUNET_CADET_channel_create (struct GNU
  
    GNUNET_assert (NULL != disconnects);
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Creating channel to peer %s at port %s\n",
-             GNUNET_i2s (destination),
-             GNUNET_h2s (port));
-   ch = create_channel (h,
-                        NULL);
+               "Creating channel to peer %s at port %s\n",
+               GNUNET_i2s (destination),
+               GNUNET_h2s (port));
+   ch = create_channel (h, NULL);
    ch->ctx = channel_cls;
    ch->peer = *destination;
 -  ch->options = options;
    ch->window_changes = window_changes;
    ch->disconnects = disconnects;
  
@@@ -1151,8 -1125,8 +1097,7 @@@
    msg->ccn = ch->ccn;
    msg->port = *port;
    msg->peer = *destination;
-   GNUNET_MQ_send (h->mq,
-                   env);
 -  msg->opt = htonl (options);
+   GNUNET_MQ_send (h->mq, env);
    return ch;
  }
  

-- 
To stop receiving notification emails like this one, please contact
address@hidden.