diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-15 10:25:22 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-15 10:25:22 +0000 |
commit | fe32c814a43d6f7d3c4494a8de0d607186c03846 (patch) | |
tree | 324567f574b2a2d77cf0b3a6e52378e6e0b52b42 /src/gns/test_gns_proxy.c | |
parent | 95bc1b9165cbfd429b2510e56018c971515d6e93 (diff) | |
download | gnunet-fe32c814a43d6f7d3c4494a8de0d607186c03846.tar.gz gnunet-fe32c814a43d6f7d3c4494a8de0d607186c03846.zip |
-fix
Diffstat (limited to 'src/gns/test_gns_proxy.c')
-rw-r--r-- | src/gns/test_gns_proxy.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 9b0e8c76d..dd3ba315b 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -383,6 +383,7 @@ run (void *cls, | |||
383 | { | 383 | { |
384 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 384 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
385 | "Failed to write tmp cfg\n"); | 385 | "Failed to write tmp cfg\n"); |
386 | do_shutdown (); | ||
386 | return; | 387 | return; |
387 | } | 388 | } |
388 | 389 | ||
@@ -394,7 +395,13 @@ run (void *cls, | |||
394 | "gnunet-gns-proxy", | 395 | "gnunet-gns-proxy", |
395 | "-c", tmp_cfgfile, NULL); | 396 | "-c", tmp_cfgfile, NULL); |
396 | 397 | ||
397 | GNUNET_assert (NULL != proxy_proc); | 398 | if (NULL == proxy_proc) |
399 | { | ||
400 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
401 | "Unable to start proxy\n"); | ||
402 | do_shutdown (); | ||
403 | return; | ||
404 | } | ||
398 | 405 | ||
399 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", | 406 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", |
400 | "ZONEKEY", | 407 | "ZONEKEY", |
@@ -428,6 +435,13 @@ int | |||
428 | main (int argc, char *const *argv) | 435 | main (int argc, char *const *argv) |
429 | { | 436 | { |
430 | 437 | ||
438 | if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("gnunet-gns-proxy")) | ||
439 | { | ||
440 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
441 | "Proxy binay not in PATH... skipping!"); | ||
442 | return 0; | ||
443 | } | ||
444 | |||
431 | GNUNET_CRYPTO_setup_hostkey ("test_gns_proxy.conf"); | 445 | GNUNET_CRYPTO_setup_hostkey ("test_gns_proxy.conf"); |
432 | 446 | ||
433 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) | 447 | if (0 != curl_global_init (CURL_GLOBAL_WIN32)) |