Update gnunet to rev 35006

3 files changed, 65 insertions, 66 deletions

diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules
index 6915bbe..88c6d38 100644
--- a/gnunet-build/packages/gnunet/gnunet/Buildrules
+++ b/gnunet-build/packages/gnunet/gnunet/Buildrules
@@ -1,4 +1,4 @@
-REVISION="34877"
+REVISION="35006"
 VERSION="svn-${REVISION}"
 DESCRIPTION="GNUnet is a framework for secure peer-to-peer networking that does not use any centralized or otherwise trusted services."
 SOURCE_URI="svn://gnunet.org/svn/gnunet@${REVISION}?proto=https&archive=${NAME}-${VERSION}.${ARCHIVE_FORMAT}"
diff --git a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34877-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-35006-all.patch
index 6c81fee..33fd9ae 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-34877-all.patch
+++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-35006-all.patch
@@ -1,7 +1,7 @@
-Index: gnunet-svn-34877/configure.ac
+Index: gnunet-svn-35006/configure.ac
 ===================================================================
---- gnunet-svn-34877/configure.ac	(revision 34877)
-+++ gnunet-svn-34877/configure.ac	(working copy)
+--- gnunet-svn-35006/configure.ac	(revision 35006)
++++ gnunet-svn-35006/configure.ac	(working copy)
 @@ -605,7 +605,7 @@
      AC_CHECK_HEADERS(ltdl.h,
       AC_CHECK_LIB([ltdl], [lt_dlopenext],
@@ -11,10 +11,10 @@ Index: gnunet-svn-34877/configure.ac
  then
   AC_MSG_RESULT([libltdl found])
  else
-Index: gnunet-svn-34877/src/Makefile.am
+Index: gnunet-svn-35006/src/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/Makefile.am	(working copy)
 @@ -66,10 +66,8 @@
    peerinfo-tool \
    core \
@@ -39,10 +39,10 @@ Index: gnunet-svn-34877/src/Makefile.am
 -  pt \
 -  integration-tests \
    $(EXP_DIR)
-Index: gnunet-svn-34877/src/arm/gnunet-service-arm.c
+Index: gnunet-svn-35006/src/arm/gnunet-service-arm.c
 ===================================================================
---- gnunet-svn-34877/src/arm/gnunet-service-arm.c	(revision 34877)
-+++ gnunet-svn-34877/src/arm/gnunet-service-arm.c	(working copy)
+--- gnunet-svn-35006/src/arm/gnunet-service-arm.c	(revision 35006)
++++ gnunet-svn-35006/src/arm/gnunet-service-arm.c	(working copy)
 @@ -1546,19 +1546,5 @@
  }
  
@@ -63,10 +63,10 @@ Index: gnunet-svn-34877/src/arm/gnunet-service-arm.c
 -
 -
  /* end of gnunet-service-arm.c */
-Index: gnunet-svn-34877/src/dht/Makefile.am
+Index: gnunet-svn-35006/src/dht/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/dht/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/dht/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/dht/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/dht/Makefile.am	(working copy)
 @@ -49,12 +49,6 @@
   gnunet-service-dht \
   gnunet-service-dht-xvine
@@ -80,10 +80,10 @@ Index: gnunet-svn-34877/src/dht/Makefile.am
  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-34877/src/dht/gnunet-service-dht_neighbours.c
+Index: gnunet-svn-35006/src/dht/gnunet-service-dht_neighbours.c
 ===================================================================
---- gnunet-svn-34877/src/dht/gnunet-service-dht_neighbours.c	(revision 34877)
-+++ gnunet-svn-34877/src/dht/gnunet-service-dht_neighbours.c	(working copy)
+--- gnunet-svn-35006/src/dht/gnunet-service-dht_neighbours.c	(revision 35006)
++++ gnunet-svn-35006/src/dht/gnunet-service-dht_neighbours.c	(working copy)
 @@ -45,7 +45,6 @@
  #include "gnunet-service-dht_neighbours.h"
  #include "gnunet-service-dht_nse.h"
@@ -92,10 +92,10 @@ Index: gnunet-svn-34877/src/dht/gnunet-service-dht_neighbours.c
  #include "dht.h"
  
  #define LOG_TRAFFIC(kind,...) GNUNET_log_from (kind, "dht-traffic",__VA_ARGS__)
-Index: gnunet-svn-34877/src/dns/Makefile.am
+Index: gnunet-svn-35006/src/dns/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/dns/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/dns/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/dns/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/dns/Makefile.am	(working copy)
 @@ -17,14 +17,6 @@
  pkgcfg_DATA = \
    dns.conf
@@ -111,10 +111,10 @@ Index: gnunet-svn-34877/src/dns/Makefile.am
  lib_LTLIBRARIES = \
    libgnunetdnsparser.la \
    libgnunetdnsstub.la \
-Index: gnunet-svn-34877/src/nat/Makefile.am
+Index: gnunet-svn-35006/src/nat/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/nat/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/nat/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/nat/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/nat/Makefile.am	(working copy)
 @@ -14,24 +14,6 @@
  dist_pkgcfg_DATA = \
    nat.conf
@@ -140,10 +140,10 @@ Index: gnunet-svn-34877/src/nat/Makefile.am
  bin_PROGRAMS = \
   gnunet-nat-server 
  
-Index: gnunet-svn-34877/src/nse/gnunet-service-nse.c
+Index: gnunet-svn-35006/src/nse/gnunet-service-nse.c
 ===================================================================
---- gnunet-svn-34877/src/nse/gnunet-service-nse.c	(revision 34877)
-+++ gnunet-svn-34877/src/nse/gnunet-service-nse.c	(working copy)
+--- gnunet-svn-35006/src/nse/gnunet-service-nse.c	(revision 35006)
++++ gnunet-svn-35006/src/nse/gnunet-service-nse.c	(working copy)
 @@ -1629,21 +1629,7 @@
  }
  
