Merge branch 'master' of ssh://git.gnunet.org/gnunet

7 files changed, 48 insertions, 83 deletions

diff --git a/src/transport/.gitignore b/src/transport/.gitignore
index d88d40ef7..5a82a787b 100644
--- a/src/transport/.gitignore
+++ b/src/transport/.gitignore
@@ -89,3 +89,5 @@ gnunet-communicator-tcp
 gnunet-communicator-udp
 test_communicator_unix
 test_communicator_basic_unix
+test_transport_start_with_config
+test_transport_api2_tcp
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 773fa2877..363f8b199 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -16,63 +16,28 @@ HTTPS_SERVER_PLUGIN_LA = libgnunet_plugin_transport_https_server.la
 HTTP_SERVER_PLUGIN_TEST = test_plugin_http_server
 HTTPS_SERVER_PLUGIN_TEST = test_plugin_https_server
 
-if HAVE_LIBGNURL
- HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
- HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
- HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
- HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
-LIB_GNURL=@LIBGNURL@
-CPP_GNURL=@LIBGNURL_CPPFLAGS@
-else
-if HAVE_LIBCURL
- HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
- HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
- HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
- HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
-LIB_GNURL=@LIBCURL@
-CPP_GNURL=@LIBCURL_CPPFLAGS@
-endif
-endif
-
-if HAVE_LIBGNURL
- HTTP_API_TEST = test_transport_api_http
- HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
- HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
- HTTP_REL_TEST = test_transport_api_reliability_http \
+HTTP_CLIENT_PLUGIN_TEST = test_plugin_http_client
+HTTPS_CLIENT_PLUGIN_TEST = test_plugin_https_client
+HTTP_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_http_client.la
+HTTPS_CLIENT_PLUGIN_LA = libgnunet_plugin_transport_https_client.la
+
+HTTP_API_TEST = test_transport_api_http
+HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
+HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
+HTTP_REL_TEST = test_transport_api_reliability_http \
                  test_transport_api_reliability_http_xhr
- HTTP_QUOTA_TEST = test_quota_compliance_http \
+HTTP_QUOTA_TEST = test_quota_compliance_http \
                    test_quota_compliance_http_asymmetric
- HTTP_SWITCH = test_transport_address_switch_http
- HTTPS_API_TEST = test_transport_api_https
- HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
+HTTP_SWITCH = test_transport_address_switch_http
+HTTPS_API_TEST = test_transport_api_https
+HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
 if HAVE_EXPERIMENTAL
  HTTPS_REL_TEST = test_transport_api_reliability_https \
                   test_transport_api_reliability_https_xhr
 endif
- HTTPS_QUOTA_TEST = test_quota_compliance_https \
+HTTPS_QUOTA_TEST = test_quota_compliance_https \
                 test_quota_compliance_https_asymmetric
- HTTPS_SWITCH = test_transport_address_switch_https
-else
-if HAVE_LIBCURL
- HTTP_API_TEST = test_transport_api_http
- HTTP_REVERSE_API_TEST = test_transport_api_http_reverse
- HTTP_API_TIMEOUT_TEST = test_transport_api_timeout_http
- HTTP_REL_TEST = test_transport_api_reliability_http \
-                 test_transport_api_reliability_http_xhr
- HTTP_QUOTA_TEST = test_quota_compliance_http \
-                   test_quota_compliance_http_asymmetric
- HTTP_SWITCH = test_transport_address_switch_http
- HTTPS_API_TEST = test_transport_api_https
- HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
-if HAVE_EXPERIMENTAL
- HTTPS_REL_TEST = test_transport_api_reliability_https \
-                  test_transport_api_reliability_https_xhr
-endif
- HTTPS_QUOTA_TEST = test_quota_compliance_https \
-                test_quota_compliance_https_asymmetric
- HTTPS_SWITCH = test_transport_address_switch_https
-endif
-endif
+HTTPS_SWITCH = test_transport_address_switch_https
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -268,8 +233,9 @@ do_subst = sed -e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
 
 
 gnunet-transport-certificate-creation: gnunet-transport-certificate-creation.in Makefile
-        $(do_subst) < $(srcdir)/gnunet-transport-certificate-creation.in > gnunet-transport-certificate-creation
-        chmod +x gnunet-transport-certificate-creation
+        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-transport-certificate-creation.in > gnunet-transport-certificate-creation
+        @chmod +x gnunet-transport-certificate-creation
+
 
 
 
@@ -554,13 +520,13 @@ libgnunet_plugin_transport_http_client_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(LIB_GNURL) \
+  @LIBCURL@ \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_http_client_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_transport_http_client_la_CFLAGS = \
- $(CPP_GNURL) $(AM_CFLAGS)
+ @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
 
 libgnunet_plugin_transport_http_server_la_SOURCES = \
