diff options
-rw-r--r-- | src/nse/gnunet-service-nse.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 08e187d35..98ace893e 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -1420,46 +1420,47 @@ run (void *cls, | |||
1420 | {NULL, 0, 0} | 1420 | {NULL, 0, 0} |
1421 | }; | 1421 | }; |
1422 | char *proof; | 1422 | char *proof; |
1423 | char *keyfile; | ||
1424 | struct GNUNET_CRYPTO_EccPrivateKey *pk; | 1423 | struct GNUNET_CRYPTO_EccPrivateKey *pk; |
1425 | 1424 | ||
1426 | cfg = c; | 1425 | cfg = c; |
1427 | srv = server; | 1426 | srv = server; |
1428 | if ((GNUNET_OK != | 1427 | if (GNUNET_OK != |
1429 | GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "INTERVAL", | 1428 | GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "INTERVAL", |
1430 | &gnunet_nse_interval)) || | 1429 | &gnunet_nse_interval)) |
1431 | (GNUNET_OK != | ||
1432 | GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "WORKDELAY", | ||
1433 | &proof_find_delay)) || | ||
1434 | (GNUNET_OK != | ||
1435 | GNUNET_CONFIGURATION_get_value_number (cfg, "NSE", "WORKBITS", | ||
1436 | &nse_work_required))) | ||
1437 | { | 1430 | { |
1438 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1431 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
1439 | _ | 1432 | "NSE", "INTERVAL"); |
1440 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | ||
1441 | "NSE", "interval/workdelay/workbits"); | ||
1442 | GNUNET_SCHEDULER_shutdown (); | 1433 | GNUNET_SCHEDULER_shutdown (); |
1443 | return; | 1434 | return; |
1444 | } | 1435 | } |
1445 | if (nse_work_required >= sizeof (struct GNUNET_HashCode) * 8) | 1436 | if (GNUNET_OK != |
1437 | GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", "WORKDELAY", | ||
1438 | &proof_find_delay)) | ||
1446 | { | 1439 | { |
1447 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1440 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
1448 | _("Invalid work requirement for NSE service. Exiting.\n")); | 1441 | "NSE", "WORKDELAY"); |
1449 | GNUNET_SCHEDULER_shutdown (); | 1442 | GNUNET_SCHEDULER_shutdown (); |
1450 | return; | 1443 | return; |
1451 | } | 1444 | } |
1452 | if (GNUNET_OK != | 1445 | if (GNUNET_OK != |
1453 | GNUNET_CONFIGURATION_get_value_filename (c, "PEER", "PRIVATE_KEY", | 1446 | GNUNET_CONFIGURATION_get_value_number (cfg, "NSE", "WORKBITS", |
1454 | &keyfile)) | 1447 | &nse_work_required)) |
1455 | { | 1448 | { |
1456 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1449 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
1457 | _ | 1450 | "NSE", "WORKBITS"); |
1458 | ("%s service is lacking key configuration settings (%s). Exiting.\n"), | 1451 | GNUNET_SCHEDULER_shutdown (); |
1459 | "NSE", "peer/privatekey"); | 1452 | return; |
1453 | } | ||
1454 | if (nse_work_required >= sizeof (struct GNUNET_HashCode) * 8) | ||
1455 | { | ||
1456 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, | ||
1457 | "NSE", | ||
1458 | "WORKBITS", | ||
1459 | _("Value is too large.\n")); | ||
1460 | GNUNET_SCHEDULER_shutdown (); | 1460 | GNUNET_SCHEDULER_shutdown (); |
1461 | return; | 1461 | return; |
1462 | } | 1462 | } |
1463 | |||
1463 | #if ENABLE_NSE_HISTOGRAM | 1464 | #if ENABLE_NSE_HISTOGRAM |
1464 | if (NULL == (lh = GNUNET_TESTBED_LOGGER_connect (cfg))) | 1465 | if (NULL == (lh = GNUNET_TESTBED_LOGGER_connect (cfg))) |
1465 | { | 1466 | { |
@@ -1472,8 +1473,7 @@ run (void *cls, | |||
1472 | 1473 | ||
1473 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, | 1474 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
1474 | NULL); | 1475 | NULL); |
1475 | pk = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile); | 1476 | pk = GNUNET_CRYPTO_ecc_key_create_from_configuration (cfg); |
1476 | GNUNET_free (keyfile); | ||
1477 | GNUNET_assert (NULL != pk); | 1477 | GNUNET_assert (NULL != pk); |
1478 | my_private_key = pk; | 1478 | my_private_key = pk; |
1479 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (my_private_key, &my_public_key); | 1479 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (my_private_key, &my_public_key); |