aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_connection_addressing.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_addressing.c
parent7217c601ad30760872823193d62307e7a335d226 (diff)
downloadgnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.tar.gz
gnunet-75a33a1499cf60ea4364c9aa673816629a6c1413.zip
big scheduler refactoring, expect some issues
Diffstat (limited to 'src/util/test_connection_addressing.c')
-rw-r--r--src/util/test_connection_addressing.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 4c10bd074..f5328be92 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -115,8 +115,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
115 struct sockaddr_in *v4; 115 struct sockaddr_in *v4;
116 struct sockaddr_in expect; 116 struct sockaddr_in expect;
117 117
118 asock = GNUNET_CONNECTION_create_from_accept (tc->sched, 118 asock = GNUNET_CONNECTION_create_from_accept (NULL, NULL, ls);
119 NULL, NULL, ls);
120 GNUNET_assert (asock != NULL); 119 GNUNET_assert (asock != NULL);
121 GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); 120 GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));
122 GNUNET_assert (GNUNET_OK == 121 GNUNET_assert (GNUNET_OK ==
@@ -153,7 +152,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
153{ 152{
154 struct sockaddr_in v4; 153 struct sockaddr_in v4;
155 ls = open_listen_socket (); 154 ls = open_listen_socket ();
156 lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls); 155 lsock = GNUNET_CONNECTION_create_from_existing (ls);
157 GNUNET_assert (lsock != NULL); 156 GNUNET_assert (lsock != NULL);
158 157
159#if HAVE_SOCKADDR_IN_SIN_LEN 158#if HAVE_SOCKADDR_IN_SIN_LEN
@@ -162,8 +161,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
162 v4.sin_family = AF_INET; 161 v4.sin_family = AF_INET;
163 v4.sin_port = htons (PORT); 162 v4.sin_port = htons (PORT);
164 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); 163 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
165 csock = GNUNET_CONNECTION_create_from_sockaddr (tc->sched, 164 csock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET,
166 AF_INET,
167 (const struct sockaddr 165 (const struct sockaddr
168 *) &v4, sizeof (v4)); 166 *) &v4, sizeof (v4));
169 GNUNET_assert (csock != NULL); 167 GNUNET_assert (csock != NULL);
@@ -173,8 +171,7 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
173 GNUNET_TIME_UNIT_SECONDS, 171 GNUNET_TIME_UNIT_SECONDS,
174 &make_hello, NULL)); 172 &make_hello, NULL));
175 GNUNET_CONNECTION_destroy (csock, GNUNET_YES); 173 GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
176 GNUNET_SCHEDULER_add_read_net (tc->sched, 174 GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
177 GNUNET_TIME_UNIT_FOREVER_REL,
178 ls, &run_accept, cls); 175 ls, &run_accept, cls);
179} 176}
180 177