@@ -584,13 +550,13 @@ libgnunet_plugin_transport_https_client_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
-  $(LIB_GNURL) \
+  @LIBCURL@ \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_transport_https_client_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_transport_https_client_la_CFLAGS = \
- $(CPP_GNURL) $(AM_CFLAGS) -DBUILD_HTTPS
+ @LIBCURL_CPPFLAGS@ $(AM_CFLAGS) -DBUILD_HTTPS
 
 
 libgnunet_plugin_transport_https_server_la_SOURCES = \
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 1161ac73a..2a5290bf9 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -2457,7 +2457,7 @@ boot_queue (struct Queue *queue)
  * Generate and transmit our ephemeral key and the signature for
  * the initial KX with the other peer.  Must be called first, before
  * any other bytes are ever written to the output buffer.  Note that
- * our cipher must already be initialized when calling thi function.
+ * our cipher must already be initialized when calling this function.
  * Helper function for #start_initial_kx_out().
  *
  * @param queue queue to do KX for
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index 783047a5b..ae4d65bcf 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -87,7 +87,7 @@
 #define RING_BUFFER_SIZE 16
 
 /**
- * Maximum number of FC retransmissions for a runing retransmission task.
+ * Maximum number of FC retransmissions for a running retransmission task.
  */
 #define MAX_FC_RETRANSMIT_COUNT 1000
 
@@ -1961,9 +1961,6 @@ struct Queue
 };
 
 
-
-
-
 /**
  * A neighbour that at least one communicator is connected to.
  */
@@ -10122,7 +10119,7 @@ handle_send_message_ack (void *cls,
                   (unsigned long long) queue->qid,
                   (unsigned long long) sma->mid);
       qe = qep;
-      if ((NULL != qe->pm)&&(qe->pm->qe != qe))
+      if ((NULL != qe->pm) && (qe->pm->qe != qe))
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "For pending message %llu we had retransmissions.\n",
                     qe->pm->logging_uuid);
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index fad2ca4a1..345a0d949 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -480,7 +480,7 @@ client_connect_cb (void *cls,
 /**
  * Perform next action in the blacklist check.
  *
- * @param cls the `struct BlacklistCheck*`
+ * @param cls the `struct GST_BlacklistCheck *`
  */
 static void
 do_blacklist_check (void *cls);
@@ -2189,11 +2189,6 @@ shutdown_task (void *cls)
 }
 
 
-/**
- * Perform next action in the blacklist check.
- *
- * @param cls the `struct GST_BlacklistCheck *`
- */
 static void
 do_blacklist_check (void *cls)
 {
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/transport/gnunet-transport-certificate-creation.in
index 8348dd1b7..771422a7a 100644
--- a/src/transport/gnunet-transport-certificate-creation.in
+++ b/src/transport/gnunet-transport-certificate-creation.in
@@ -42,6 +42,10 @@
 
 progname=${0##*/}
 
+existence() {
+  command -v "$1" >/dev/null 2>&1
+}
+
 setdefaults()
 {
     verbosity=0
@@ -105,16 +109,23 @@ generate_cert_key()
     CERTTOOL=""
     GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template
     OPENSSL=0
-    if test -z "`gnutls-certtool --version`" > /dev/null
+    if test -x $(existence gnutls-certtool)
+    #if test -z "`gnutls-certtool --version`" > /dev/null
     then
-      if test -z "`openssl version`" > /dev/null
+      if test -z "`certtool --version | grep gnutls`" > /dev/null
       then
-        warningmsg "Install either gnutls certtool or openssl for certificate generation!"
-        exit 1
-      else
-        OPENSSL=1
+        warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl."
+        # if test -z "`openssl version`" > /dev/null
+        if test -x $(existence openssl)
+        then
+          OPENSSL=1
+        else
+          warningmsg "Install either gnutls certtool or openssl for certificate generation!"
+          statusmsg  "Cleaning up."
+          exit 1
+        fi
       fi
-      CERTTOOL="openssl"
+      CERTTOOL="certtool"
     else
       CERTTOOL="gnutls-certtool"
     fi
@@ -122,8 +133,8 @@ generate_cert_key()
 
     if test 1 -eq $OPENSSL
     then
-      $CERTTOOL genrsa -out $KEYFILE 1024
-      $CERTTOOL req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE
+      openssl genrsa -out $KEYFILE 1024
+      openssl req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE
     else
       $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null
       $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 18bfcc054..476a3cd52 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -1692,12 +1692,6 @@ client_connect_get (struct GNUNET_ATS_Session *s)
 }
 
 
-/**
- * Connect a HTTP put request
- *
- * @param s the session to connect
- * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for ok
- */
 static int
 client_connect_put (struct GNUNET_ATS_Session *s)
 {