projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix
[oweals/gnunet.git]
/
src
/
transport
/
test_transport_api.c
diff --git
a/src/transport/test_transport_api.c
b/src/transport/test_transport_api.c
index 4456c1dbf270ad824a2a3ee95962fc8c9aab34e7..30f4bbbabe632aa93776dc02def02291b2a61e4b 100644
(file)
--- a/
src/transport/test_transport_api.c
+++ b/
src/transport/test_transport_api.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009, 2010 Christian Grothoff (and other contributing authors)
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.
*/
/**
* @file transport/test_transport_api.c
*/
/**
* @file transport/test_transport_api.c
@@
-58,9
+58,9
@@
static int s_connected;
static int s_sending;
static int s_sending;
-static
GNUNET_SCHEDULER_TaskIdentifier
die_task;
+static
struct GNUNET_SCHEDULER_Task *
die_task;
-static
GNUNET_SCHEDULER_TaskIdentifier
send_task;
+static
struct GNUNET_SCHEDULER_Task *
send_task;
static struct PeerContext *p1;
static struct PeerContext *p1;
@@
-82,10
+82,10
@@
end ()
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping peers\n");
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping peers\n");
- if (send_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (send_task !=
NULL
)
GNUNET_SCHEDULER_cancel (send_task);
GNUNET_SCHEDULER_cancel (send_task);
- if (die_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (die_task !=
NULL
)
GNUNET_SCHEDULER_cancel (die_task);
if (th != NULL)
GNUNET_SCHEDULER_cancel (die_task);
if (th != NULL)
@@
-99,12
+99,12
@@
end ()
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task =
GNUNET_SCHEDULER_NO_TASK
;
+ die_task =
NULL
;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fail! Stopping peers\n");
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fail! Stopping peers\n");
- if (send_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (send_task !=
NULL
)
GNUNET_SCHEDULER_cancel (send_task);
if (cc != NULL)
GNUNET_SCHEDULER_cancel (send_task);
if (cc != NULL)
@@
-197,7
+197,7
@@
notify_ready (void *cls, size_t size, void *buf)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
- if (
GNUNET_SCHEDULER_NO_TASK
!= die_task)
+ if (
NULL
!= die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
@@
-227,7
+227,7
@@
notify_ready (void *cls, size_t size, void *buf)
static void
sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- send_task =
GNUNET_SCHEDULER_NO_TASK
;
+ send_task =
NULL
;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
@@
-351,7
+351,7
@@
run (void *cls, char *const *args, const char *cfgfile,
if ((p1 == NULL) || (p2 == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
if ((p1 == NULL) || (p2 == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
- if (die_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (die_task !=
NULL
)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
@@
-371,7
+371,7
@@
check ()
GNUNET_GETOPT_OPTION_END
};
GNUNET_GETOPT_OPTION_END
};
- send_task =
GNUNET_SCHEDULER_NO_TASK
;
+ send_task =
NULL
;
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,