[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22678 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22678 - gnunet/src/gns |
Date: |
Sun, 15 Jul 2012 12:25:22 +0200 |
Author: schanzen
Date: 2012-07-15 12:25:22 +0200 (Sun, 15 Jul 2012)
New Revision: 22678
Modified:
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/gns/test_gns_proxy.c
Log:
-fix
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2012-07-15 00:09:48 UTC (rev 22677)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2012-07-15 10:25:22 UTC (rev 22678)
@@ -1405,7 +1405,7 @@
else if (NULL != ctasks_head)
{
/* as specified in curl docs */
- curl_download_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_UNIT_SECONDS,
+ curl_download_task = GNUNET_SCHEDULER_add_delayed
(GNUNET_TIME_UNIT_MILLISECONDS,
&curl_task_download,
curl_multi);
}
Modified: gnunet/src/gns/test_gns_proxy.c
===================================================================
--- gnunet/src/gns/test_gns_proxy.c 2012-07-15 00:09:48 UTC (rev 22677)
+++ gnunet/src/gns/test_gns_proxy.c 2012-07-15 10:25:22 UTC (rev 22678)
@@ -383,6 +383,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to write tmp cfg\n");
+ do_shutdown ();
return;
}
@@ -394,7 +395,13 @@
"gnunet-gns-proxy",
"-c", tmp_cfgfile, NULL);
- GNUNET_assert (NULL != proxy_proc);
+ if (NULL == proxy_proc)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unable to start proxy\n");
+ do_shutdown ();
+ return;
+ }
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
@@ -428,6 +435,13 @@
main (int argc, char *const *argv)
{
+ if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("gnunet-gns-proxy"))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Proxy binay not in PATH... skipping!");
+ return 0;
+ }
+
GNUNET_CRYPTO_setup_hostkey ("test_gns_proxy.conf");
if (0 != curl_global_init (CURL_GLOBAL_WIN32))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22678 - gnunet/src/gns,
gnunet <=