confs + coverity

14 files changed, 21 insertions, 313 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 21a1aa165..008f827fe 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -41,6 +41,10 @@ if HAVE_LIBCURL
 endif
 endif 
 
+#if FALSE
+
+#endif
+
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -323,10 +327,9 @@ check_PROGRAMS = \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
- $(HTTP_NAT_API_TEST) \
+ $(HTTP_REVERSE_API_TEST) \
  $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
- $(HTTPS_NAT_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
  $(WLAN_API_TEST) \
  test_transport_api_multi \
@@ -336,9 +339,7 @@ check_PROGRAMS = \
  test_transport_api_unreliability_constant_udp \
  $(UNIX_REL_TEST) \
  $(HTTP_REL_TEST) \
- $(HTTP_NAT_REL_TEST) \
  $(HTTPS_REL_TEST) \
- $(HTTPS_NAT_REL_TEST) \
  $(WLAN_REL_TEST) \
  $(WLAN_UREL_TEST) \
  test_quota_compliance_tcp \
@@ -374,10 +375,9 @@ TESTS = \
  $(UNIX_PLUGIN_TIMEOUT_TEST) \
  test_transport_api_udp_nat \
  $(HTTP_API_TEST) \
- $(HTTP_NAT_API_TEST) \
+ $(HTTP_REVERSE_API_TEST) \
  $(HTTP_API_TIMEOUT_TEST) \
  $(HTTPS_API_TEST) \
- $(HTTPS_NAT_API_TEST) \
  $(HTTPS_API_TIMEOUT_TEST) \
  $(WLAN_API_TEST) \
  test_transport_api_multi \
@@ -387,9 +387,7 @@ TESTS = \
  test_transport_api_unreliability_constant_udp \
  $(UNIX_REL_TEST) \
  $(HTTP_REL_TEST) \
- $(HTTP_NAT_REL_TEST) \
  $(HTTPS_REL_TEST) \
- $(HTTPS_NAT_REL_TEST) \
  $(WLAN_REL_TEST) \
  $(WLAN_UREL_TEST) \
  test_quota_compliance_tcp \
@@ -663,6 +661,14 @@ test_transport_api_http_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
  
+test_transport_api_http_reverse_SOURCES = \
+ test_transport_api.c
+test_transport_api_http_reverse_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/transport/libgnunettransporttesting.la
+ 
 test_transport_api_timeout_http_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_http_LDADD = \
@@ -910,14 +916,6 @@ test_transport_defaults.conf\
 test_transport_startonly.conf\
 test_transport_api_disconnect_tcp_peer1.conf\
 test_transport_api_disconnect_tcp_peer2.conf\
-test_transport_api_http_nat_peer1.conf\
-test_transport_api_http_nat_peer2.conf\
-test_transport_api_https_nat_peer1.conf\
-test_transport_api_https_nat_peer2.conf\
-test_transport_api_reliability_http_nat_peer1.conf\
-test_transport_api_reliability_http_nat_peer2.conf\
-test_transport_api_reliability_https_nat_peer1.conf\
-test_transport_api_reliability_https_nat_peer2.conf\
 test_transport_api_timeout_http_peer1.conf\
 test_transport_api_timeout_http_peer2.conf\
 test_transport_api_timeout_https_peer1.conf\
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index e71b16e93..a34f4c342 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -146,7 +146,6 @@ http_common_address_from_socket (const char *protocol, const struct sockaddr *ad
 /**
  * Create a socketaddr from a HTTP address
  *
- * @param protocol protocol
  * @param addr sockaddr * address
  * @param addrlen length of the address
  * @param res the result:
diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h
index 65516e595..85793ce7f 100644
--- a/src/transport/plugin_transport_http_common.h
+++ b/src/transport/plugin_transport_http_common.h
@@ -124,7 +124,6 @@ http_common_address_from_socket (const char *protocol,
 /**
  * Create a socketaddr from a HTTP address
  *
- * @param protocol protocol
  * @param addr sockaddr * address
  * @param addrlen length of the address
  * @param res the result:
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index a554fb988..6ec0c77a0 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -664,6 +664,7 @@ server_stop_session_timeout (struct Session *s)
  * starts the task waiting for them.
  * @param plugin plugin
  * @param daemon_handle the MHD daemon handle
+ * @param now schedule immediately
  * @return gnunet task identifier
  */
 static GNUNET_SCHEDULER_TaskIdentifier
diff --git a/src/transport/test_transport_api_http_nat_peer2.conf b/src/transport/test_transport_api_http_nat_peer2.conf
deleted file mode 100644
index 2f56eabda..000000000
--- a/src/transport/test_transport_api_http_nat_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_http_nat_peer2.conf
-
-[transport-http]
-PORT = 12090
-
-[arm]
-PORT = 12095
-DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12094
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12093
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12092
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[transport]
-#DEBUG = YES
-PORT = 12091
-PLUGINS = http
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 4af712a43..1d8f88438 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -28,6 +28,6 @@ PORT = 12081
 PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
diff --git a/src/transport/test_transport_api_http_nat_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index 447508c36..2bee439bb 100644
--- a/src/transport/test_transport_api_http_nat_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -1,14 +1,10 @@
-@INLINE@ template_cfg_peer1.conf
+INLINE@ template_cfg_peer1.conf
 [PATHS]
 SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_nat_peer1.conf
+DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf
 
-[nat]
-BEHIND_NAT = YES
-ENABLE_NAT_SERVER = YES
 
-[transport-http]
-PORT = 0
+[transport-http_client]
 
 [arm]
 PORT = 12085
@@ -30,9 +26,9 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 [transport]
 #DEBUG = YES
 PORT = 12081
-PLUGINS = http
+PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
diff --git a/src/transport/test_transport_api_http_reverse_proxy.conf b/src/transport/test_transport_api_http_reverse_proxy.conf
deleted file mode 100644
index c8162df0d..000000000
--- a/src/transport/test_transport_api_http_reverse_proxy.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-INLINE@ template_cfg_peer1.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_reverse_proxy.conf
-
-
-[transport-http_client]
-
-[transport-http_server]
-PORT = 12080
-EXTERNAL_HOSTNAME = fulcrum.net.in.tum.de:12080/peer
-#USE_IPV4 = YES
-#USE_IPV6 = YES
-#BINDTO = 127.0.0.1
-#BINDTO6 =  ::1
-
-[transport-https_server]
-PORT = 12090
-
-[arm]
-PORT = 12085
-DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12084
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12083
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12082
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[transport]
-#DEBUG = YES
-PORT = 12081
-#PLUGINS = http_server
-PLUGINS = http_client http_server
-# http_client
-#BINARY = .libs/gnunet-service-transport
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-PREFIX = valgrind --leak-check=full
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
diff --git a/src/transport/test_transport_api_https_nat_peer1.conf b/src/transport/test_transport_api_https_nat_peer1.conf
deleted file mode 100644
index e97b47317..000000000
--- a/src/transport/test_transport_api_https_nat_peer1.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_https_nat_peer1.conf
-
-[nat]
-BEHIND_NAT = YES
-ENABLE_NAT_SERVER = YES
-
-[transport-https]
-PORT = 0
-KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-
-[arm]
-PORT = 12105
-
-[statistics]
-PORT = 12104
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12103
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12102
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12101
-PLUGINS = https
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-DEBUG = NO
-
-
diff --git a/src/transport/test_transport_api_https_nat_peer2.conf b/src/transport/test_transport_api_https_nat_peer2.conf
deleted file mode 100644
index a23f3a5b4..000000000
--- a/src/transport/test_transport_api_https_nat_peer2.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_https_nat_peer2.conf
-
-[transport-https]
-PORT = 12110
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-
-[arm]
-PORT = 12115
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12114
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12113
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12112
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12111
-PLUGINS = https
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-DEBUG = NO
-
-
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer1.conf b/src/transport/test_transport_api_reliability_http_nat_peer1.conf
deleted file mode 100644
index cd841a3ca..000000000
--- a/src/transport/test_transport_api_reliability_http_nat_peer1.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf
-
-[nat]
-BEHIND_NAT = YES
-ENABLE_NAT_SERVER = YES
-
-[transport-http]
-PORT = 0
-
-[arm]
-PORT = 12085
-DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[statistics]
-PORT = 12084
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12083
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12082
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[transport]
-#DEBUG = YES
-PORT = 12081
-PLUGINS = http
-#BINARY = .libs/gnunet-service-transport
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-#PREFIX = valgrind --leak-check=full
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer2.conf b/src/transport/test_transport_api_reliability_http_nat_peer2.conf
deleted file mode 100644
index 4a5cbbad0..000000000
--- a/src/transport/test_transport_api_reliability_http_nat_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf
-
-[transport-http]
-PORT = 12090
-
-[arm]
-PORT = 12095
-DEFAULTSERVICES = transport
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12094
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12093
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12092
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[transport]
-#DEBUG = YES
-PORT = 12091
-PLUGINS = http
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-#PREFIX = valgrind --leak-check=full
diff --git a/src/transport/test_transport_api_reliability_https_nat_peer1.conf b/src/transport/test_transport_api_reliability_https_nat_peer1.conf
deleted file mode 100644
index ca14c720a..000000000
--- a/src/transport/test_transport_api_reliability_https_nat_peer1.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-@INLINE@ template_cfg_peer1.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf
-
-[nat]
-BEHIND_NAT = YES
-ENABLE_NAT_SERVER = YES
-
-[transport-https]
-PORT = 0
-KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-
-[arm]
-PORT = 12105
-
-[statistics]
-PORT = 12104
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[resolver]
-PORT = 12103
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[peerinfo]
-PORT = 12102
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[transport]
-PORT = 12101
-PLUGINS = https
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-DEBUG = NO
-
-
diff --git a/src/transport/test_transport_api_reliability_https_nat_peer2.conf b/src/transport/test_transport_api_reliability_https_nat_peer2.conf
deleted file mode 100644
index b7c2e9769..000000000
--- a/src/transport/test_transport_api_reliability_https_nat_peer2.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf
-
-[transport-https]
-PORT = 12110
-KEY_FILE = $SERVICEHOME/https_key_p2.key
-CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-
-[arm]
-PORT = 12115
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[statistics]
-PORT = 12114
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[resolver]
-PORT = 12113
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[peerinfo]
-PORT = 12112
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[transport]
-PORT = 12111
-PLUGINS = https
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-DEBUG = NO
-
-