@@ -166,10 +166,10 @@ Index: gnunet-svn-34877/src/nse/gnunet-service-nse.c
  
 -
  /* end of gnunet-service-nse.c */
-Index: gnunet-svn-34877/src/peerstore/Makefile.am
+Index: gnunet-svn-35006/src/peerstore/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/peerstore/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/peerstore/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/peerstore/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/peerstore/Makefile.am	(working copy)
 @@ -50,7 +50,7 @@
    $(GN_LIB_LDFLAGS)
  
@@ -198,10 +198,10 @@ Index: gnunet-svn-34877/src/peerstore/Makefile.am
  check_PROGRAMS = \
   test_peerstore_api_store \
   test_peerstore_api_iterate \
-Index: gnunet-svn-34877/src/regex/gnunet-daemon-regexprofiler.c
+Index: gnunet-svn-35006/src/regex/gnunet-daemon-regexprofiler.c
 ===================================================================
---- gnunet-svn-34877/src/regex/gnunet-daemon-regexprofiler.c	(revision 34877)
-+++ gnunet-svn-34877/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
+--- gnunet-svn-35006/src/regex/gnunet-daemon-regexprofiler.c	(revision 35006)
++++ gnunet-svn-35006/src/regex/gnunet-daemon-regexprofiler.c	(working copy)
 @@ -382,19 +382,6 @@
  }
  
@@ -222,10 +222,10 @@ Index: gnunet-svn-34877/src/regex/gnunet-daemon-regexprofiler.c
  
 -
  /* end of gnunet-daemon-regexprofiler.c */
-Index: gnunet-svn-34877/src/revocation/gnunet-service-revocation.c
+Index: gnunet-svn-35006/src/revocation/gnunet-service-revocation.c
 ===================================================================
---- gnunet-svn-34877/src/revocation/gnunet-service-revocation.c	(revision 34877)
-+++ gnunet-svn-34877/src/revocation/gnunet-service-revocation.c	(working copy)
+--- gnunet-svn-35006/src/revocation/gnunet-service-revocation.c	(revision 35006)
++++ gnunet-svn-35006/src/revocation/gnunet-service-revocation.c	(working copy)
 @@ -902,21 +902,7 @@
  }
  
