diff options
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 927a8753c..93fa031f4 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -384,7 +384,7 @@ struct GNUNET_PEERINFO_Handle *GST_peerinfo; | |||
384 | /** | 384 | /** |
385 | * Our private key. | 385 | * Our private key. |
386 | */ | 386 | */ |
387 | struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key; | 387 | struct GNUNET_CRYPTO_EddsaPrivateKey GST_my_private_key; |
388 | 388 | ||
389 | /** | 389 | /** |
390 | * ATS scheduling handle. | 390 | * ATS scheduling handle. |
@@ -2183,11 +2183,6 @@ shutdown_task (void *cls) | |||
2183 | GNUNET_STATISTICS_destroy (GST_stats, GNUNET_NO); | 2183 | GNUNET_STATISTICS_destroy (GST_stats, GNUNET_NO); |
2184 | GST_stats = NULL; | 2184 | GST_stats = NULL; |
2185 | } | 2185 | } |
2186 | if (NULL != GST_my_private_key) | ||
2187 | { | ||
2188 | GNUNET_free (GST_my_private_key); | ||
2189 | GST_my_private_key = NULL; | ||
2190 | } | ||
2191 | } | 2186 | } |
2192 | 2187 | ||
2193 | 2188 | ||
@@ -2611,7 +2606,6 @@ run (void *cls, | |||
2611 | struct GNUNET_SERVICE_Handle *service) | 2606 | struct GNUNET_SERVICE_Handle *service) |
2612 | { | 2607 | { |
2613 | char *keyfile; | 2608 | char *keyfile; |
2614 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; | ||
2615 | long long unsigned int max_fd_cfg; | 2609 | long long unsigned int max_fd_cfg; |
2616 | int max_fd_rlimit; | 2610 | int max_fd_rlimit; |
2617 | int max_fd; | 2611 | int max_fd; |
@@ -2638,17 +2632,22 @@ run (void *cls, | |||
2638 | { | 2632 | { |
2639 | hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION; | 2633 | hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION; |
2640 | } | 2634 | } |
2641 | pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile); | 2635 | if (GNUNET_SYSERR == |
2636 | GNUNET_CRYPTO_eddsa_key_from_file (keyfile, | ||
2637 | GNUNET_YES, | ||
2638 | &GST_my_private_key)) | ||
2639 | { | ||
2640 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
2641 | "Failed to setup peer's private key\n"); | ||
2642 | GNUNET_SCHEDULER_shutdown (); | ||
2643 | GNUNET_free (keyfile); | ||
2644 | return; | ||
2645 | } | ||
2642 | GNUNET_free (keyfile); | 2646 | GNUNET_free (keyfile); |
2643 | GNUNET_assert (NULL != pk); | ||
2644 | GST_my_private_key = pk; | ||
2645 | |||
2646 | GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg); | 2647 | GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg); |
2647 | GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg); | 2648 | GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg); |
2648 | GNUNET_CRYPTO_eddsa_key_get_public (GST_my_private_key, | 2649 | GNUNET_CRYPTO_eddsa_key_get_public (&GST_my_private_key, |
2649 | &GST_my_identity.public_key); | 2650 | &GST_my_identity.public_key); |
2650 | GNUNET_assert (NULL != GST_my_private_key); | ||
2651 | |||
2652 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 2651 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
2653 | "My identity is `%s'\n", | 2652 | "My identity is `%s'\n", |
2654 | GNUNET_i2s_full (&GST_my_identity)); | 2653 | GNUNET_i2s_full (&GST_my_identity)); |