commit da4c0317d642b5d0e2fbf8d92446db879098517b
parent 8e34c4b9da209d60e83162f543da754de7ea5d20
Author: ng0 <ng0@n0.is>
Date: Tue, 26 Feb 2019 09:00:13 +0000
Merge branch 'master' of gnunet.org:gnunet
Diffstat:
3 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c
@@ -11,7 +11,7 @@
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Affero General Public License for more details.
-
+
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -135,10 +135,11 @@ reconnect (struct GNUNET_CORE_MonitorHandle *mh)
if (NULL == mh->mq)
return;
/* notify callback about reconnect */
- mh->peer_cb (mh->peer_cb_cls,
- NULL,
- GNUNET_CORE_KX_CORE_DISCONNECT,
- GNUNET_TIME_UNIT_FOREVER_ABS);
+ if (NULL != mh->peer_cb)
+ mh->peer_cb (mh->peer_cb_cls,
+ NULL,
+ GNUNET_CORE_KX_CORE_DISCONNECT,
+ GNUNET_TIME_UNIT_FOREVER_ABS);
env = GNUNET_MQ_msg (msg,
GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS);
GNUNET_MQ_send (mh->mq,
@@ -172,9 +173,9 @@ GNUNET_CORE_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
GNUNET_assert (NULL != peer_cb);
mh = GNUNET_new (struct GNUNET_CORE_MonitorHandle);
mh->cfg = cfg;
+ reconnect (mh);
mh->peer_cb = peer_cb;
mh->peer_cb_cls = peer_cb_cls;
- reconnect (mh);
if (NULL == mh->mq)
{
GNUNET_free (mh);
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
@@ -2976,6 +2976,8 @@ main (int argc, char *argv[])
GNUNET_GETOPT_OPTION_END
};
+ unsetenv ("XDG_DATA_HOME");
+ unsetenv ("XDG_CONFIG_HOME");
//if (GNUNET_OK !=
// GNUNET_STRINGS_get_utf8_args (argc, argv,
// &argc, &argv))
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
@@ -11,7 +11,7 @@
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Affero General Public License for more details.
-
+
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -276,27 +276,23 @@ int
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
-
GNUNET_GETOPT_option_uint ('p',
- "num-peers",
- "COUNT",
- gettext_noop ("create COUNT number of peers"),
- &num_peers),
-
+ "num-peers",
+ "COUNT",
+ gettext_noop ("create COUNT number of peers"),
+ &num_peers),
GNUNET_GETOPT_option_uint ('e',
- "num-errors",
- "COUNT",
- gettext_noop ("tolerate COUNT number of continious timeout failures"),
- &num_cont_fails),
-
+ "num-errors",
+ "COUNT",
+ gettext_noop ("tolerate COUNT number of continious timeout failures"),
+ &num_cont_fails),
GNUNET_GETOPT_option_flag ('n',
- "non-interactive",
- gettext_noop ("run profiler in non-interactive mode where upon "
- "testbed setup the profiler does not wait for a "
- "keystroke but continues to run until a termination "
- "signal is received"),
+ "non-interactive",
+ gettext_noop ("run profiler in non-interactive mode where upon "
+ "testbed setup the profiler does not wait for a "
+ "keystroke but continues to run until a termination "
+ "signal is received"),
&noninteractive),
-
#if !ENABLE_SUPERMUC
GNUNET_GETOPT_option_string ('H',
"hosts",
