projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
porting xdht to new service API, major code de-duplication effort
[oweals/gnunet.git]
/
src
/
core
/
gnunet-core.c
diff --git
a/src/core/gnunet-core.c
b/src/core/gnunet-core.c
index 25127da6642a13427261ec7ec02251639ee3dd27..d91dc304d5c1b88152b44f994e958f9d221f9fea 100644
(file)
--- a/
src/core/gnunet-core.c
+++ b/
src/core/gnunet-core.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2011, 2012, 2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012, 2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-44,11
+44,9
@@
static struct GNUNET_CORE_MonitorHandle *mh;
* Stops monitoring activity.
*
* @param cls NULL
* Stops monitoring activity.
*
* @param cls NULL
- * @param tc scheduler context
*/
static void
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != mh)
{
{
if (NULL != mh)
{
@@
-119,10
+117,12
@@
monitor_cb (void *cls,
}
now_str = GNUNET_STRINGS_absolute_time_to_string (now);
FPRINTF (stdout,
}
now_str = GNUNET_STRINGS_absolute_time_to_string (now);
FPRINTF (stdout,
- _("%24s: %-
17s %4s
\n"),
+ _("%24s: %-
30s %4s (timeout in %6s)
\n"),
now_str,
state_str,
now_str,
state_str,
- GNUNET_i2s (peer));
+ GNUNET_i2s (peer),
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (timeout),
+ GNUNET_YES));
}
}
@@
-155,8
+155,7
@@
run (void *cls, char *const *args, const char *cfgfile,
_("Failed to connect to CORE service!\n"));
return;
}
_("Failed to connect to CORE service!\n"));
return;
}
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
}
}