aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_connection_addressing.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2009-11-01 20:47:52 +0000
committerChristian Grothoff <christian@grothoff.org>2009-11-01 20:47:52 +0000
commit652e89b59ed2207c2c12172fdabcd6e659995c81 (patch)
treef054c819d483c1056e18c1099afd4c7fcd2582a0 /src/util/test_connection_addressing.c
parent5e4113e83368849500792e57946c3d8dd9e548d8 (diff)
downloadgnunet-652e89b59ed2207c2c12172fdabcd6e659995c81.tar.gz
gnunet-652e89b59ed2207c2c12172fdabcd6e659995c81.zip
fixing bio testcase and a bug in bio.c, also indenting
Diffstat (limited to 'src/util/test_connection_addressing.c')
-rw-r--r--src/util/test_connection_addressing.c57
1 files changed, 29 insertions, 28 deletions
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index f37352c67..1b85dfac6 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -63,12 +63,13 @@ open_listen_socket ()
63 sa.sin_port = htons (PORT); 63 sa.sin_port = htons (PORT);
64 desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); 64 desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0);
65 GNUNET_assert (desc != 0); 65 GNUNET_assert (desc != 0);
66 if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) 66 if (GNUNET_NETWORK_socket_setsockopt
67 (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
67 GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, 68 GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
68 "setsockopt"); 69 "setsockopt");
69 GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, 70 GNUNET_assert (GNUNET_NETWORK_socket_bind
70 (const struct sockaddr*) &sa, 71 (desc, (const struct sockaddr *) &sa,
71 sizeof (sa)) == GNUNET_OK); 72 sizeof (sa)) == GNUNET_OK);
72 GNUNET_NETWORK_socket_listen (desc, 5); 73 GNUNET_NETWORK_socket_listen (desc, 5);
73 return desc; 74 return desc;
74} 75}
@@ -88,10 +89,10 @@ receive_check (void *cls,
88 if (sofar < 12) 89 if (sofar < 12)
89 { 90 {
90 GNUNET_CONNECTION_receive (asock, 91 GNUNET_CONNECTION_receive (asock,
91 1024, 92 1024,
92 GNUNET_TIME_relative_multiply 93 GNUNET_TIME_relative_multiply
93 (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, 94 (GNUNET_TIME_UNIT_SECONDS, 5),
94 cls); 95 &receive_check, cls);
95 } 96 }
96 else 97 else
97 { 98 {
@@ -110,7 +111,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
110 struct sockaddr_in expect; 111 struct sockaddr_in expect;
111 112
112 asock = GNUNET_CONNECTION_create_from_accept (tc->sched, 113 asock = GNUNET_CONNECTION_create_from_accept (tc->sched,
113 NULL, NULL, ls, 1024); 114 NULL, NULL, ls, 1024);
114 GNUNET_assert (asock != NULL); 115 GNUNET_assert (asock != NULL);
115 GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); 116 GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));
116 GNUNET_assert (GNUNET_OK == 117 GNUNET_assert (GNUNET_OK ==
@@ -128,9 +129,10 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
128 GNUNET_free (addr); 129 GNUNET_free (addr);
129 GNUNET_CONNECTION_destroy (lsock); 130 GNUNET_CONNECTION_destroy (lsock);
130 GNUNET_CONNECTION_receive (asock, 131 GNUNET_CONNECTION_receive (asock,
131 1024, 132 1024,
132 GNUNET_TIME_relative_multiply 133 GNUNET_TIME_relative_multiply
133 (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls); 134 (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
135 cls);
134} 136}
135 137
136static size_t 138static size_t
@@ -156,23 +158,22 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
156 v4.sin_port = htons (PORT); 158 v4.sin_port = htons (PORT);
157 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); 159 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
158 csock = GNUNET_CONNECTION_create_from_sockaddr (tc->sched, 160 csock = GNUNET_CONNECTION_create_from_sockaddr (tc->sched,
159 AF_INET, 161 AF_INET,
160 (const struct sockaddr 162 (const struct sockaddr
161 *) &v4, sizeof (v4), 163 *) &v4, sizeof (v4), 1024);
162 1024);
163 GNUNET_assert (csock != NULL); 164 GNUNET_assert (csock != NULL);
164 GNUNET_assert (NULL != 165 GNUNET_assert (NULL !=
165 GNUNET_CONNECTION_notify_transmit_ready (csock, 166 GNUNET_CONNECTION_notify_transmit_ready (csock,
166 12, 167 12,
167 GNUNET_TIME_UNIT_SECONDS, 168 GNUNET_TIME_UNIT_SECONDS,
168 &make_hello, NULL)); 169 &make_hello, NULL));
169 GNUNET_CONNECTION_destroy (csock); 170 GNUNET_CONNECTION_destroy (csock);
170 GNUNET_SCHEDULER_add_read_net (tc->sched, 171 GNUNET_SCHEDULER_add_read_net (tc->sched,
171 GNUNET_NO, 172 GNUNET_NO,
172 GNUNET_SCHEDULER_PRIORITY_HIGH, 173 GNUNET_SCHEDULER_PRIORITY_HIGH,
173 GNUNET_SCHEDULER_NO_TASK, 174 GNUNET_SCHEDULER_NO_TASK,
174 GNUNET_TIME_UNIT_FOREVER_REL, 175 GNUNET_TIME_UNIT_FOREVER_REL,
175 ls, &run_accept, cls); 176 ls, &run_accept, cls);
176} 177}
177 178
178 179
@@ -197,13 +198,13 @@ main (int argc, char *argv[])
197{ 198{
198 int ret = 0; 199 int ret = 0;
199 200
200 GNUNET_log_setup ("test_connection_addressing", 201 GNUNET_log_setup ("test_connection_addressing",
201#if VERBOSE 202#if VERBOSE
202 "DEBUG", 203 "DEBUG",
203#else 204#else
204 "WARNING", 205 "WARNING",
205#endif 206#endif
206 NULL); 207 NULL);
207 ret += check (); 208 ret += check ();
208 return ret; 209 return ret;
209} 210}