[GNUnet-SVN] r23479 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-08-28 17:11:31 +0200 (Tue, 28 Aug 2012)
New Revision: 23479

Added:
   gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
Removed:
   gnunet/src/transport/test_transport_api_http_nat_peer1.conf
   gnunet/src/transport/test_transport_api_http_nat_peer2.conf
   gnunet/src/transport/test_transport_api_http_reverse_proxy.conf
   gnunet/src/transport/test_transport_api_https_nat_peer1.conf
   gnunet/src/transport/test_transport_api_https_nat_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf
Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/plugin_transport_http_common.c
   gnunet/src/transport/plugin_transport_http_common.h
   gnunet/src/transport/plugin_transport_http_server.c
   gnunet/src/transport/test_transport_api_http_peer1.conf
Log:
confs + coverity


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/Makefile.am    2012-08-28 15:11:31 UTC (rev 23479)
@@ -41,6 +41,10 @@
 endif
 endif 
 
+#if FALSE
+
+#endif
+
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -323,10 +327,9 @@
  $(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 @@
  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 @@
  $(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 @@
  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 @@
  $(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_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\

Modified: gnunet/src/transport/plugin_transport_http_common.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.c 2012-08-28 14:51:56 UTC 
(rev 23478)
+++ gnunet/src/transport/plugin_transport_http_common.c 2012-08-28 15:11:31 UTC 
(rev 23479)
@@ -146,7 +146,6 @@
 /**
  * Create a socketaddr from a HTTP address
  *
- * @param protocol protocol
  * @param addr sockaddr * address
  * @param addrlen length of the address
  * @param res the result:

Modified: gnunet/src/transport/plugin_transport_http_common.h
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.h 2012-08-28 14:51:56 UTC 
(rev 23478)
+++ gnunet/src/transport/plugin_transport_http_common.h 2012-08-28 15:11:31 UTC 
(rev 23479)
@@ -124,7 +124,6 @@
 /**
  * Create a socketaddr from a HTTP address
  *
- * @param protocol protocol
  * @param addr sockaddr * address
  * @param addrlen length of the address
  * @param res the result:

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2012-08-28 14:51:56 UTC 
(rev 23478)
+++ gnunet/src/transport/plugin_transport_http_server.c 2012-08-28 15:11:31 UTC 
(rev 23479)
@@ -664,6 +664,7 @@
  * 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

Deleted: gnunet/src/transport/test_transport_api_http_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_nat_peer1.conf 2012-08-28 
14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_http_nat_peer1.conf 2012-08-28 
15:11:31 UTC (rev 23479)
@@ -1,38 +0,0 @@
address@hidden@ template_cfg_peer1.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_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
-

Deleted: gnunet/src/transport/test_transport_api_http_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_nat_peer2.conf 2012-08-28 
14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_http_nat_peer2.conf 2012-08-28 
15:11:31 UTC (rev 23479)
@@ -1,31 +0,0 @@
address@hidden@ 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

Modified: gnunet/src/transport/test_transport_api_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer1.conf     2012-08-28 
14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_http_peer1.conf     2012-08-28 
15:11:31 UTC (rev 23479)
@@ -28,6 +28,6 @@
 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
 

Copied: gnunet/src/transport/test_transport_api_http_reverse_peer1.conf (from 
rev 23466, gnunet/src/transport/test_transport_api_http_reverse_proxy.conf)
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer1.conf             
                (rev 0)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer1.conf     
2012-08-28 15:11:31 UTC (rev 23479)
@@ -0,0 +1,34 @@
+INLINE@ template_cfg_peer1.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-http-p1/
+DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf
+
+
+[transport-http_client]
+
+[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_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
+

Deleted: gnunet/src/transport/test_transport_api_http_reverse_proxy.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_proxy.conf     
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_http_reverse_proxy.conf     
2012-08-28 15:11:31 UTC (rev 23479)
@@ -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
-

Deleted: gnunet/src/transport/test_transport_api_https_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_nat_peer1.conf        
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_https_nat_peer1.conf        
2012-08-28 15:11:31 UTC (rev 23479)
@@ -1,36 +0,0 @@
address@hidden@ 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
-
-

Deleted: gnunet/src/transport/test_transport_api_https_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_nat_peer2.conf        
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_https_nat_peer2.conf        
2012-08-28 15:11:31 UTC (rev 23479)
@@ -1,33 +0,0 @@
address@hidden@ 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
-
-

Deleted: gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf     
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf     
2012-08-28 15:11:31 UTC (rev 23479)
@@ -1,38 +0,0 @@
address@hidden@ 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
-

Deleted: gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf     
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf     
2012-08-28 15:11:31 UTC (rev 23479)
@@ -1,31 +0,0 @@
address@hidden@ 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

Deleted: 
gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf    
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf    
2012-08-28 15:11:31 UTC (rev 23479)
@@ -1,36 +0,0 @@
address@hidden@ 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
-
-

Deleted: 
gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf    
2012-08-28 14:51:56 UTC (rev 23478)
+++ gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf    
2012-08-28 15:11:31 UTC (rev 23479)
@@ -1,33 +0,0 @@
address@hidden@ 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
-
-