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

[gnunet]

Author: wachs
Date: 2012-08-28 13:43:40 +0200 (Tue, 28 Aug 2012)
New Revision: 23472

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/plugin_transport_http_server.c
   gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_https_peer1.conf
   gnunet/src/transport/test_quota_compliance_https_peer2.conf
   gnunet/src/transport/test_transport_api_https_peer1.conf
   gnunet/src/transport/test_transport_api_https_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
   gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
   gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
Log:
tests


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/Makefile.am    2012-08-28 11:43:40 UTC (rev 23472)
@@ -34,23 +34,13 @@
  
  
  HTTPS_API_TEST = test_transport_api_https
-endif
-endif 
-
-if FALSE
-
- HTTP_REL_TEST = test_transport_api_reliability_http
- HTTP_NAT_REL_TEST = test_transport_api_reliability_http_nat
-
- HTTPS_NAT_API_TEST = test_transport_api_https_nat
  HTTPS_API_TIMEOUT_TEST = test_transport_api_timeout_https
  HTTPS_REL_TEST = test_transport_api_reliability_https
- HTTPS_NAT_REL_TEST = test_transport_api_reliability_https_nat
  HTTPS_QUOTA_TEST = test_quota_compliance_https \
-               test_quota_compliance_https_asymmetric
+               test_quota_compliance_https_asymmetric 
 endif
+endif 
 
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
 endif
@@ -705,7 +695,22 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
 
+test_quota_compliance_https_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_https_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_quota_compliance_https_asymmetric_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_https_asymmetric_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
+
 # HTTPS tests
 test_transport_api_https_SOURCES = \
  test_transport_api.c
@@ -714,41 +719,16 @@
  $(top_builddir)/src/hello/libgnunethello.la \
  $(top_builddir)/src/util/libgnunetutil.la  \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
-
-if FALSE
-
+ 
 test_transport_api_timeout_https_SOURCES = \
  test_transport_api_timeout.c
 test_transport_api_timeout_https_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 
+ $(top_builddir)/src/transport/libgnunettransporttesting.la  
+ 
 
-test_transport_api_http_nat_SOURCES = \
- test_transport_api.c
-test_transport_api_http_nat_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_reliability_http_nat_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_http_nat_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_https_nat_SOURCES = \
- test_transport_api.c
-test_transport_api_https_nat_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_reliability_https_SOURCES = \
  test_transport_api_reliability.c
 test_transport_api_reliability_https_LDADD = \
@@ -757,42 +737,6 @@
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la 
 
-test_transport_api_reliability_https_nat_SOURCES = \
- test_transport_api_reliability.c
-test_transport_api_reliability_https_nat_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_quota_compliance_http_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_http_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_quota_compliance_https_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_https_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_quota_compliance_https_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_https_asymmetric_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
-
-
-endif
-
 test_transport_api_unreliability_unix_SOURCES = \
  test_transport_api_unreliability.c
 test_transport_api_unreliability_unix_LDADD = \

Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-08-28 10:54:00 UTC 
(rev 23471)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-08-28 11:43:40 UTC 
(rev 23472)
@@ -33,7 +33,7 @@
 #endif
 
 
-#define VERBOSE_CURL GNUNET_YES
+#define VERBOSE_CURL GNUNET_NO
 
 #include "platform.h"
 #include "gnunet_protocols.h"

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2012-08-28 10:54:00 UTC 
(rev 23471)
+++ gnunet/src/transport/plugin_transport_http_server.c 2012-08-28 11:43:40 UTC 
(rev 23472)
@@ -1857,8 +1857,11 @@
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                    "Notifying transport to add address `%s'\n",
                    http_common_plugin_address_to_string(NULL, w->addr, 
w->addrlen));
-
+#if BUILD_HTTPS
+  plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, 
w->addrlen, "https_client");
+#else
   plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, 
w->addrlen, "http_client");
+#endif
 }
 
 
@@ -1889,7 +1892,11 @@
                    "Notifying transport to remove address `%s'\n",
                    http_common_plugin_address_to_string (NULL, w->addr, 
w->addrlen));
   GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w);
+#if BUILD_HTTPS
+  plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, 
w->addrlen, "https_client");
+#else
   plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, 
w->addrlen, "http_client");
+#endif
   GNUNET_free (w->addr);
   GNUNET_free (w);
 }
