projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-remove async ecc key generation, not needed
[oweals/gnunet.git]
/
src
/
util
/
program.c
diff --git
a/src/util/program.c
b/src/util/program.c
index 4985995b49def5946f2833322929a4a2369ec0f5..5cd129b47272964b978c4ce487dd5edae03061e6 100644
(file)
--- a/
src/util/program.c
+++ b/
src/util/program.c
@@
-78,6
+78,7
@@
GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg);
int
GNUNET_SPEEDUP_stop_ (void);
int
GNUNET_SPEEDUP_stop_ (void);
+
/**
* Initial task called by the scheduler for each
* program. Runs the program-specific main task.
/**
* Initial task called by the scheduler for each
* program. Runs the program-specific main task.
@@
-86,8
+87,10
@@
static void
program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct CommandContext *cc = cls;
program_main (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct CommandContext *cc = cls;
- GNUNET_SPEEDUP_start_(cc->cfg);
+ if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+ return;
+ GNUNET_SPEEDUP_start_(cc->cfg);
GNUNET_RESOLVER_connect (cc->cfg);
cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg);
}
GNUNET_RESOLVER_connect (cc->cfg);
cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg);
}
@@
-158,7
+161,7
@@
GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
GNUNET_GETOPT_OPTION_HELP (binaryHelp),
GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
GNUNET_GETOPT_OPTION_HELP (binaryHelp),
GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
GNUNET_GETOPT_OPTION_LOGFILE (&logfile),
- GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION)
+ GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION
" " VCS_VERSION
)
};
struct GNUNET_GETOPT_CommandLineOption *allopts;
const char *gargs;
};
struct GNUNET_GETOPT_CommandLineOption *allopts;
const char *gargs;