@@ -248,10 +248,10 @@ Index: gnunet-svn-34877/src/revocation/gnunet-service-revocation.c
  
 -
  /* end of gnunet-service-revocation.c */
-Index: gnunet-svn-34877/src/set/Makefile.am
+Index: gnunet-svn-35006/src/set/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/set/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/set/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/set/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/set/Makefile.am	(working copy)
 @@ -15,9 +15,6 @@
    AM_CFLAGS = -fprofile-arcs -ftest-coverage
  endif
@@ -262,10 +262,10 @@ Index: gnunet-svn-34877/src/set/Makefile.am
  libexec_PROGRAMS = \
   gnunet-service-set
  
-Index: gnunet-svn-34877/src/statistics/gnunet-service-statistics.c
+Index: gnunet-svn-35006/src/statistics/gnunet-service-statistics.c
 ===================================================================
---- gnunet-svn-34877/src/statistics/gnunet-service-statistics.c	(revision 34877)
-+++ gnunet-svn-34877/src/statistics/gnunet-service-statistics.c	(working copy)
+--- gnunet-svn-35006/src/statistics/gnunet-service-statistics.c	(revision 35006)
++++ gnunet-svn-35006/src/statistics/gnunet-service-statistics.c	(working copy)
 @@ -1077,20 +1077,5 @@
                                &run, NULL)) ? 0 : 1;
  }
@@ -287,10 +287,10 @@ Index: gnunet-svn-34877/src/statistics/gnunet-service-statistics.c
 -
 -
  /* end of gnunet-service-statistics.c */
-Index: gnunet-svn-34877/src/topology/gnunet-daemon-topology.c
+Index: gnunet-svn-35006/src/topology/gnunet-daemon-topology.c
 ===================================================================
---- gnunet-svn-34877/src/topology/gnunet-daemon-topology.c	(revision 34877)
-+++ gnunet-svn-34877/src/topology/gnunet-daemon-topology.c	(working copy)
+--- gnunet-svn-35006/src/topology/gnunet-daemon-topology.c	(revision 35006)
++++ gnunet-svn-35006/src/topology/gnunet-daemon-topology.c	(working copy)
 @@ -1327,18 +1327,5 @@
  }
  
@@ -310,10 +310,10 @@ Index: gnunet-svn-34877/src/topology/gnunet-daemon-topology.c
 -#endif
 -
  /* end of gnunet-daemon-topology.c */
-Index: gnunet-svn-34877/src/transport/Makefile.am
+Index: gnunet-svn-35006/src/transport/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/transport/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/transport/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/transport/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/transport/Makefile.am	(working copy)
 @@ -79,20 +79,6 @@
  endif
  
@@ -335,7 +335,7 @@ Index: gnunet-svn-34877/src/transport/Makefile.am
  install-exec-hook:
  	$(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true
  if HAVE_LIBBLUETOOTH
-@@ -266,17 +252,7 @@
+@@ -267,17 +253,7 @@
    $(CFLAGS)
  # -DANALYZE
  
@@ -354,7 +354,7 @@ Index: gnunet-svn-34877/src/transport/Makefile.am
  
  libgnunet_plugin_transport_tcp_la_SOURCES = \
    plugin_transport_tcp.c
-@@ -351,7 +327,7 @@
+@@ -352,7 +328,7 @@
  
  
  libgnunet_plugin_transport_http_client_la_SOURCES = \
@@ -363,10 +363,10 @@ Index: gnunet-svn-34877/src/transport/Makefile.am
  libgnunet_plugin_transport_http_client_la_LIBADD = \
    $(top_builddir)/src/hello/libgnunethello.la \
    $(top_builddir)/src/statistics/libgnunetstatistics.la \
-Index: gnunet-svn-34877/src/util/Makefile.am
+Index: gnunet-svn-35006/src/util/Makefile.am
 ===================================================================
---- gnunet-svn-34877/src/util/Makefile.am	(revision 34877)
-+++ gnunet-svn-34877/src/util/Makefile.am	(working copy)
+--- gnunet-svn-35006/src/util/Makefile.am	(revision 35006)
++++ gnunet-svn-35006/src/util/Makefile.am	(working copy)
 @@ -66,13 +66,10 @@
  libgnunetutil_la_SOURCES = \
    bandwidth.c \
@@ -397,10 +397,10 @@ Index: gnunet-svn-34877/src/util/Makefile.am
    signal.c \
    strings.c \
    time.c \
-Index: gnunet-svn-34877/src/util/gnunet-service-resolver.c
+Index: gnunet-svn-35006/src/util/gnunet-service-resolver.c
 ===================================================================
---- gnunet-svn-34877/src/util/gnunet-service-resolver.c	(revision 34877)
-+++ gnunet-svn-34877/src/util/gnunet-service-resolver.c	(working copy)
+--- gnunet-svn-35006/src/util/gnunet-service-resolver.c	(revision 35006)
++++ gnunet-svn-35006/src/util/gnunet-service-resolver.c	(working copy)
 @@ -603,20 +603,6 @@
    return ret;
  }
