aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_connection_receive_cancel.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-11-05 18:21:50 +0000
committerNathan S. Evans <evans@in.tum.de>2010-11-05 18:21:50 +0000
commit75a33a1499cf60ea4364c9aa673816629a6c1413 (patch)
tree0620da4312bb04de4d7b65074fdd3b0c3dd6cc0e /src/util/test_connection_receive_cancel.c
parent7217c601ad30760872823193d62307e7a335d226 (diff)
downloadgnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz
gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/util/test_connection_receive_cancel.c')
-rw-r--r--src/util/test_connection_receive_cancel.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index e4d7111d4..1e6720235 100644
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -90,8 +90,7 @@ static void
90run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 90run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
91{ 91{
92 92
93 asock = GNUNET_CONNECTION_create_from_accept (tc->sched, 93 asock = GNUNET_CONNECTION_create_from_accept (NULL, NULL, ls);
94 NULL, NULL, ls);
95 GNUNET_assert (asock != NULL); 94 GNUNET_assert (asock != NULL);
96 GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); 95 GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));
97 GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); 96 GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
@@ -119,16 +118,14 @@ static void
119task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 118task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
120{ 119{
121 ls = open_listen_socket (); 120 ls = open_listen_socket ();
122 lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls); 121 lsock = GNUNET_CONNECTION_create_from_existing (ls);
123 GNUNET_assert (lsock != NULL); 122 GNUNET_assert (lsock != NULL);
124 csock = GNUNET_CONNECTION_create_from_connect (tc->sched, cfg, 123 csock = GNUNET_CONNECTION_create_from_connect (cfg,
125 "localhost", PORT); 124 "localhost", PORT);
126 GNUNET_assert (csock != NULL); 125 GNUNET_assert (csock != NULL);
127 GNUNET_SCHEDULER_add_read_net (tc->sched, 126 GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
128 GNUNET_TIME_UNIT_FOREVER_REL,
129 ls, &run_accept_cancel, cls); 127 ls, &run_accept_cancel, cls);
130 GNUNET_SCHEDULER_add_delayed (tc->sched, 128 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
131 GNUNET_TIME_UNIT_SECONDS,
132 &receive_cancel_task, cls); 129 &receive_cancel_task, cls);
133} 130}
134 131