diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-05-22 09:42:02 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-05-22 09:42:02 +0000 |
commit | 4061c53cc2527d3a8a7dc2b1b55b48ffd8fe2482 (patch) | |
tree | e6e58c91d47c877e16cec6de0ee2dac72f9c3fa7 /src/pt | |
parent | c4acc825e512573e5be1f39fab799efc3b894cd2 (diff) | |
download | gnunet-4061c53cc2527d3a8a7dc2b1b55b48ffd8fe2482.tar.gz gnunet-4061c53cc2527d3a8a7dc2b1b55b48ffd8fe2482.zip |
-fix bad leftover peerid to string conversion
Diffstat (limited to 'src/pt')
-rw-r--r-- | src/pt/test_gns_vpn.c | 16 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 6 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.conf | 5 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index efc2867aa..96a5dd723 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -363,14 +363,14 @@ run (void *cls, | |||
363 | { | 363 | { |
364 | enum MHD_FLAG flags; | 364 | enum MHD_FLAG flags; |
365 | struct GNUNET_PeerIdentity id; | 365 | struct GNUNET_PeerIdentity id; |
366 | struct GNUNET_CRYPTO_HashAsciiEncoded peername; | 366 | char *peername; |
367 | struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key; | 367 | struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key; |
368 | struct GNUNET_GNSRECORD_Data rd; | 368 | struct GNUNET_GNSRECORD_Data rd; |
369 | char *rd_string; | 369 | char *rd_string; |
370 | char *zone_keyfile; | 370 | char *zone_keyfile; |
371 | 371 | ||
372 | GNUNET_TESTING_peer_get_identity (peer, &id); | 372 | GNUNET_TESTING_peer_get_identity (peer, &id); |
373 | GNUNET_CRYPTO_hash_to_enc ((struct GNUNET_HashCode*)&id, &peername); | 373 | peername = GNUNET_strdup (GNUNET_i2s_full (&id)); |
374 | 374 | ||
375 | namestore = GNUNET_NAMESTORE_connect (cfg); | 375 | namestore = GNUNET_NAMESTORE_connect (cfg); |
376 | GNUNET_assert (NULL != namestore); | 376 | GNUNET_assert (NULL != namestore); |
@@ -391,6 +391,7 @@ run (void *cls, | |||
391 | { | 391 | { |
392 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 392 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
393 | "Failed to get key from cfg\n"); | 393 | "Failed to get key from cfg\n"); |
394 | GNUNET_free (peername); | ||
394 | return; | 395 | return; |
395 | } | 396 | } |
396 | 397 | ||
@@ -400,10 +401,12 @@ run (void *cls, | |||
400 | "6 %s %s", | 401 | "6 %s %s", |
401 | (char*) &peername, | 402 | (char*) &peername, |
402 | "www.gnu."); | 403 | "www.gnu."); |
403 | GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN, | 404 | GNUNET_free (peername); |
404 | rd_string, | 405 | GNUNET_assert (GNUNET_OK == |
405 | (void**)&rd.data, | 406 | GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN, |
406 | &rd.data_size)); | 407 | rd_string, |
408 | (void**) &rd.data, | ||
409 | &rd.data_size)); | ||
407 | rd.record_type = GNUNET_GNSRECORD_TYPE_VPN; | 410 | rd.record_type = GNUNET_GNSRECORD_TYPE_VPN; |
408 | 411 | ||
409 | GNUNET_NAMESTORE_records_store (namestore, | 412 | GNUNET_NAMESTORE_records_store (namestore, |
@@ -597,4 +600,3 @@ main (int argc, char *const *argv) | |||
597 | } | 600 | } |
598 | 601 | ||
599 | /* end of test_gns_vpn.c */ | 602 | /* end of test_gns_vpn.c */ |
600 | |||
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index d2d166625..ef22fa404 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -406,7 +406,8 @@ main (int argc, char *const *argv) | |||
406 | { | 406 | { |
407 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "access", | 407 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "access", |
408 | "/dev/net/tun"); | 408 | "/dev/net/tun"); |
409 | fprintf (stderr, "WARNING: System unable to run test, skipping.\n"); | 409 | fprintf (stderr, |
410 | "WARNING: System unable to run test, skipping.\n"); | ||
410 | return 0; | 411 | return 0; |
411 | } | 412 | } |
412 | #endif | 413 | #endif |
@@ -430,7 +431,8 @@ main (int argc, char *const *argv) | |||
430 | type = strstr (bin, "-"); | 431 | type = strstr (bin, "-"); |
431 | if (NULL == type) | 432 | if (NULL == type) |
432 | { | 433 | { |
433 | fprintf (stderr, "invalid binary name\n"); | 434 | fprintf (stderr, |
435 | "invalid binary name\n"); | ||
434 | return 1; | 436 | return 1; |
435 | } | 437 | } |
436 | type++; | 438 | type++; |
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf index 5540c0fe4..929215cc5 100644 --- a/src/pt/test_gnunet_vpn.conf +++ b/src/pt/test_gnunet_vpn.conf | |||
@@ -15,9 +15,8 @@ EXIT_IPV6 = YES | |||
15 | # FIXME: can we use 'lo'? | 15 | # FIXME: can we use 'lo'? |
16 | EXIT_IFNAME = eth1 | 16 | EXIT_IFNAME = eth1 |
17 | 17 | ||
18 | [testing] | 18 | [hostlist] |
19 | WEAKRANDOM = YES | 19 | AUTOSTART = NO |
20 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | ||
21 | 20 | ||
22 | [nse] | 21 | [nse] |
23 | WORKBITS = 1 | 22 | WORKBITS = 1 |