[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12746 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12746 - gnunet/src/transport |
Date: |
Thu, 26 Aug 2010 16:33:03 +0200 |
Author: wachs
Date: 2010-08-26 16:33:03 +0200 (Thu, 26 Aug 2010)
New Revision: 12746
Modified:
gnunet/src/transport/benchmark.sh
gnunet/src/transport/plugin_transport_http.c
gnunet/src/transport/plugin_transport_https.c
Log:
FIX: bugs found by klocwork
Modified: gnunet/src/transport/benchmark.sh
===================================================================
--- gnunet/src/transport/benchmark.sh 2010-08-26 13:32:21 UTC (rev 12745)
+++ gnunet/src/transport/benchmark.sh 2010-08-26 14:33:03 UTC (rev 12746)
@@ -1,12 +1,12 @@
#/bin/sh
-for i in {1..10}
+for i in {1..0}
do
echo RUN $i
./test_transport_api_reliability_http
done
-for i in {1..10}
+for i in {1..100}
do
echo RUN $i
./test_transport_api_reliability_https
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2010-08-26 13:32:21 UTC
(rev 12745)
+++ gnunet/src/transport/plugin_transport_http.c 2010-08-26 14:33:03 UTC
(rev 12746)
@@ -419,13 +419,13 @@
{
struct Plugin *plugin = cls;
char *url = NULL;
+ char *addr_str = (char *) http_plugin_address_to_string(NULL, addr, addrlen);
GNUNET_assert ((addr!=NULL) && (addrlen != 0));
GNUNET_asprintf(&url,
- "%s://%s/%s;%u", PROTOCOL_PREFIX,
- http_plugin_address_to_string(NULL, addr, addrlen),
+ "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str,
(char *) (&plugin->my_ascii_hash_ident),id);
-
+ GNUNET_free_non_null(addr_str);
return url;
}
Modified: gnunet/src/transport/plugin_transport_https.c
===================================================================
--- gnunet/src/transport/plugin_transport_https.c 2010-08-26 13:32:21 UTC
(rev 12745)
+++ gnunet/src/transport/plugin_transport_https.c 2010-08-26 14:33:03 UTC
(rev 12746)
@@ -429,13 +429,13 @@
{
struct Plugin *plugin = cls;
char *url = NULL;
+ char *addr_str = (char *) http_plugin_address_to_string(NULL, addr,
addrlen);
GNUNET_assert ((addr!=NULL) && (addrlen != 0));
GNUNET_asprintf(&url,
- "%s://%s/%s;%u", PROTOCOL_PREFIX,
- http_plugin_address_to_string(NULL, addr, addrlen),
+ "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str,
(char *) (&plugin->my_ascii_hash_ident),id);
-
+ GNUNET_free_non_null(addr_str);
return url;
}
@@ -818,7 +818,7 @@
int res = GNUNET_NO;
int send_error_to_client;
- void * addr;
+ void * addr = NULL;
size_t addr_len = 0;
GNUNET_assert(cls !=NULL);
@@ -2294,6 +2294,7 @@
if (GNUNET_SYSERR == GNUNET_DISK_file_read(gn_file, text, fstat.st_size))
{
GNUNET_free(text);
+ GNUNET_DISK_file_close(gn_file);
return NULL;
}
text[fstat.st_size] = '\0';
@@ -2367,6 +2368,8 @@
GNUNET_free_non_null (plugin->bind6_address);
GNUNET_free_non_null (plugin->bind_hostname);
GNUNET_free_non_null (plugin->crypto_init);
+ GNUNET_free_non_null (plugin->cert);
+ GNUNET_free_non_null (plugin->key);
GNUNET_free (plugin);
GNUNET_free (api);
#if DEBUG_HTTPS
@@ -2388,8 +2391,8 @@
struct GNUNET_TIME_Relative gn_timeout;
long long unsigned int port;
- char * key_file;
- char * cert_file;
+ char * key_file = NULL;
+ char * cert_file = NULL;
GNUNET_assert(cls !=NULL);
#if DEBUG_HTTPS
@@ -2489,20 +2492,6 @@
/* 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");
- }
-
- /* Get private key file from config */
- if (GNUNET_CONFIGURATION_have_value (env->cfg,
"transport-https", "KEY_FILE"))
{
GNUNET_CONFIGURATION_get_value_string (env->cfg,
@@ -2510,24 +2499,19 @@
"KEY_FILE",
&key_file);
}
- else
- {
+ if (key_file==NULL)
GNUNET_asprintf(&key_file,"https.key");
- }
/* Get private key file from config */
- if (GNUNET_CONFIGURATION_have_value (env->cfg,
-
"transport-https", "CERT_FILE"))
+ 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
- {
+ if (cert_file==NULL)
GNUNET_asprintf(&cert_file,"https.cert");
- }
/* Should plugin use ipv6? */
if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value
(env->cfg,
@@ -2578,6 +2562,7 @@
"transport-https");
GNUNET_free (key_file);
GNUNET_free (cert_file);
+
libgnunet_plugin_transport_https_done(api);
GNUNET_free (cmd);
return NULL;
@@ -2606,7 +2591,7 @@
GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n", key_file,
cert_file);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n");
GNUNET_assert ((port > 0) && (port <= 65535));
plugin->port_inbound = port;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12746 - gnunet/src/transport,
gnunet <=