projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://gnunet.org/gnunet
[oweals/gnunet.git]
/
src
/
transport
/
test_transport_testing_restart.c
diff --git
a/src/transport/test_transport_testing_restart.c
b/src/transport/test_transport_testing_restart.c
index 188cc20b599b85bb78032274634e55dc7c488076..4df8b2d6d5622f97b15bef160950671ddb865281 100644
(file)
--- a/
src/transport/test_transport_testing_restart.c
+++ b/
src/transport/test_transport_testing_restart.c
@@
-1,81
+1,78
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- Copyright (C) 2009, 2010
Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010
, 2016 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
- by the Free Software Foundation
; either version 3, or (at your
- option) any later version.
+ GNUnet is free software
: you can redistribute it and/or modify it
+
under the terms of the GNU Affero
General Public License as published
+ by the Free Software Foundation
, either version 3 of the License,
+ o
r (at your o
ption) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ 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/>.
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file transport/test_transport_testing_restart.c
* @brief test case for transport testing library:
* start the peer, get the HELLO message, restart and stop the peer
*/
/**
* @file transport/test_transport_testing_restart.c
* @brief test case for transport testing library:
* start the peer, get the HELLO message, restart and stop the peer
- *
*/
#include "platform.h"
#include "gnunet_transport_service.h"
#include "transport-testing.h"
*/
#include "platform.h"
#include "gnunet_transport_service.h"
#include "transport-testing.h"
-/**
- * How long until we give up on transmitting the message?
- */
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-struct GNUNET_SCHEDULER_Task * timeout_task;
-static struct PeerContext *p;
+static struct GNUNET_SCHEDULER_Task *timeout_task;
+
+static struct GNUNET_TRANSPORT_TESTING_PeerContext *p;
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_Handle *tth;
+
+static int ret;
-static int ret = 0;
static void
end ()
{
static void
end ()
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Stopping peers\n");
-
- if (
timeout_task != NULL
)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Stopping peers\n");
+ if (
NULL != timeout_task
)
GNUNET_SCHEDULER_cancel (timeout_task);
GNUNET_SCHEDULER_cancel (timeout_task);
-
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
- GNUNET_TRANSPORT_TESTING_done (tth);
+ if (NULL != p)
+ GNUNET_TRANSPORT_TESTING_stop_peer (p);
+ if (NULL != tth)
+ GNUNET_TRANSPORT_TESTING_done (tth);
}
}
+
static void
end_badly ()
{
timeout_task = NULL;
static void
end_badly ()
{
timeout_task = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
-
- if (NULL != p)
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
-
- if (NULL != tth)
- GNUNET_TRANSPORT_TESTING_done (tth);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Timeout!\n");
+ end ();
ret = GNUNET_SYSERR;
}
ret = GNUNET_SYSERR;
}
+
static void
static void
-restart_cb (
struct PeerContext *p,
void *cls)
+restart_cb (void *cls)
{
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') successfully restarted\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%s') successfully restarted\n",
p->no,
GNUNET_i2s (&p->id));
p->no,
GNUNET_i2s (&p->id));
-
ret = 0;
ret = 0;
- GNUNET_SCHEDULER_add_now (&end, NULL);
+ GNUNET_SCHEDULER_add_now (&end,
+ NULL);
}
}
@@
-83,73
+80,83
@@
static void
restart_task ()
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
restart_task ()
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer %u (`%s') restarting
,
\n",
+ "Peer %u (`%s') restarting\n",
p->no,
GNUNET_i2s (&p->id));
GNUNET_TRANSPORT_TESTING_restart_peer (p,
p->no,
GNUNET_i2s (&p->id));
GNUNET_TRANSPORT_TESTING_restart_peer (p,
- NULL,
&restart_cb,
p);
}
static void
&restart_cb,
p);
}
static void
-start_cb (
struct PeerContext *p,
void *cls)
+start_cb (void *cls)
{
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer %u (`%s') successfully started\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u (`%s') successfully started\n",
p->no,
GNUNET_i2s (&p->id));
p->no,
GNUNET_i2s (&p->id));
-
-
GNUNET_SCHEDULER_add_now (&restart_task,
NULL);
+ GNUNET_SCHEDULER_add_now (&restart_task,
+
NULL);
}
static void
}
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
ret = 1;
tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_assert (NULL != tth);
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
ret = 1;
tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_assert (NULL != tth);
- timeout_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, &end_badly, NULL);
-
- p = GNUNET_TRANSPORT_TESTING_start_peer(tth, cfgfile, 1,
+ timeout_task
+ = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly,
+ NULL);
+ p = GNUNET_TRANSPORT_TESTING_start_peer(tth,
+ cfgfile,
+ 1,
NULL, /* receive cb */
NULL, /* connect cb */
NULL, /* disconnect cb */
NULL, /* receive cb */
NULL, /* connect cb */
NULL, /* disconnect cb */
+ NULL, /* nc/nd closure */
start_cb, /* startup cb */
NULL); /* closure */
if (NULL == p)
{
start_cb, /* startup cb */
NULL); /* closure */
if (NULL == p)
{
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG, "Failed to start peer\n");
- if (timeout_task != NULL)
-
GNUNET_SCHEDULER_cancel (timeout_task
);
-
timeout_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL)
;
+ GNUNET_log (GNUNET_ERROR_TYPE_
ERROR,
+ "Failed to start peer\n");
+
end (
);
+
ret = 1
;
}
}
}
}
+
int
int
-main (int argc, char *argv[])
+main (int argc,
+ char *argv[])
{
{
- GNUNET_log_setup ("test_transport_testing_restart",
- "WARNING",
- NULL);
-
char *const argv_1[] = { "test_transport_testing_restart",
"-c",
"test_transport_api_data.conf",
NULL
};
char *const argv_1[] = { "test_transport_testing_restart",
"-c",
"test_transport_api_data.conf",
NULL
};
-
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
- GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1, argv_1,
- "test_transport_testing_restart", "nohelp", options, &run, &ret);
-
+ GNUNET_log_setup ("test_transport_testing_restart",
+ "WARNING",
+ NULL);
+ GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1,
+ argv_1,
+ "test_transport_testing_restart",
+ "nohelp",
+ options,
+ &run,
+ NULL);
return ret;
}
return ret;
}