@@ -2253,9 +2260,16 @@
   plugin->ext_addr_len = strlen (plugin->ext_addr) + 1;
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                    "Notifying transport about external hostname address 
`%s'\n", plugin->ext_addr);
+
+#if BUILD_HTTPS
   plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
                                plugin->ext_addr, plugin->ext_addr_len,
+                               "https_client");
+#else
+  plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
+                               plugin->ext_addr, plugin->ext_addr_len,
                                "http_client");
+#endif
 }
 
 
@@ -2494,11 +2508,20 @@
                        http_common_plugin_address_to_string (NULL,
                            plugin->ext_addr,
                            plugin->ext_addr_len));
+#if BUILD_HTTPS
       plugin->env->notify_address (plugin->env->cls,
                                    GNUNET_NO,
                                    plugin->ext_addr,
                                    plugin->ext_addr_len,
-                                   "http_client");
+                                   "https_client");
+#else
+  plugin->env->notify_address (plugin->env->cls,
+                               GNUNET_NO,
+                               plugin->ext_addr,
+                               plugin->ext_addr_len,
+                               "http_client");
+#endif
+
   }
 
   /* Stop to report addresses to transport service */

Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf      
2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf      
2012-08-28 11:43:40 UTC (rev 23472)
@@ -1,12 +1,9 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
+DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf
 
-[transport-https]
-PORT = 4001
-KEY_FILE = https_key_quota_p1.key
-CERT_FILE = https_cert_quota_p1.crt
+[transport-https_client]
 
 [arm]
 PORT = 4006
@@ -26,7 +23,7 @@
 
 [transport]
 PORT = 4002
-PLUGINS = https
+PLUGINS = https_client
 UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf      
2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf      
2012-08-28 11:43:40 UTC (rev 23472)
@@ -1,9 +1,9 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
+DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf
 
-[transport-https]
+[transport-https_server]
 PORT = 3001
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
@@ -26,7 +26,7 @@
 
 [transport]
 PORT = 3002
-PLUGINS = https
+PLUGINS = https_server
 UNIXPATH = /tmp/https_transport_peer2.sock
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer1.conf 2012-08-28 
10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_quota_compliance_https_peer1.conf 2012-08-28 
11:43:40 UTC (rev 23472)
@@ -3,10 +3,7 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
 
-[transport-https]
-PORT = 4001
-KEY_FILE = https_key_quota_p1.key
-CERT_FILE = https_cert_quota_p1.crt
+[transport-https_client]
 
 [arm]
 PORT = 4006
@@ -26,7 +23,7 @@
 
 [transport]
 PORT = 4002
-PLUGINS = https
+PLUGINS = https_client
 UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer2.conf 2012-08-28 
10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_quota_compliance_https_peer2.conf 2012-08-28 
11:43:40 UTC (rev 23472)
@@ -3,7 +3,7 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 
-[transport-https]
+[transport-https_server]
 PORT = 3001
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
@@ -26,7 +26,7 @@
 
 [transport]
 PORT = 3002
-PLUGINS = https
+PLUGINS = https_server
 UNIXPATH = /tmp/https_transport_peer2.sock
 
 

Modified: gnunet/src/transport/test_transport_api_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer1.conf    2012-08-28 
10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_transport_api_https_peer1.conf    2012-08-28 
11:43:40 UTC (rev 23472)
@@ -3,7 +3,7 @@
 SERVICEHOME = /tmp/test-transport/api-https-p1/
 DEFAULTCONFIG = test_transport_api_https_peer1.conf
 
-[transport-https]
+[transport-https_client]
 PORT = 12100
 KEY_FILE = $SERVICEHOME/https_key_p1.key
 CERT_FILE = $SERVICEHOME/https_cert_p1.crt
@@ -25,7 +25,7 @@
 
 [transport]
 PORT = 12101
-PLUGINS = https
+PLUGINS = https_client
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 DEBUG = NO
 

Modified: gnunet/src/transport/test_transport_api_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer2.conf    2012-08-28 
10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_transport_api_https_peer2.conf    2012-08-28 
11:43:40 UTC (rev 23472)
@@ -3,7 +3,7 @@
 SERVICEHOME = /tmp/test-transport/api-https-p2/
 DEFAULTCONFIG = test_transport_api_https_peer2.conf
 
-[transport-https]
+[transport-https_server]
 PORT = 12110
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
@@ -26,7 +26,7 @@
 
 [transport]
 PORT = 12111
-PLUGINS = https
+PLUGINS = https_server
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 DEBUG = NO
 

Modified: gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer1.conf        
2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer1.conf        
2012-08-28 11:43:40 UTC (rev 23472)
@@ -3,10 +3,7 @@
 SERVICEHOME = /tmp/test-transport/api-https-p1/
 DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
 
-[transport-https]
-PORT = 12300
-KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = $SERVICEHOME/https_cert_p1.crt
+[transport-https_client]
 
 [arm]
 PORT = 12305
@@ -26,6 +23,6 @@
 
 [transport]
 PORT = 12301
-PLUGINS = https
+PLUGINS = https_client
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 

Modified: gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer2.conf        
2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer2.conf        
2012-08-28 11:43:40 UTC (rev 23472)
@@ -3,7 +3,7 @@
 SERVICEHOME = /tmp/test-transport/api-https-p2/
 DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
 
-[transport-https]
+[transport-https_server]
 PORT = 12310
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
@@ -26,7 +26,7 @@
 
 [transport]
 PORT = 12311
-PLUGINS = https
+PLUGINS = https_server
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer1.conf    
2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer1.conf    
2012-08-28 11:43:40 UTC (rev 23472)
@@ -1,12 +1,9 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
 SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_https_peer1.conf
+DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf
 
-[transport-https]
-PORT = 12100
-KEY_FILE = $SERVICEHOME/https_key_p1.key
-CERT_FILE = $SERVICEHOME/https_cert_p1.crt
+[transport-https_client]
 
 [arm]
 PORT = 12105
@@ -25,7 +22,7 @@
 
 [transport]
 PORT = 12101
-PLUGINS = https
+PLUGINS = https_client
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 DEBUG = NO
 

Modified: gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer2.conf    
2012-08-28 10:54:00 UTC (rev 23471)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer2.conf    
2012-08-28 11:43:40 UTC (rev 23472)
@@ -1,9 +1,9 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
 SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_https_peer2.conf
+DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf
 
-[transport-https]
+[transport-https_server]
 PORT = 12110
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
@@ -26,7 +26,7 @@
 
 [transport]
 PORT = 12111
-PLUGINS = https
+PLUGINS = https_server
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 DEBUG = NO