[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37653 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37653 - gnunet/src/util |
Date: |
Wed, 3 Aug 2016 16:37:24 +0200 |
Author: burdges
Date: 2016-08-03 16:37:24 +0200 (Wed, 03 Aug 2016)
New Revision: 37653
Modified:
gnunet/src/util/socks.c
Log:
Fix a few errors in socks.c
Modified: gnunet/src/util/socks.c
===================================================================
--- gnunet/src/util/socks.c 2016-08-03 09:41:42 UTC (rev 37652)
+++ gnunet/src/util/socks.c 2016-08-03 14:37:24 UTC (rev 37653)
@@ -596,15 +596,17 @@
service_name,port1,host1);
return NULL;
}
+ /* Appeared to still work after host0 corrupted, so either test case is
broken, or
+ this whole routine is not being called. */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "SOCKSHOST",
&host0))
- host0 = NULL; /* you don't want to feed a static string to free(), right?
*/
- socks5 = GNUNET_CONNECTION_create_from_connect (cfg, (char*)(host0 ||
"127.0.0.1"), port0);
+ host0 = NULL;
+ socks5 = GNUNET_CONNECTION_create_from_connect (cfg, (host0 != NULL)?
host0:"127.0.0.1", port0);
if (host0) GNUNET_free (host0);
/* Sets to NULL if they do not exist */
- GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "SOCKSUSER",
&user);
- GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "SOCKSPASS",
&pass);
+ (void)GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "SOCKSUSER",
&user);
+ (void)GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "SOCKSPASS",
&pass);
ih = GNUNET_SOCKS_init_handshake(user,pass);
if (NULL != user) GNUNET_free (user);
if (NULL != pass) GNUNET_free (pass);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37653 - gnunet/src/util,
gnunet <=