summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-09-27 23:20:33 +0200
committerChristian Grothoff <christian@grothoff.org>2019-09-27 23:23:55 +0200
commit9388822eb43827ee4f343a881d86a6225beca939 (patch)
tree1b73f861e4f53bb38fd64d62652cdce2bcb343da
parentc8ed84e481b4abfb7d4ed844a4d74b979917c466 (diff)
do not attempt name resolution or terminating a peer in gnunet-arm if the peer is not running
-rw-r--r--src/arm/gnunet-arm.c1044
-rw-r--r--src/gns/gnunet-gns.c266
2 files changed, 714 insertions, 596 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 2670ac9b8..0fdb66fa0 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -149,25 +149,25 @@ static struct GNUNET_ARM_Operation *op;
* were specified when gnunet-arm was run.
*/
static void
-delete_files()
+delete_files ()
{
- GNUNET_log(
+ GNUNET_log (
GNUNET_ERROR_TYPE_DEBUG,
"Will attempt to remove configuration file %s and service directory %s\n",
config_file,
dir);
- if (0 != unlink(config_file))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("Failed to remove configuration file %s\n"),
- config_file);
- }
- if (GNUNET_OK != GNUNET_DISK_directory_remove(dir))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("Failed to remove servicehome directory %s\n"),
- dir);
- }
+ if (0 != unlink (config_file))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _ ("Failed to remove configuration file %s\n"),
+ config_file);
+ }
+ if (GNUNET_OK != GNUNET_DISK_directory_remove (dir))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _ ("Failed to remove servicehome directory %s\n"),
+ dir);
+ }
}
@@ -178,37 +178,38 @@ delete_files()
* @param cls closure, unused
*/
static void
-shutdown_task(void *cls)
+shutdown_task (void *cls)
{
- (void)cls;
+ (void) cls;
if (NULL != al_task)
- {
- GNUNET_SCHEDULER_cancel(al_task);
- al_task = NULL;
- }
+ {
+ GNUNET_SCHEDULER_cancel (al_task);
+ al_task = NULL;
+ }
if (NULL != op)
- {
- GNUNET_ARM_operation_cancel(op);
- op = NULL;
- }
+ {
+ GNUNET_ARM_operation_cancel (op);
+ op = NULL;
+ }
if (NULL != h)
- {
- GNUNET_ARM_disconnect(h);
- h = NULL;
- }
+ {
+ GNUNET_ARM_disconnect (h);
+ h = NULL;
+ }
if (NULL != m)
- {
- GNUNET_ARM_monitor_stop(m);
- m = NULL;
- }
+ {
+ GNUNET_ARM_monitor_stop (m);
+ m = NULL;
+ }
if (NULL != timeout_task)
- {
- GNUNET_SCHEDULER_cancel(timeout_task);
- timeout_task = NULL;
- }
- if ((GNUNET_YES == end) && (GNUNET_YES == delete))
- delete_files();
- GNUNET_CONFIGURATION_destroy(cfg);
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
+ if ( (GNUNET_YES == end) &&
+ (GNUNET_YES == delete) )
+ delete_files ();
+ GNUNET_CONFIGURATION_destroy (cfg);
cfg = NULL;
}
@@ -220,17 +221,17 @@ shutdown_task(void *cls)
* @return a string interpretation of the request status
*/
static const char *
-req_string(enum GNUNET_ARM_RequestStatus rs)
+req_string (enum GNUNET_ARM_RequestStatus rs)
{
switch (rs)
- {
- case GNUNET_ARM_REQUEST_SENT_OK:
- return _("Message was sent successfully");
+ {
+ case GNUNET_ARM_REQUEST_SENT_OK:
+ return _ ("Message was sent successfully");
- case GNUNET_ARM_REQUEST_DISCONNECTED:
- return _("We disconnected from ARM before we could send a request");
- }
- return _("Unknown request status");
+ case GNUNET_ARM_REQUEST_DISCONNECTED:
+ return _ ("We disconnected from ARM before we could send a request");
+ }
+ return _ ("Unknown request status");
}
@@ -241,41 +242,41 @@ req_string(enum GNUNET_ARM_RequestStatus rs)
* @return a string interpretation
*/
static const char *
-ret_string(enum GNUNET_ARM_Result result)
+ret_string (enum GNUNET_ARM_Result result)
{
switch (result)
- {
- case GNUNET_ARM_RESULT_STOPPED:
- return _("is stopped");
+ {
+ case GNUNET_ARM_RESULT_STOPPED:
+ return _ ("is stopped");
- case GNUNET_ARM_RESULT_STARTING:
- return _("is starting");
+ case GNUNET_ARM_RESULT_STARTING:
+ return _ ("is starting");
- case GNUNET_ARM_RESULT_STOPPING:
- return _("is stopping");
+ case GNUNET_ARM_RESULT_STOPPING:
+ return _ ("is stopping");
- case GNUNET_ARM_RESULT_IS_STARTING_ALREADY:
- return _("is starting already");
+ case GNUNET_ARM_RESULT_IS_STARTING_ALREADY:
+ return _ ("is starting already");
- case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY:
- return _("is stopping already");
+ case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY:
+ return _ ("is stopping already");
- case GNUNET_ARM_RESULT_IS_STARTED_ALREADY:
- return _("is started already");
+ case GNUNET_ARM_RESULT_IS_STARTED_ALREADY:
+ return _ ("is started already");
- case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY:
- return _("is stopped already");
+ case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY:
+ return _ ("is stopped already");
- case GNUNET_ARM_RESULT_IS_NOT_KNOWN:
- return _("service is not known to ARM");
+ case GNUNET_ARM_RESULT_IS_NOT_KNOWN:
+ return _ ("service is not known to ARM");
- case GNUNET_ARM_RESULT_START_FAILED:
- return _("service failed to start");
+ case GNUNET_ARM_RESULT_START_FAILED:
+ return _ ("service failed to start");
- case GNUNET_ARM_RESULT_IN_SHUTDOWN:
- return _("service cannot be manipulated because ARM is shutting down");
- }
- return _("Unknown result code.");
+ case GNUNET_ARM_RESULT_IN_SHUTDOWN:
+ return _ ("service cannot be manipulated because ARM is shutting down");
+ }
+ return _ ("Unknown result code.");
}
@@ -285,7 +286,7 @@ ret_string(enum GNUNET_ARM_Result result)
* @param cls closure
*/
static void
-action_loop(void *cls);
+action_loop (void *cls);
/**
@@ -298,18 +299,20 @@ action_loop(void *cls);
* #GNUNET_SYSERR on error.
*/
static void
-conn_status(void *cls, int connected)
+conn_status (void *cls,
+ int connected)
{
static int once;
- (void)cls;
- if ((GNUNET_SYSERR == connected) && (0 == once))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- _("Fatal error initializing ARM API.\n"));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
+ (void) cls;
+ if ( (GNUNET_SYSERR == connected) &&
+ (0 == once) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _ ("Fatal error initializing ARM API.\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
once = 1;
}
@@ -326,32 +329,34 @@ conn_status(void *cls, int connected)
* according to ARM
*/
static void
-start_callback(void *cls,
- enum GNUNET_ARM_RequestStatus rs,
- enum GNUNET_ARM_Result result)
+start_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
- (void)cls;
+ (void) cls;
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- fprintf(stdout,
- _("Failed to start the ARM service: %s\n"),
- req_string(rs));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
+ {
+ fprintf (stdout,
+ _ ("Failed to start the ARM service: %s\n"),
+ req_string (rs));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
if ((GNUNET_ARM_RESULT_STARTING != result) &&
(GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result))
- {
- fprintf(stdout,
- _("Failed to start the ARM service: %s\n"),
- ret_string(result));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "ARM service [re]start successful\n");
+ {
+ fprintf (stdout,
+ _ ("Failed to start the ARM service: %s\n"),
+ ret_string (result));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ARM service [re]start successful\n");
start = 0;
- al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
+ al_task = GNUNET_SCHEDULER_add_now (&action_loop,
+ NULL);
}
@@ -367,44 +372,47 @@ start_callback(void *cls,
* according to ARM
*/
static void
-stop_callback(void *cls,
- enum GNUNET_ARM_RequestStatus rs,
- enum GNUNET_ARM_Result result)
+stop_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
char *msg;
- (void)cls;
+ (void) cls;
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- GNUNET_asprintf(&msg,
- "%s",
- _(
- "Failed to send a stop request to the ARM service: %s\n"));
- fprintf(stdout, msg, req_string(rs));
- GNUNET_free(msg);
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- if ((GNUNET_ARM_RESULT_STOPPING != result) &&
- (GNUNET_ARM_RESULT_STOPPED != result) &&
- (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
- {
- fprintf(stdout,
- _("Failed to stop the ARM service: %s\n"),
- ret_string(result));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "ARM service shutdown successful\n");
+ {
+ GNUNET_asprintf (&msg,
+ "%s",
+ _ (
+ "Failed to send a stop request to the ARM service: %s\n"));
+ fprintf (stdout, msg, req_string (rs));
+ GNUNET_free (msg);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ if ( (GNUNET_ARM_RESULT_STOPPING != result) &&
+ (GNUNET_ARM_RESULT_STOPPED != result) &&
+ (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result) )
+ {
+ fprintf (stdout,
+ _ ("Failed to stop the ARM service: %s\n"),
+ ret_string (result));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ARM service shutdown successful\n");
end = 0;
if (restart)
- {
- restart = 0;
- start = 1;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initiating an ARM restart\n");
- }
- al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
+ {
+ restart = 0;
+ start = 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Initiating an ARM restart\n");
+ }
+ al_task = GNUNET_SCHEDULER_add_now (&action_loop,
+ NULL);
}
@@ -420,37 +428,38 @@ stop_callback(void *cls,
* according to ARM
*/
static void
-init_callback(void *cls,
- enum GNUNET_ARM_RequestStatus rs,
- enum GNUNET_ARM_Result result)
+init_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
- (void)cls;
+ (void) cls;
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- fprintf(stdout,
- _("Failed to send a request to start the `%s' service: %s\n"),
- init,
- req_string(rs));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
+ {
+ fprintf (stdout,
+ _ ("Failed to send a request to start the `%s' service: %s\n"),
+ init,
+ req_string (rs));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
if ((GNUNET_ARM_RESULT_STARTING != result) &&
(GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result))
- {
- fprintf(stdout,
- _("Failed to start the `%s' service: %s\n"),
- init,
- ret_string(result));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Service %s [re]started successfully\n",
- init);
- GNUNET_free(init);
+ {
+ fprintf (stdout,
+ _ ("Failed to start the `%s' service: %s\n"),
+ init,
+ ret_string (result));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Service %s [re]started successfully\n",
+ init);
+ GNUNET_free (init);
init = NULL;
- al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
+ al_task = GNUNET_SCHEDULER_add_now (&action_loop,
+ NULL);
}
@@ -466,42 +475,45 @@ init_callback(void *cls,
* according to ARM
*/
static void
-term_callback(void *cls,
- enum GNUNET_ARM_RequestStatus rs,
- enum GNUNET_ARM_Result result)
+term_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
char *msg;
- (void)cls;
+ (void) cls;
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- GNUNET_asprintf(&msg,
- _(
- "Failed to send a request to kill the `%s' service: %%s\n"),
- term);
- fprintf(stdout, msg, req_string(rs));
- GNUNET_free(msg);
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- if ((GNUNET_ARM_RESULT_STOPPED != result) &&
- (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result))
- {
- fprintf(stdout,
- _("Failed to kill the `%s' service: %s\n"),
- term,
- ret_string(result));
- GNUNET_SCHEDULER_shutdown();
- return;
- }
+ {
+ GNUNET_asprintf (&msg,
+ _ (
+ "Failed to send a request to kill the `%s' service: %%s\n"),
+ term);
+ fprintf (stdout,
+ msg,
+ req_string (rs));
+ GNUNET_free (msg);
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ if ( (GNUNET_ARM_RESULT_STOPPED != result) &&
+ (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result) )
+ {
+ fprintf (stdout,
+ _ ("Failed to kill the `%s' service: %s\n"),
+ term,
+ ret_string (result));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Service %s stopped successfully\n",
- term);
- GNUNET_free(term);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Service %s stopped successfully\n",
+ term);
+ GNUNET_free (term);
term = NULL;
- al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
+ al_task = GNUNET_SCHEDULER_add_now (&action_loop,
+ NULL);
}
@@ -516,115 +528,140 @@ term_callback(void *cls,
* @param list list of services managed by arm
*/
static void
-list_callback(void *cls,
- enum GNUNET_ARM_RequestStatus rs,
- unsigned int count,
- const struct GNUNET_ARM_ServiceInfo *list)
+list_callback (void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ unsigned int count,
+ const struct GNUNET_ARM_ServiceInfo *list)
{
unsigned int num_stopped = 0;
unsigned int num_started = 0;
unsigned int num_stopping = 0;
unsigned int num_failed = 0;
unsigned int num_finished = 0;
- (void)cls;
+ (void) cls;
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- char *msg;
-
- GNUNET_asprintf(&msg,
- "%s",
- _("Failed to request a list of services: %s\n"));
- fprintf(stdout, msg, req_string(rs));
- GNUNET_free(msg);
- ret = 3;
- GNUNET_SCHEDULER_shutdown();
- }
+ {
+ char *msg;
+
+ GNUNET_asprintf (&msg,
+ "%s",
+ _ ("Failed to request a list of services: %s\n"));
+ fprintf (stdout,
+ msg,
+ req_string (rs));
+ GNUNET_free (msg);
+ ret = 3;
+ GNUNET_SCHEDULER_shutdown ();
+ }
if (NULL == list)
- {
- fprintf(stderr,
- "%s",
- _("Error communicating with ARM. ARM not running?\n"));
- GNUNET_SCHEDULER_shutdown();
- ret = 3;
- return;
- }
+ {
+ fprintf (stderr,
+ "%s",
+ _ ("Error communicating with ARM. ARM not running?\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ ret = 3;
+ return;
+ }
for (unsigned int i = 0; i < count; i++)
{
switch (list[i].status)
{
- case GNUNET_ARM_SERVICE_STATUS_STOPPED:
- num_stopped++;
- break;
- case GNUNET_ARM_SERVICE_STATUS_FAILED:
- num_failed++;
- break;
- case GNUNET_ARM_SERVICE_STATUS_FINISHED:
- num_finished++;
- break;
- case GNUNET_ARM_SERVICE_STATUS_STARTED:
- num_started++;
- break;
- case GNUNET_ARM_SERVICE_STATUS_STOPPING:
- num_stopping++;
- fprintf(stdout, "%s (binary='%s', status=stopping)\n", list[i].name, list[i].binary);
- break;
- default:
- GNUNET_break_op (0);
- fprintf(stdout, "%s (binary='%s', status=unknown)\n", list[i].name, list[i].binary);
- break;
+ case GNUNET_ARM_SERVICE_STATUS_STOPPED:
+ num_stopped++;
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_FAILED:
+ num_failed++;
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_FINISHED:
+ num_finished++;
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_STARTED:
+ num_started++;
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_STOPPING:
+ num_stopping++;
+ fprintf (stdout,
+ "%s (binary='%s', status=stopping)\n",
+ list[i].name,
+ list[i].binary);
+ break;
+ default:
+ GNUNET_break_op (0);
+ fprintf (stdout,
+ "%s (binary='%s', status=unknown)\n",
+ list[i].name,
+ list[i].binary);
+ break;
}
}
- if (!quiet)
+ if (! quiet)
{
if (show_all)
- fprintf(stdout, "%s", _("All services:\n"));
+ fprintf (stdout,
+ "%s",
+ _ ("All services:\n"));
else
- fprintf(stdout, "%s", _("Services (excluding stopped services):\n"));
- if (num_stopped || num_failed || num_finished || num_stopping || num_started)
+ fprintf (stdout,
+ "%s",
+ _ ("Services (excluding stopped services):\n"));
+ if (num_stopped || num_failed || num_finished || num_stopping ||
+ num_started)
{
int sep = 0;
- fprintf(stdout, "(");
+ fprintf (stdout, "(");
if (0 != num_started)
{
if (sep)
- fprintf(stdout, " / ");
- fprintf(stdout, "started: %u", num_started);
+ fprintf (stdout, " / ");
+ fprintf (stdout,
+ "started: %u",
+ num_started);
sep = 1;
}
if (0 != num_failed)
{
if (sep)
- fprintf(stdout, " / ");
- fprintf(stdout, "failed: %u", num_failed);
+ fprintf (stdout, " / ");
+ fprintf (stdout,
+ "failed: %u",
+ num_failed);
sep = 1;
}
if (0 != num_stopping)
{
if (sep)
- fprintf(stdout, " / ");
- fprintf(stdout, "stopping: %u", num_stopping);
+ fprintf (stdout, " / ");
+ fprintf (stdout,
+ "stopping: %u",
+ num_stopping);
sep = 1;
}
if (0 != num_stopped)
{
if (sep)
- fprintf(stdout, " / ");
- fprintf(stdout, "stopped: %u", num_stopped);
+ fprintf (stdout, " / ");
+ fprintf (stdout,
+ "stopped: %u",
+ num_stopped);
sep = 1;
}
if (0 != num_finished)
{
if (sep)
- fprintf(stdout, " / ");
- fprintf(stdout, "finished: %u", num_finished);
+ fprintf (stdout, " / ");
+ fprintf (stdout,
+ "finished: %u",
+ num_finished);
sep = 1;
}
- fprintf(stdout, ")\n");
+ fprintf (stdout, ")\n");
}
else
{
- fprintf(stdout, "%s", _("(No services configured.)\n"));
+ fprintf (stdout,
+ "%s",
+ _ ("(No services configured.)\n"));
}
}
for (unsigned int i = 0; i < count; i++)
@@ -632,34 +669,52 @@ list_callback(void *cls,
struct GNUNET_TIME_Relative restart_in;
switch (list[i].status)
{
- case GNUNET_ARM_SERVICE_STATUS_STOPPED:
- if (show_all)
- fprintf(stdout, "%s (binary='%s', status=stopped)\n", list[i].name, list[i].binary);
- break;
- case GNUNET_ARM_SERVICE_STATUS_FAILED:
- restart_in = GNUNET_TIME_absolute_get_remaining (list[i].restart_at);
- fprintf(stdout, "%s (binary='%s', status=failed, exit_status=%d, restart_delay='%s')\n",
- list[i].name,
- list[i].binary,
- list[i].last_exit_status,
- GNUNET_STRINGS_relative_time_to_string (restart_in, GNUNET_YES));
- break;
- case GNUNET_ARM_SERVICE_STATUS_FINISHED:
- fprintf(stdout, "%s (binary='%s', status=finished)\n", list[i].name, list[i].binary);
- break;
- case GNUNET_ARM_SERVICE_STATUS_STARTED:
- fprintf(stdout, "%s (binary='%s', status=started)\n", list[i].name, list[i].binary);
- break;
- case GNUNET_ARM_SERVICE_STATUS_STOPPING:
- fprintf(stdout, "%s (binary='%s', status=stopping)\n", list[i].name, list[i].binary);
- break;
- default:
- GNUNET_break_op (0);
- fprintf(stdout, "%s (binary='%s', status=unknown)\n", list[i].name, list[i].binary);
- break;
+ case GNUNET_ARM_SERVICE_STATUS_STOPPED:
+ if (show_all)
+ fprintf (stdout,
+ "%s (binary='%s', status=stopped)\n",
+ list[i].name,
+ list[i].binary);
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_FAILED:
+ restart_in = GNUNET_TIME_absolute_get_remaining (list[i].restart_at);
+ fprintf (stdout,
+ "%s (binary='%s', status=failed, exit_status=%d, restart_delay='%s')\n",
+ list[i].name,
+ list[i].binary,
+ list[i].last_exit_status,
+ GNUNET_STRINGS_relative_time_to_string (restart_in,
+ GNUNET_YES));
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_FINISHED:
+ fprintf (stdout,
+ "%s (binary='%s', status=finished)\n",
+ list[i].name,
+ list[i].binary);
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_STARTED:
+ fprintf (stdout,
+ "%s (binary='%s', status=started)\n",
+ list[i].name,
+ list[i].binary);
+ break;
+ case GNUNET_ARM_SERVICE_STATUS_STOPPING:
+ fprintf (stdout,
+ "%s (binary='%s', status=stopping)\n",
+ list[i].name,
+ list[i].binary);
+ break;
+ default:
+ GNUNET_break_op (0);
+ fprintf (stdout,
+ "%s (binary='%s', status=unknown)\n",
+ list[i].name,
+ list[i].binary);
+ break;
}
}
- al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
+ al_task = GNUNET_SCHEDULER_add_now (&action_loop,
+ NULL);
}
@@ -670,91 +725,115 @@ list_callback(void *cls,
* @param cls closure, unused
*/
static void
-action_loop(void *cls)
+action_loop (void *cls)
{
- (void)cls;
+ (void) cls;
al_task = NULL;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Running requested actions\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Running requested actions\n");
while (1)
+ {
+ switch (phase++)
{
- switch (phase++)
+ case 0:
+ if (NULL != term)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Termination action\n");
+ op = GNUNET_ARM_request_service_stop (h,
+ term,
+ &term_callback,
+ NULL);
+ return;
+ }
+ break;
+
+ case 1:
+ if (end || restart)
+ {
+ if (GNUNET_YES !=
+ GNUNET_CLIENT_test (cfg,
+ "arm"))
{
- case 0:
- if (NULL != term)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Termination action\n");
- op = GNUNET_ARM_request_service_stop(h, term, &term_callback, NULL);
- return;
- }
- break;
-
- case 1:
- if (end || restart)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "End action\n");
- op = GNUNET_ARM_request_service_stop(h, "arm", &stop_callback, NULL);
- return;
- }
- break;
-
- case 2:
- if (start)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Start action\n");
- op =
- GNUNET_ARM_request_service_start(h,
- "arm",
- (no_stdout
- ? 0
- : GNUNET_OS_INHERIT_STD_OUT) |
- (no_stderr
- ? 0
- : GNUNET_OS_INHERIT_STD_ERR),
- &start_callback,
- NULL);
- return;
- }
- break;
-
- case 3:
- if (NULL != init)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initialization action\n");
- op = GNUNET_ARM_request_service_start(h,
- init,
- GNUNET_OS_INHERIT_STD_NONE,
- &init_callback,
- NULL);
- return;
- }
- break;
-
- case 4:
- if (list)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Going to list all running services controlled by ARM.\n");
- op = GNUNET_ARM_request_service_list(h, &list_callback, &list);
- return;
- }
- break;
-
- case 5:
- if (monitor)
- {
- if (!quiet)
- fprintf(stderr, _("Now only monitoring, press CTRL-C to stop.\n"));
- quiet =
- 0; /* does not make sense to stay quiet in monitor mode at this time */
- return; /* done with tasks, just monitor */
- }
- break;
-
- default: /* last phase */
- GNUNET_SCHEDULER_shutdown();
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "GNUnet not running, cannot stop the peer\n");
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "End action\n");
+ op = GNUNET_ARM_request_service_stop (h,
+ "arm",
+ &stop_callback,
+ NULL);
return;
}
+ }
+ break;
+
+ case 2:
+ if (start)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Start action\n");
+ op =
+ GNUNET_ARM_request_service_start (h,
+ "arm",
+ (no_stdout
+ ? 0
+ : GNUNET_OS_INHERIT_STD_OUT)
+ | (no_stderr
+ ? 0
+ : GNUNET_OS_INHERIT_STD_ERR),
+ &start_callback,
+ NULL);
+ return;
+ }
+ break;
+
+ case 3:
+ if (NULL != init)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Initialization action\n");
+ op = GNUNET_ARM_request_service_start (h,
+ init,
+ GNUNET_OS_INHERIT_STD_NONE,
+ &init_callback,
+ NULL);
+ return;
+ }
+ break;
+
+ case 4:
+ if (list)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Going to list all running services controlled by ARM.\n");
+ op = GNUNET_ARM_request_service_list (h,
+ &list_callback,
+ &list);
+ return;
+ }
+ break;
+
+ case 5:
+ if (monitor)
+ {
+ if (! quiet)
+ fprintf (stderr,
+ _ ("Now only monitoring, press CTRL-C to stop.\n"));
+ quiet =
+ 0; /* does not make sense to stay quiet in monitor mode at this time */
+ return; /* done with tasks, just monitor */
+ }
+ break;
+
+ default: /* last phase */
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
+ }
}
@@ -766,48 +845,50 @@ action_loop(void *cls)
* @param status status of the service
*/
static void
-srv_status(void *cls,
- const char *service,
- enum GNUNET_ARM_ServiceMonitorStatus status)
+srv_status (void *cls,
+ const char *service,
+ enum GNUNET_ARM_ServiceMonitorStatus status)
{
const char *msg;
- (void)cls;
+ (void) cls;
switch (status)
- {
- case GNUNET_ARM_SERVICE_MONITORING_STARTED:
- return; /* this should be done silently */
+ {
+ case GNUNET_ARM_SERVICE_MONITORING_STARTED:
+ return; /* this should be done silently */
- case GNUNET_ARM_SERVICE_STOPPED:
- msg = _("Stopped %s.\n");
- break;
+ case GNUNET_ARM_SERVICE_STOPPED:
+ msg = _ ("Stopped %s.\n");
+ break;
- case GNUNET_ARM_SERVICE_STARTING:
- msg = _("Starting %s...\n");
- break;
+ case GNUNET_ARM_SERVICE_STARTING:
+ msg = _ ("Starting %s...\n");
+ break;
- case GNUNET_ARM_SERVICE_STOPPING:
- msg = _("Stopping %s...\n");
- break;
+ case GNUNET_ARM_SERVICE_STOPPING:
+ msg = _ ("Stopping %s...\n");
+ break;
- default:
- msg = NULL;
- break;
- }
- if (!quiet)
- {
- if (NULL != msg)
- fprintf(stderr, msg, service);
- else
- fprintf(stderr,
- _("Unknown status %u for service %s.\n"),
- status,
- service);
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Got service %s status %d\n",
- service,
- (int)status);
+ default:
+ msg = NULL;
+ break;
+ }
+ if (! quiet)
+ {
+ if (NULL != msg)
+ fprintf (stderr,
+ msg,
+ service);
+ else
+ fprintf (stderr,
+ _ ("Unknown status %u for service %s.\n"),
+ status,
+ service);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got service %s status %d\n",
+ service,
+ (int) status);
}
@@ -815,12 +896,12 @@ srv_status(void *cls,
* Task run on timeout (if -T is given).
*/
static void
-timeout_task_cb(void *cls)
+timeout_task_cb (void *cls)
{
- (void)cls;
+ (void) cls;
timeout_task = NULL;
ret = 2;
- GNUNET_SCHEDULER_shutdown();
+ GNUNET_SCHEDULER_shutdown ();
}
@@ -833,34 +914,47 @@ timeout_task_cb(void *cls)
* @param c configuration
*/
static void
-run(void *cls,
- char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
- (void)cls;
- (void)args;
- (void)cfgfile;
- cfg = GNUNET_CONFIGURATION_dup(c);
+ (void) cls;
+ (void) args;
+ (void) cfgfile;
+ cfg = GNUNET_CONFIGURATION_dup (c);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_HOME", &dir))
- {
- GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR, "PATHS", "GNUNET_HOME");
- return;
- }
- (void)GNUNET_CONFIGURATION_get_value_filename(cfg,
- "arm",
- "CONFIG",
- &config_file);
- if (NULL == (h = GNUNET_ARM_connect(cfg, &conn_status, NULL)))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "PATHS",
+ "GNUNET_HOME",
+ &dir))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "PATHS",
+ "GNUNET_HOME");
+ return;
+ }
+ (void) GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "arm",
+ "CONFIG",
+ &config_file);
+ if (NULL == (h = GNUNET_ARM_connect (cfg,
+ &conn_status,
+ NULL)))
return;
if (monitor)
- m = GNUNET_ARM_monitor_start(cfg, &srv_status, NULL);
- al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
- GNUNET_SCHEDULER_add_shutdown(&shutdown_task, NULL);
+ m = GNUNET_ARM_monitor_start (cfg,
+ &srv_status,
+ NULL);
+ al_task = GNUNET_SCHEDULER_add_now (&action_loop,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
if (0 != timeout.rel_value_us)
timeout_task =
- GNUNET_SCHEDULER_add_delayed(timeout, &timeout_task_cb, NULL);
+ GNUNET_SCHEDULER_add_delayed (timeout,
+ &timeout_task_cb,
+ NULL);
}
@@ -872,92 +966,98 @@ run(void *cls,
* @return 0 ok, 1 on error, 2 on timeout
*/
int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
{
- struct GNUNET_GETOPT_CommandLineOption options[] =
- { GNUNET_GETOPT_option_flag('e',
- "end",
- gettext_noop("stop all GNUnet services"),
- &end),
- GNUNET_GETOPT_option_string('i',
- "init",
- "SERVICE",
- gettext_noop("start a particular service"),
- &init),
- GNUNET_GETOPT_option_string('k',
- "kill",
- "SERVICE",
- gettext_noop("stop a particular service"),
- &term),
- GNUNET_GETOPT_option_flag('a',
- "all",
- gettext_noop("also show stopped services (used with -I)"),
- &show_all),
- GNUNET_GETOPT_option_flag('s',
- "start",
- gettext_noop(
- "start all GNUnet default services"),
- &start),
- GNUNET_GETOPT_option_flag('r',
- "restart",
- gettext_noop(
- "stop and start all GNUnet default services"),
- &restart),
- GNUNET_GETOPT_option_flag('d',
- "delete",
- gettext_noop(
- "delete config file and directory on exit"),
- &delete),
- GNUNET_GETOPT_option_flag('m',
- "monitor",
- gettext_noop("monitor ARM activities"),
- &monitor),
- GNUNET_GETOPT_option_flag('q',
- "quiet",
- gettext_noop("don't print status messages"),
- &quiet),
- GNUNET_GETOPT_option_relative_time(
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_option_flag ('e',
+ "end",
+ gettext_noop ("stop all GNUnet services"),
+ &end),
+ GNUNET_GETOPT_option_string ('i',
+ "init",
+ "SERVICE",
+ gettext_noop ("start a particular service"),
+ &init),
+ GNUNET_GETOPT_option_string ('k',
+ "kill",
+ "SERVICE",
+ gettext_noop ("stop a particular service"),
+ &term),
+ GNUNET_GETOPT_option_flag ('a',
+ "all",
+ gettext_noop (
+ "also show stopped services (used with -I)"),
+ &show_all),
+ GNUNET_GETOPT_option_flag ('s',
+ "start",
+ gettext_noop (
+ "start all GNUnet default services"),
+ &start),
+ GNUNET_GETOPT_option_flag ('r',
+ "restart",
+ gettext_noop (
+ "stop and start all GNUnet default services"),
+ &restart),
+ GNUNET_GETOPT_option_flag ('d',
+ "delete",
+ gettext_noop (
+ "delete config file and directory on exit"),
+ &delete),
+ GNUNET_GETOPT_option_flag ('m',
+ "monitor",
+ gettext_noop ("monitor ARM activities"),
+ &monitor),
+ GNUNET_GETOPT_option_flag ('q',
+ "quiet",
+ gettext_noop ("don't print status messages"),
+ &quiet),
+ GNUNET_GETOPT_option_relative_time (
'T',
"timeout",
"DELAY",
- gettext_noop(
+ gettext_noop (
"exit with error status if operation does not finish after DELAY"),
&timeout),
- GNUNET_GETOPT_option_flag('I',
- "info",
- gettext_noop(
- "list currently running services"),
- &list),
- GNUNET_GETOPT_option_flag(
+ GNUNET_GETOPT_option_flag ('I',
+ "info",
+ gettext_noop (
+ "list currently running services"),
+ &list),
+ GNUNET_GETOPT_option_flag (
'O',
"no-stdout",
- gettext_noop("don't let gnunet-service-arm inherit standard output"),
+ gettext_noop ("don't let gnunet-service-arm inherit standard output"),
&no_stdout),
- GNUNET_GETOPT_option_flag(
+ GNUNET_GETOPT_option_flag (
'E',
"no-stderr",
- gettext_noop("don't let gnunet-service-arm inherit standard error"),
+ gettext_noop ("don't let gnunet-service-arm inherit standard error"),
&no_stderr),
- GNUNET_GETOPT_OPTION_END };
+ GNUNET_GETOPT_OPTION_END
+ };
int lret;
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_get_utf8_args (argc,
+ argv,
+ &argc,
+ &argv))
return 2;
if (GNUNET_OK ==
- (lret = GNUNET_PROGRAM_run(
+ (lret = GNUNET_PROGRAM_run (
argc,
argv,
"gnunet-arm",
- gettext_noop(
+ gettext_noop (
"Control services and the Automated Restart Manager (ARM)"),
options,
&run,
NULL)))
- {
- GNUNET_free((void *)argv);
- return ret;
- }
- GNUNET_free((void *)argv);
+ {
+ GNUNET_free ((void *) argv);
+ return ret;
+ }
+ GNUNET_free ((void *) argv);
return lret;
}
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 352ccce04..1ddcbf090 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -90,24 +90,24 @@ static int global_ret;
* @param cls unused
*/
static void
-do_shutdown(void *cls)
+do_shutdown (void *cls)
{
- (void)cls;
+ (void) cls;
if (NULL != to_task)
- {
- GNUNET_SCHEDULER_cancel(to_task);
- to_task = NULL;
- }
+ {
+ GNUNET_SCHEDULER_cancel (to_task);
+ to_task = NULL;
+ }
if (NULL != lr)
- {
- GNUNET_GNS_lookup_with_tld_cancel(lr);
- lr = NULL;
- }
+ {
+ GNUNET_GNS_lookup_with_tld_cancel (lr);
+ lr = NULL;
+ }
if (NULL != gns)
- {
- GNUNET_GNS_disconnect(gns);
- gns = NULL;
- }
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
+ }
}
/**
@@ -116,11 +116,11 @@ do_shutdown(void *cls)
* @param cls unused
*/
static void
-do_timeout(void* cls)
+do_timeout (void*cls)
{
to_task = NULL;
- global_ret = 3; //Timeout
- GNUNET_SCHEDULER_shutdown();
+ global_ret = 3; // Timeout
+ GNUNET_SCHEDULER_shutdown ();
}
/**
@@ -132,10 +132,10 @@ do_timeout(void* cls)
* @param rd array of @a rd_count records with the results
*/
static void
-process_lookup_result(void *cls,
- int was_gns,
- uint32_t rd_count,
- const struct GNUNET_GNSRECORD_Data *rd)
+process_lookup_result (void *cls,
+ int was_gns,
+ uint32_t rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
const char *name = cls;
const char *typename;
@@ -143,41 +143,41 @@ process_lookup_result(void *cls,
lr = NULL;
if (GNUNET_NO == was_gns)
- {
- global_ret = 4; /* not for GNS */
- GNUNET_SCHEDULER_shutdown();
- return;
- }
- if (!raw)
- {
- if (0 == rd_count)
- printf("No results.\n");
- else
- printf("%s:\n", name);
- }
+ {
+ global_ret = 4; /* not for GNS */
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ if (! raw)
+ {
+ if (0 == rd_count)
+ printf ("No results.\n");
+ else
+ printf ("%s:\n", name);
+ }
for (uint32_t i = 0; i < rd_count; i++)
+ {
+ if ((rd[i].record_type != rtype) && (GNUNET_GNSRECORD_TYPE_ANY != rtype))
+ continue;
+ typename = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+ string_val = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
+ rd[i].data,
+ rd[i].data_size);
+ if (NULL == string_val)
{
- if ((rd[i].record_type != rtype) && (GNUNET_GNSRECORD_TYPE_ANY != rtype))
- continue;
- typename = GNUNET_GNSRECORD_number_to_typename(rd[i].record_type);
- string_val = GNUNET_GNSRECORD_value_to_string(rd[i].record_type,
- rd[i].data,
- rd[i].data_size);
- if (NULL == string_val)
- {
- fprintf(stderr,
- "Record %u of type %d malformed, skipping\n",
- (unsigned int)i,
- (int)rd[i].record_type);
- continue;
- }
- if (raw)
- printf("%s\n", string_val);
- else
- printf("Got `%s' record: %s\n", typename, string_val);
- GNUNET_free(string_val);
+ fprintf (stderr,
+ "Record %u of type %d malformed, skipping\n",
+ (unsigned int) i,
+ (int) rd[i].record_type);
+ continue;
}
- GNUNET_SCHEDULER_shutdown();
+ if (raw)
+ printf ("%s\n", string_val);
+ else
+ printf ("Got `%s' record: %s\n", typename, string_val);
+ GNUNET_free (string_val);
+ }
+ GNUNET_SCHEDULER_shutdown ();
}
@@ -190,53 +190,69 @@ process_lookup_result(void *cls,
* @param c configuration
*/
static void
-run(void *cls,
- char *const *args,
- const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
- (void)cls;
- (void)args;
- (void)cfgfile;
+ (void) cls;
+ (void) args;
+ (void) cfgfile;
cfg = c;
to_task = NULL;
- if (GNUNET_OK != GNUNET_DNSPARSER_check_name(lookup_name))
- {
- fprintf(stderr, _("`%s' is not a valid domain name\n"), lookup_name);
- global_ret = 3;
- return;
- }
- to_task = GNUNET_SCHEDULER_add_delayed(timeout, &do_timeout, NULL);
- gns = GNUNET_GNS_connect(cfg);
+ if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name))
+ {
+ fprintf (stderr,
+ _ ("`%s' is not a valid domain name\n"),
+ lookup_name);
+ global_ret = 3;
+ return;
+ }
+ if (GNUNET_YES !=
+ GNUNET_CLIENT_test (cfg,
+ "arm"))
+ {
+ fprintf (stderr,
+ _ ("GNUnet not running\n"));
+ global_ret = 2;
+ return;
+ }
+ to_task = GNUNET_SCHEDULER_add_delayed (timeout,
+ &do_timeout,
+ NULL);
+ gns = GNUNET_GNS_connect (cfg);
if (NULL == gns)
- {
- fprintf(stderr, _("Failed to connect to GNS\n"));
- global_ret = 2;
- return;
- }
- GNUNET_SCHEDULER_add_shutdown(&do_shutdown, NULL);
+ {
+ fprintf (stderr,
+ _ ("Failed to connect to GNS\n"));
+ global_ret = 2;
+ return;
+ }
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
if (NULL != lookup_type)
- rtype = GNUNET_GNSRECORD_typename_to_number(lookup_type);
+ rtype = GNUNET_GNSRECORD_typename_to_number (lookup_type);
else
rtype = GNUNET_DNSPARSER_TYPE_A;
if (UINT32_MAX == rtype)
- {
- fprintf(stderr, _("Invalid typename specified, assuming `ANY'\n"));
- rtype = GNUNET_GNSRECORD_TYPE_ANY;
- }
- lr = GNUNET_GNS_lookup_with_tld(gns,
- lookup_name,
- rtype,
- GNUNET_GNS_LO_DEFAULT,
- &process_lookup_result,
- lookup_name);
+ {
+ fprintf (stderr,
+ _ ("Invalid typename specified, assuming `ANY'\n"));
+ rtype = GNUNET_GNSRECORD_TYPE_ANY;
+ }
+ lr = GNUNET_GNS_lookup_with_tld (gns,
+ lookup_name,
+ rtype,
+ GNUNET_GNS_LO_DEFAULT,
+ &process_lookup_result,
+ lookup_name);
if (NULL == lr)
- {
- global_ret = 2;
- GNUNET_SCHEDULER_shutdown();
- return;
- }
+ {
+ global_ret = 2;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
}
@@ -248,48 +264,50 @@ run(void *cls,
* @return 0 ok, 1 on error
*/
int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
{
timeout = GNUNET_TIME_UNIT_FOREVER_REL;
struct GNUNET_GETOPT_CommandLineOption options[] =
- { GNUNET_GETOPT_option_mandatory(
- GNUNET_GETOPT_option_string('u',
- "lookup",
- "NAME",
- gettext_noop(
- "Lookup a record for the given name"),
- &lookup_name)),
- GNUNET_GETOPT_option_string('t',
- "type",
- "TYPE",
- gettext_noop(
- "Specify the type of the record to lookup"),
- &lookup_type),
- GNUNET_GETOPT_option_relative_time('T',
- "timeout",
- "TIMEOUT",
- gettext_noop(
- "Specify a timeout for the lookup"),
- &timeout),
- GNUNET_GETOPT_option_flag('r',
- "raw",
- gettext_noop("No unneeded output"),
- &raw),
+ { GNUNET_GETOPT_option_mandatory (
+ GNUNET_GETOPT_option_string ('u',
+ "lookup",
+ "NAME",
+ gettext_noop (
+ "Lookup a record for the given name"),
+ &lookup_name)),
+ GNUNET_GETOPT_option_string ('t',
+ "type",
+ "TYPE",
+ gettext_noop (
+ "Specify the type of the record to lookup"),
+ &lookup_type),
+ GNUNET_GETOPT_option_relative_time ('T',
+ "timeout",
+ "TIMEOUT",
+ gettext_noop (
+ "Specify a timeout for the lookup"),
+ &timeout),
+ GNUNET_GETOPT_option_flag ('r',
+ "raw",
+ gettext_noop ("No unneeded output"),
+ &raw),
GNUNET_GETOPT_OPTION_END };
int ret;
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_get_utf8_args (argc, argv,
+ &argc, &argv))
return 2;
- GNUNET_log_setup("gnunet-gns", "WARNING", NULL);
- ret = GNUNET_PROGRAM_run(argc,
- argv,
- "gnunet-gns",
- _("GNUnet GNS resolver tool"),
- options,
- &run,
- NULL);
- GNUNET_free((void *)argv);
+ GNUNET_log_setup ("gnunet-gns", "WARNING", NULL);
+ ret = GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-gns",
+ _ ("GNUnet GNS resolver tool"),
+ options,
+ &run,
+ NULL);
+ GNUNET_free ((void *) argv);
if (GNUNET_OK != ret)
return 1;
return global_ret;