diff --git a/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c b/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c
index c491d03..40fd08f 100644
--- a/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c
+++ b/gnunet-build/packages/gnunet/gnunet/files/plugin_transport_http_client_emscripten.c
@@ -167,9 +167,9 @@ struct Session
   size_t overhead;
 
   /**
-   * ATS network type in NBO
+   * ATS network type.
    */
-  uint32_t ats_address_network_type;
+  enum GNUNET_ATS_Network_Type ats_address_network_type;
 
   /**
    * Is the client PUT handle disconnect in progress?
@@ -599,9 +599,9 @@ client_receive_mst_cb (void *cls,
   char *stat_txt;
 
   plugin = s->plugin;
+  GNUNET_break (s->ats_address_network_type != GNUNET_ATS_NET_UNSPECIFIED);
   atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  atsi.value = s->ats_address_network_type;
-  GNUNET_break (s->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED));
+  atsi.value = htonl (s->ats_address_network_type);
 
   delay = s->plugin->env->receive (plugin->env->cls,
                                    s->address,
@@ -815,7 +815,7 @@ static enum GNUNET_ATS_Network_Type
 http_client_plugin_get_network (void *cls,
                                 struct Session *session)
 {
-  return ntohl (session->ats_address_network_type);
+  return session->ats_address_network_type;
 }
 
 
@@ -873,7 +873,7 @@ http_client_plugin_get_session (void *cls,
   struct HTTP_Client_Plugin *plugin = cls;
   struct Session *s;
   struct sockaddr *sa;
-  struct GNUNET_ATS_Information ats;
+  enum GNUNET_ATS_Network_Type net_type;
   size_t salen = 0;
   int res;
 
@@ -895,8 +895,7 @@ http_client_plugin_get_session (void *cls,
   }
 
   /* Determine network location */
-  ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED);
+  net_type = GNUNET_ATS_NET_UNSPECIFIED;
   sa = http_common_socket_from_address (address->address, address->address_length, &res);
   if (GNUNET_SYSERR == res)
     return NULL;
@@ -911,15 +910,15 @@ http_client_plugin_get_session (void *cls,
     {
       salen = sizeof (struct sockaddr_in6);
     }
-    ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
+    net_type = plugin->env->get_address_type (plugin->env->cls, sa, salen);
     GNUNET_free (sa);
   }
   else if (GNUNET_NO == res)
   {
     /* Cannot convert to sockaddr -> is external hostname */
-    ats.value = htonl (GNUNET_ATS_NET_WAN);
+    net_type = GNUNET_ATS_NET_WAN;
   }
-  if (GNUNET_ATS_NET_UNSPECIFIED == ntohl (ats.value))
+  if (GNUNET_ATS_NET_UNSPECIFIED == net_type)
   {
     GNUNET_break (0);
     return NULL;
@@ -928,7 +927,7 @@ http_client_plugin_get_session (void *cls,
   s = GNUNET_new (struct Session);
   s->plugin = plugin;
   s->address = GNUNET_HELLO_address_copy (address);
-  s->ats_address_network_type = ats.value;
+  s->ats_address_network_type = net_type;
   s->put_tmp_disconnecting = GNUNET_NO;
   s->put_tmp_disconnected = GNUNET_NO;
   s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT);