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 2d06bf6681d9a4de10d21b4782c0d29f34348bb2..4df8b2d6d5622f97b15bef160950671ddb865281 100644
(file)
--- a/
src/transport/test_transport_testing_restart.c
+++ b/
src/transport/test_transport_testing_restart.c
@@
-2,20
+2,20
@@
This file is part of GNUnet.
Copyright (C) 2009, 2010, 2016 GNUnet e.V.
This file is part of GNUnet.
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
*/
/**
* @file transport/test_transport_testing_restart.c
@@
-64,15
+64,15
@@
end_badly ()
static void
static void
-restart_cb (struct GNUNET_TRANSPORT_TESTING_PeerContext *p,
- void *cls)
+restart_cb (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peer %u (`%s') successfully restarted\n",
p->no,
GNUNET_i2s (&p->id));
ret = 0;
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peer %u (`%s') successfully restarted\n",
p->no,
GNUNET_i2s (&p->id));
ret = 0;
- end ();
+ GNUNET_SCHEDULER_add_now (&end,
+ NULL);
}
}
@@
-90,8
+90,7
@@
restart_task ()
static void
static void
-start_cb (struct GNUNET_TRANSPORT_TESTING_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",
@@
-122,6
+121,7
@@
run (void *cls,
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)