diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-04-03 12:01:59 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-04-03 12:01:59 +0200 |
commit | d401c9e5e66385f260cbb289185da4019a0e4531 (patch) | |
tree | 93b05a7a44a1e0f678df5fa89529653a3f3d419a | |
parent | 93ec9874d03589b4f67ce58c7f36d69d5eaee1fe (diff) | |
download | gnunet-d401c9e5e66385f260cbb289185da4019a0e4531.tar.gz gnunet-d401c9e5e66385f260cbb289185da4019a0e4531.zip |
fix -c option
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca.in | 3 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 4 | ||||
-rwxr-xr-x | src/gns/test_proxy.sh | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in index 59dc69da9..184da4853 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca.in +++ b/src/gns/gnunet-gns-proxy-setup-ca.in | |||
@@ -141,7 +141,7 @@ generate_ca() | |||
141 | rm -f $GNSCAKY $GNSCANO $GNSCERT | 141 | rm -f $GNSCAKY $GNSCANO $GNSCERT |
142 | exit 1 | 142 | exit 1 |
143 | fi | 143 | fi |
144 | if [ -n "${GNUNET_CONFIG}" ]; then | 144 | if [ -n "${GNUNET_CONFIG_FILE}" ]; then |
145 | GNUNET_CONFIG="-c ${GNUNET_CONFIG_FILE}" | 145 | GNUNET_CONFIG="-c ${GNUNET_CONFIG_FILE}" |
146 | else | 146 | else |
147 | GNUNET_CONFIG="" | 147 | GNUNET_CONFIG="" |
@@ -231,6 +231,7 @@ main() | |||
231 | c) | 231 | c) |
232 | options="$options -c $OPTARG" | 232 | options="$options -c $OPTARG" |
233 | infomsg "Using configuration file $OPTARG" | 233 | infomsg "Using configuration file $OPTARG" |
234 | GNUNET_CONFIG_FILE=${OPTARG} | ||
234 | ;; | 235 | ;; |
235 | \?) | 236 | \?) |
236 | echo "Invalid option: -$OPTARG" >&2 | 237 | echo "Invalid option: -$OPTARG" >&2 |
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 0bfd84c91..2a7f8104b 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -370,7 +370,9 @@ start_curl (void *cls) | |||
370 | multi = curl_multi_init (); | 370 | multi = curl_multi_init (); |
371 | GNUNET_assert (multi != NULL); | 371 | GNUNET_assert (multi != NULL); |
372 | GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl)); | 372 | GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl)); |
373 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Beginning HTTP download from `%s'\n", url); | 373 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
374 | "Beginning HTTP download from `%s'\n", | ||
375 | url); | ||
374 | curl_main (); | 376 | curl_main (); |
375 | } | 377 | } |
376 | 378 | ||
diff --git a/src/gns/test_proxy.sh b/src/gns/test_proxy.sh index 5ea083122..7c17cd4c5 100755 --- a/src/gns/test_proxy.sh +++ b/src/gns/test_proxy.sh | |||
@@ -2,6 +2,8 @@ | |||
2 | # This file is in the public domain. | 2 | # This file is in the public domain. |
3 | TEST_DOMAIN="www.test" | 3 | TEST_DOMAIN="www.test" |
4 | 4 | ||
5 | # Delete old files before starting test | ||
6 | rm -rf /tmp/gnunet/test-gnunet-gns-testing/ | ||
5 | gnunet-arm -s -c test_gns_proxy.conf | 7 | gnunet-arm -s -c test_gns_proxy.conf |
6 | gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf | 8 | gnunet-gns-proxy-setup-ca -c test_gns_proxy.conf |
7 | 9 | ||