[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12354 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r12354 - gnunet/src/transport |
|
Date: |
Tue, 27 Jul 2010 11:05:36 +0200 |
Author: wachs
Date: 2010-07-27 11:05:36 +0200 (Tue, 27 Jul 2010)
New Revision: 12354
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_https.c
gnunet/src/transport/test_plugin_transport_data_http.conf
gnunet/src/transport/test_plugin_transport_https.c
gnunet/src/transport/test_transport_api.c
gnunet/src/transport/test_transport_api_data.conf
gnunet/src/transport/test_transport_api_rel_http_peer1.conf
gnunet/src/transport/test_transport_api_rel_http_peer2.conf
gnunet/src/transport/test_transport_api_reliability.c
Log:
initial checkin of https transport
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2010-07-27 05:04:59 UTC (rev 12353)
+++ gnunet/src/transport/Makefile.am 2010-07-27 09:05:36 UTC (rev 12354)
@@ -30,6 +30,7 @@
chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client ||
true
else
install-exec-hook:
+ gnunet-transport-plugin-certificate-creation
endif
@@ -52,8 +53,10 @@
bin_PROGRAMS = \
gnunet-transport \
gnunet-service-transport $(NATBIN)
+
+bin_SCRIPTS = \
+ gnunet-transport-certificate-creation
-
gnunet_nat_server_SOURCES = \
gnunet-nat-server.c
@@ -153,7 +156,7 @@
test_transport_api_tcp_nat \
test_transport_api_udp \
$(HTTP_PLUGIN_CHECK) \
- $(HTTPS_PLUGIN_CHECK) \
+ $(HTTPS_PLUGIN_CHECK) \
test_transport_api_udp_nat \
test_transport_api_reliability_tcp \
test_transport_api_reliability_tcp_nat \
@@ -166,7 +169,7 @@
test_transport_api_udp \
test_transport_api_udp_nat \
$(HTTP_PLUGIN_CHECK) \
- $(HTTPS_PLUGIN_CHECK) \
+ $(HTTPS_PLUGIN_CHECK) \
test_transport_api_reliability_tcp \
test_transport_api_reliability_tcp_nat
@@ -213,11 +216,6 @@
$(top_builddir)/src/util/libgnunetutil.la
if HAVE_MHD
-test_transport_api_http_SOURCES = \
- test_transport_api.c
-test_transport_api_http_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/util/libgnunetutil.la
test_plugin_transport_http_SOURCES = \
test_plugin_transport_http.c
@@ -227,6 +225,12 @@
@LIBCURL@ \
$(top_builddir)/src/util/libgnunetutil.la
+test_transport_api_http_SOURCES = \
+ test_transport_api.c
+test_transport_api_http_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_transport_api_reliability_http_SOURCES = \
test_transport_api_reliability.c
test_transport_api_reliability_http_LDADD = \
@@ -268,7 +272,9 @@
test_transport_api_http_peer1.conf \
test_transport_api_http_peer2.conf \
test_transport_api_https_peer1.conf \
- test_transport_api_https_peer2.conf \
+ test_transport_api_https_peer2.conf \
test_transport_api_rel_http_peer1.conf \
test_transport_api_rel_http_peer2.conf \
- test_plugin_transport_data_http.conf
+ test_transport_api_rel_https_peer1.conf \
+ test_transport_api_rel_https_peer2.conf \
+ test_plugin_transport_data_http.conf
\ No newline at end of file
Modified: gnunet/src/transport/plugin_transport_https.c
===================================================================
--- gnunet/src/transport/plugin_transport_https.c 2010-07-27 05:04:59 UTC
(rev 12353)
+++ gnunet/src/transport/plugin_transport_https.c 2010-07-27 09:05:36 UTC
(rev 12354)
@@ -37,12 +37,13 @@
#include "gnunet_container_lib.h"
#include "plugin_transport.h"
#include "gnunet_os_lib.h"
+#include "gnunet_disk_lib.h"
#include "microhttpd.h"
#include <curl/curl.h>
-#define DEBUG_HTTPS GNUNET_YES
-#define DEBUG_CURL GNUNET_YES
-#define DEBUG_CONNECTIONS GNUNET_YES
+#define DEBUG_HTTPS GNUNET_NO
+#define DEBUG_CURL GNUNET_NO
+#define DEBUG_CONNECTIONS GNUNET_NO
#define DEBUG_SESSION_SELECTION GNUNET_NO
#define INBOUND GNUNET_NO
@@ -72,54 +73,6 @@
*/
#define HTTP_CONNECT_TIMEOUT 30
-/* Test Certificate */
-const char cert_pem[] =
- "-----BEGIN CERTIFICATE-----\n"
- "MIICpjCCAZCgAwIBAgIESEPtjjALBgkqhkiG9w0BAQUwADAeFw0wODA2MDIxMjU0\n"
- "MzhaFw0wOTA2MDIxMjU0NDZaMAAwggEfMAsGCSqGSIb3DQEBAQOCAQ4AMIIBCQKC\n"
- "AQC03TyUvK5HmUAirRp067taIEO4bibh5nqolUoUdo/LeblMQV+qnrv/RNAMTx5X\n"
- "fNLZ45/kbM9geF8qY0vsPyQvP4jumzK0LOJYuIwmHaUm9vbXnYieILiwCuTgjaud\n"
- "3VkZDoQ9fteIo+6we9UTpVqZpxpbLulBMh/VsvX0cPJ1VFC7rT59o9hAUlFf9jX/\n"
- "GmKdYI79MtgVx0OPBjmmSD6kicBBfmfgkO7bIGwlRtsIyMznxbHu6VuoX/eVxrTv\n"
- "rmCwgEXLWRZ6ru8MQl5YfqeGXXRVwMeXU961KefbuvmEPccgCxm8FZ1C1cnDHFXh\n"
- "siSgAzMBjC/b6KVhNQ4KnUdZAgMBAAGjLzAtMAwGA1UdEwEB/wQCMAAwHQYDVR0O\n"
- "BBYEFJcUvpjvE5fF/yzUshkWDpdYiQh/MAsGCSqGSIb3DQEBBQOCAQEARP7eKSB2\n"
- "RNd6XjEjK0SrxtoTnxS3nw9sfcS7/qD1+XHdObtDFqGNSjGYFB3Gpx8fpQhCXdoN\n"
- "8QUs3/5ZVa5yjZMQewWBgz8kNbnbH40F2y81MHITxxCe1Y+qqHWwVaYLsiOTqj2/\n"
- "0S3QjEJ9tvklmg7JX09HC4m5QRYfWBeQLD1u8ZjA1Sf1xJriomFVyRLI2VPO2bNe\n"
- "JDMXWuP+8kMC7gEvUnJ7A92Y2yrhu3QI3bjPk8uSpHea19Q77tul1UVBJ5g+zpH3\n"
- "OsF5p0MyaVf09GTzcLds5nE/osTdXGUyHJapWReVmPm3Zn6gqYlnzD99z+DPIgIV\n"
- "RhZvQx74NQnS6g==\n" "-----END CERTIFICATE-----\n";
-
-const char key_pem[] =
- "-----BEGIN RSA PRIVATE KEY-----\n"
- "MIIEowIBAAKCAQEAtN08lLyuR5lAIq0adOu7WiBDuG4m4eZ6qJVKFHaPy3m5TEFf\n"
- "qp67/0TQDE8eV3zS2eOf5GzPYHhfKmNL7D8kLz+I7psytCziWLiMJh2lJvb2152I\n"
- "niC4sArk4I2rnd1ZGQ6EPX7XiKPusHvVE6VamacaWy7pQTIf1bL19HDydVRQu60+\n"
- "faPYQFJRX/Y1/xpinWCO/TLYFcdDjwY5pkg+pInAQX5n4JDu2yBsJUbbCMjM58Wx\n"
- "7ulbqF/3lca0765gsIBFy1kWeq7vDEJeWH6nhl10VcDHl1PetSnn27r5hD3HIAsZ\n"
- "vBWdQtXJwxxV4bIkoAMzAYwv2+ilYTUOCp1HWQIDAQABAoIBAArOQv3R7gmqDspj\n"
- "lDaTFOz0C4e70QfjGMX0sWnakYnDGn6DU19iv3GnX1S072ejtgc9kcJ4e8VUO79R\n"
- "EmqpdRR7k8dJr3RTUCyjzf/C+qiCzcmhCFYGN3KRHA6MeEnkvRuBogX4i5EG1k5l\n"
- "/5t+YBTZBnqXKWlzQLKoUAiMLPg0eRWh+6q7H4N7kdWWBmTpako7TEqpIwuEnPGx\n"
- "u3EPuTR+LN6lF55WBePbCHccUHUQaXuav18NuDkcJmCiMArK9SKb+h0RqLD6oMI/\n"
- "dKD6n8cZXeMBkK+C8U/K0sN2hFHACsu30b9XfdnljgP9v+BP8GhnB0nCB6tNBCPo\n"
- "32srOwECgYEAxWh3iBT4lWqL6bZavVbnhmvtif4nHv2t2/hOs/CAq8iLAw0oWGZc\n"
- "+JEZTUDMvFRlulr0kcaWra+4fN3OmJnjeuFXZq52lfMgXBIKBmoSaZpIh2aDY1Rd\n"
- "RbEse7nQl9hTEPmYspiXLGtnAXW7HuWqVfFFP3ya8rUS3t4d07Hig8ECgYEA6ou6\n"
- "OHiBRTbtDqLIv8NghARc/AqwNWgEc9PelCPe5bdCOLBEyFjqKiT2MttnSSUc2Zob\n"
- "XhYkHC6zN1Mlq30N0e3Q61YK9LxMdU1vsluXxNq2rfK1Scb1oOlOOtlbV3zA3VRF\n"
- "hV3t1nOA9tFmUrwZi0CUMWJE/zbPAyhwWotKyZkCgYEAh0kFicPdbABdrCglXVae\n"
- "SnfSjVwYkVuGd5Ze0WADvjYsVkYBHTvhgRNnRJMg+/vWz3Sf4Ps4rgUbqK8Vc20b\n"
- "AU5G6H6tlCvPRGm0ZxrwTWDHTcuKRVs+pJE8C/qWoklE/AAhjluWVoGwUMbPGuiH\n"
- "6Gf1bgHF6oj/Sq7rv/VLZ8ECgYBeq7ml05YyLuJutuwa4yzQ/MXfghzv4aVyb0F3\n"
- "QCdXR6o2IYgR6jnSewrZKlA9aPqFJrwHNR6sNXlnSmt5Fcf/RWO/qgJQGLUv3+rG\n"
- "7kuLTNDR05azSdiZc7J89ID3Bkb+z2YkV+6JUiPq/Ei1+nDBEXb/m+/HqALU/nyj\n"
- "P3gXeQKBgBusb8Rbd+KgxSA0hwY6aoRTPRt8LNvXdsB9vRcKKHUFQvxUWiUSS+L9\n"
- "/Qu1sJbrUquKOHqksV5wCnWnAKyJNJlhHuBToqQTgKXjuNmVdYSe631saiI7PHyC\n"
- "eRJ6DxULPxABytJrYCRrNqmXi5TCiqR2mtfalEMOPxz8rUU8dYyx\n"
- "-----END RSA PRIVATE KEY-----\n";
-
/**
* Network format for IPv4 addresses.
*/
@@ -408,6 +361,12 @@
char * bind_hostname;
int use_ipv6;
int use_ipv4;
+
+ /* The certificate MHD uses as an \0 terminated string */
+ char * cert;
+
+ /* The private key MHD uses as an \0 terminated string */
+ char * key;
};
@@ -1211,7 +1170,9 @@
if (tmp[len-2] == 13)
tmp[len-2]= '\0';
}
+#if DEBUG_CURL
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Header: %s\n",ps,tmp);
+#endif
}
if (NULL != tmp)
GNUNET_free (tmp);
@@ -1540,6 +1501,61 @@
* @param ses session to send data to
* @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
*/
+static void
+http_plugin_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *target)
+{
+
+
+ struct Plugin *plugin = cls;
+ struct HTTP_PeerContext *pc = NULL;
+ struct Session *ps = NULL;
+ //struct Session *tmp = NULL;
+
+ pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
+ if (pc==NULL)
+ return;
+ ps = pc->head;
+
+ while (ps!=NULL)
+ {
+ /* Telling transport that session is getting disconnected */
+ plugin->env->session_end(plugin, target, ps);
+ if (ps->direction==OUTBOUND)
+ {
+ if (ps->send_endpoint!=NULL)
+ {
+ //GNUNET_assert(CURLM_OK ==
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint));
+ //curl_easy_cleanup(ps->send_endpoint);
+ //ps->send_endpoint=NULL;
+ ps->send_force_disconnect = GNUNET_YES;
+ }
+ if (ps->recv_endpoint!=NULL)
+ {
+ //GNUNET_assert(CURLM_OK ==
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint));
+ //curl_easy_cleanup(ps->recv_endpoint);
+ //ps->recv_endpoint=NULL;
+ ps->recv_force_disconnect = GNUNET_YES;
+ }
+ }
+
+ if (ps->direction==INBOUND)
+ {
+ ps->recv_force_disconnect = GNUNET_YES;
+ ps->send_force_disconnect = GNUNET_YES;
+ }
+
+ while (ps->pending_msgs_head!=NULL)
+ {
+ remove_http_message(ps, ps->pending_msgs_head);
+ }
+ ps->recv_active = GNUNET_NO;
+ ps->send_active = GNUNET_NO;
+ ps=ps->next;
+ }
+}
+
+
static int curl_schedule(void *cls)
{
struct Plugin *plugin = cls;
@@ -1626,8 +1642,6 @@
int fresh = GNUNET_NO;
if (ps->recv_endpoint == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "created handle\n");
fresh = GNUNET_YES;
ps->recv_endpoint = curl_easy_init();
}
@@ -2058,61 +2072,6 @@
* @param cls closure
* @param target peer from which to disconnect
*/
-static void
-http_plugin_disconnect (void *cls,
- const struct GNUNET_PeerIdentity *target)
-{
-
-
- struct Plugin *plugin = cls;
- struct HTTP_PeerContext *pc = NULL;
- struct Session *ps = NULL;
- //struct Session *tmp = NULL;
-
- pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
- if (pc==NULL)
- return;
- ps = pc->head;
-
- while (ps!=NULL)
- {
- /* Telling transport that session is getting disconnected */
- plugin->env->session_end(plugin, target, ps);
- if (ps->direction==OUTBOUND)
- {
- if (ps->send_endpoint!=NULL)
- {
- //GNUNET_assert(CURLM_OK ==
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint));
- //curl_easy_cleanup(ps->send_endpoint);
- //ps->send_endpoint=NULL;
- ps->send_force_disconnect = GNUNET_YES;
- }
- if (ps->recv_endpoint!=NULL)
- {
- //GNUNET_assert(CURLM_OK ==
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint));
- //curl_easy_cleanup(ps->recv_endpoint);
- //ps->recv_endpoint=NULL;
- ps->recv_force_disconnect = GNUNET_YES;
- }
- }
-
- if (ps->direction==INBOUND)
- {
- ps->recv_force_disconnect = GNUNET_YES;
- ps->send_force_disconnect = GNUNET_YES;
- }
-
- while (ps->pending_msgs_head!=NULL)
- {
- remove_http_message(ps, ps->pending_msgs_head);
- }
- ps->recv_active = GNUNET_NO;
- ps->send_active = GNUNET_NO;
- ps=ps->next;
- }
-}
-
-
/**
* Convert the transports address to a nice, human-readable
* format.
@@ -2290,7 +2249,35 @@
return ret;
}
+static char *
+load_certificate( const char * file )
+{
+ struct GNUNET_DISK_FileHandle * gn_file;
+ struct stat fstat;
+ char * text = NULL;
+
+ if (0!=STAT(file, &fstat))
+ return NULL;
+ text = GNUNET_malloc (fstat.st_size);
+ gn_file = GNUNET_DISK_file_open(file,GNUNET_DISK_OPEN_READ,
GNUNET_DISK_PERM_USER_READ);
+ if (gn_file==NULL)
+ {
+ GNUNET_free(text);
+ return NULL;
+ }
+ if (GNUNET_SYSERR == GNUNET_DISK_file_read(gn_file, text, fstat.st_size))
+ {
+ GNUNET_free(text);
+ return NULL;
+ }
+ text[fstat.st_size] = '\0';
+ GNUNET_DISK_file_close(gn_file);
+
+ return text;
+}
+
+
/**
* Exit point from the plugin.
*/
@@ -2375,6 +2362,9 @@
struct GNUNET_TIME_Relative gn_timeout;
long long unsigned int port;
+ char * key_file;
+ char * cert_file;
+
GNUNET_assert(cls !=NULL);
#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting https plugin...\n");
@@ -2399,7 +2389,7 @@
/* Hashing our identity to use it in URLs */
GNUNET_CRYPTO_hash_to_enc ( &(plugin->env->my_identity->hashPubKey),
&plugin->my_ascii_hash_ident);
- /* Reading port number from config file */
+ /* Use IPv6 yes/no */
if (GNUNET_CONFIGURATION_have_value (env->cfg,
"transport-https", "USE_IPv6"))
{
@@ -2407,7 +2397,7 @@
"transport-https",
"USE_IPv6");
}
- /* Reading port number from config file */
+ /* Use IPv4 yes/no */
if (GNUNET_CONFIGURATION_have_value (env->cfg,
"transport-https", "USE_IPv4"))
{
@@ -2457,6 +2447,34 @@
}
}
+ /* Get private key file from config */
+ if (GNUNET_CONFIGURATION_have_value (env->cfg,
+
"transport-https", "KEY_FILE"))
+ {
+ GNUNET_CONFIGURATION_get_value_string (env->cfg,
+
"transport-https",
+
"KEY_FILE",
+
&key_file);
+ }
+ else
+ {
+ GNUNET_asprintf(&key_file,"https.key");
+ }
+
+ /* Get private key file from config */
+ if (GNUNET_CONFIGURATION_have_value (env->cfg,
+
"transport-https", "CERT_FILE"))
+ {
+ GNUNET_CONFIGURATION_get_value_string (env->cfg,
+
"transport-https",
+
"CERT_FILE",
+
&cert_file);
+ }
+ else
+ {
+ GNUNET_asprintf(&cert_file,"https.cert");
+ }
+
/* Reading ipv4 addresse to bind to from config file */
if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value
(env->cfg,
"transport-https", "BINDTO6")))
@@ -2484,6 +2502,38 @@
}
}
+ /* read key & certificates from file */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loading TLS certificate `%s' `%s'\n",
key_file, cert_file);
+
+ plugin->key = load_certificate( key_file );
+ plugin->cert = load_certificate( cert_file );
+
+ if ((plugin->key==NULL) || (plugin->cert==NULL))
+ {
+ char * cmd;
+ GNUNET_asprintf(&cmd,"gnunet-transport-certificate-creation %s %s",
key_file, cert_file);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No usable TLS certificate
found, creating certificate \n");
+ system(cmd);
+ GNUNET_free (cmd);
+
+ plugin->key = load_certificate( key_file );
+ plugin->cert = load_certificate( cert_file );
+
+ if ((plugin->key==NULL) || (plugin->cert==NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No usable TLS
certificate found and creating one failed! \n");
+ GNUNET_free (key_file);
+ GNUNET_free (cert_file);
+ libgnunet_plugin_transport_https_done(api);
+ return NULL;
+ }
+ }
+
+ GNUNET_free (key_file);
+ GNUNET_free (cert_file);
+
+
+ GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL));
GNUNET_assert ((port > 0) && (port <= 65535));
plugin->port_inbound = port;
gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
@@ -2499,8 +2549,8 @@
port,
&mhd_accept_cb,
plugin , &mdh_access_cb, plugin,
- MHD_OPTION_HTTPS_MEM_KEY, key_pem,
- MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
+ MHD_OPTION_HTTPS_MEM_KEY, plugin->key,
+ MHD_OPTION_HTTPS_MEM_CERT, plugin->cert,
MHD_OPTION_SOCK_ADDR, tmp,
MHD_OPTION_CONNECTION_LIMIT, (unsigned
int) 32,
//MHD_OPTION_PER_IP_CONNECTION_LIMIT,
(unsigned int) 6,
@@ -2519,8 +2569,8 @@
port,
&mhd_accept_cb,
plugin , &mdh_access_cb, plugin,
- MHD_OPTION_HTTPS_MEM_KEY, key_pem,
- MHD_OPTION_HTTPS_MEM_CERT, cert_pem,
+ MHD_OPTION_HTTPS_MEM_KEY, plugin->key,
+ MHD_OPTION_HTTPS_MEM_CERT, plugin->cert,
MHD_OPTION_SOCK_ADDR, (struct
sockaddr_in *)plugin->bind4_address,
MHD_OPTION_CONNECTION_LIMIT, (unsigned
int) 32,
//MHD_OPTION_PER_IP_CONNECTION_LIMIT,
(unsigned int) 6,
Modified: gnunet/src/transport/test_plugin_transport_data_http.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data_http.conf 2010-07-27
05:04:59 UTC (rev 12353)
+++ gnunet/src/transport/test_plugin_transport_data_http.conf 2010-07-27
09:05:36 UTC (rev 12354)
@@ -22,7 +22,10 @@
USE_IPv6 = YES
#BINDTO4 = 127.0.0.1
#BINDTO6 = ::1
+KEY_FILE = https_key.key
+CERT_FILE = https_cert.crt
+
[transport]
PREFIX = valgrind --leak-check=full
DEBUG = YES
Modified: gnunet/src/transport/test_plugin_transport_https.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_https.c 2010-07-27 05:04:59 UTC
(rev 12353)
+++ gnunet/src/transport/test_plugin_transport_https.c 2010-07-27 09:05:36 UTC
(rev 12354)
@@ -45,8 +45,8 @@
#include <arpa/inet.h>
#define VERBOSE GNUNET_YES
-#define DEBUG GNUNET_YES
-#define DEBUG_CURL GNUNET_YES
+#define DEBUG GNUNET_NO
+#define DEBUG_CURL GNUNET_NO
#define HTTP_BUFFER_SIZE 2048
#define PLUGIN libgnunet_plugin_transport_template
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2010-07-27 05:04:59 UTC (rev
12353)
+++ gnunet/src/transport/test_transport_api.c 2010-07-27 09:05:36 UTC (rev
12354)
@@ -443,14 +443,16 @@
{
is_udp = GNUNET_YES;
}
+ else if (strstr(argv[0], "https") != NULL)
+ {
+ is_https = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTPS!!!!");
+ }
else if (strstr(argv[0], "http") != NULL)
{
is_http = GNUNET_YES;
}
- else if (strstr(argv[0], "https") != NULL)
- {
- is_https = GNUNET_YES;
- }
+
GNUNET_log_setup ("test-transport-api",
#if VERBOSE
"DEBUG",
Modified: gnunet/src/transport/test_transport_api_data.conf
===================================================================
--- gnunet/src/transport/test_transport_api_data.conf 2010-07-27 05:04:59 UTC
(rev 12353)
+++ gnunet/src/transport/test_transport_api_data.conf 2010-07-27 09:05:36 UTC
(rev 12354)
@@ -34,7 +34,7 @@
AUTOSTART = NO
[transport]
-plugins = udp
+#plugins = udp
DEBUG = YES
PREFIX =
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/transport/test_transport_api_rel_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_http_peer1.conf 2010-07-27
05:04:59 UTC (rev 12353)
+++ gnunet/src/transport/test_transport_api_rel_http_peer1.conf 2010-07-27
09:05:36 UTC (rev 12354)
@@ -6,6 +6,16 @@
BINDTO4 = 127.0.0.1
#BINDTO6 = ::1
+[transport-https]
+PORT = 42389
+DEBUG = YES
+USE_IPv6 = YES
+USE_IPv4 = YES
+#BINDTO4 = 127.0.0.1
+#BINDTO6 = ::1
+KEY_FILE = https_key_p1.key
+CERT_FILE = https_cert_p1.crt
+
[fs]
AUTOSTART = NO
@@ -37,7 +47,7 @@
[transport]
PLUGINS = http
#PLUGINS = tcp http
-#DEBUG = YES
+DEBUG = YES
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
Modified: gnunet/src/transport/test_transport_api_rel_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_rel_http_peer2.conf 2010-07-27
05:04:59 UTC (rev 12353)
+++ gnunet/src/transport/test_transport_api_rel_http_peer2.conf 2010-07-27
09:05:36 UTC (rev 12354)
@@ -6,6 +6,16 @@
BINDTO4 = 127.0.0.1
#BINDTO6 = ::1
+[transport-https]
+PORT = 42389
+DEBUG = NO
+USE_IPv6 = YES
+USE_IPv4 = YES
+#BINDTO4 = 127.0.0.1
+#BINDTO6 = ::1
+KEY_FILE = https_key_p2.key
+CERT_FILE = https_cert_p2.crt
+
[fs]
AUTOSTART = NO
@@ -37,7 +47,7 @@
[transport]
PLUGINS = http
#PLUGINS = tcp http
-#DEBUG = YES
+DEBUG = YES
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2010-07-27
05:04:59 UTC (rev 12353)
+++ gnunet/src/transport/test_transport_api_reliability.c 2010-07-27
09:05:36 UTC (rev 12354)
@@ -80,6 +80,8 @@
static int is_http;
+static int is_https;
+
static int is_udp;
static int connected;
@@ -121,6 +123,7 @@
}
+
static void
stop_arm (struct PeerContext *p)
{
@@ -449,6 +452,11 @@
setup_peer (&p1, "test_transport_api_rel_http_peer1.conf");
setup_peer (&p2, "test_transport_api_rel_http_peer2.conf");
}
+ else if (is_https)
+ {
+ setup_peer (&p1, "test_transport_api_rel_https_peer1.conf");
+ setup_peer (&p2, "test_transport_api_rel_https_peer2.conf");
+ }
else if (is_udp)
{
setup_peer (&p1, "test_transport_api_udp_peer1.conf");
@@ -510,6 +518,10 @@
{
is_tcp = GNUNET_YES;
}
+ else if (strstr(argv[0], "https") != NULL)
+ {
+ is_https = GNUNET_YES;
+ }
else if (strstr(argv[0], "http") != NULL)
{
is_http = GNUNET_YES;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12354 - gnunet/src/transport,
gnunet <=