diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-11-01 20:47:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-11-01 20:47:52 +0000 |
commit | 652e89b59ed2207c2c12172fdabcd6e659995c81 (patch) | |
tree | f054c819d483c1056e18c1099afd4c7fcd2582a0 /src/util/test_connection_receive_cancel.c | |
parent | 5e4113e83368849500792e57946c3d8dd9e548d8 (diff) | |
download | gnunet-652e89b59ed2207c2c12172fdabcd6e659995c81.tar.gz gnunet-652e89b59ed2207c2c12172fdabcd6e659995c81.zip |
fixing bio testcase and a bug in bio.c, also indenting
Diffstat (limited to 'src/util/test_connection_receive_cancel.c')
-rw-r--r-- | src/util/test_connection_receive_cancel.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c index e985bf935..5856e27ed 100644 --- a/src/util/test_connection_receive_cancel.c +++ b/src/util/test_connection_receive_cancel.c | |||
@@ -62,12 +62,13 @@ open_listen_socket () | |||
62 | sa.sin_port = htons (PORT); | 62 | sa.sin_port = htons (PORT); |
63 | desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); | 63 | desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); |
64 | GNUNET_assert (desc != NULL); | 64 | GNUNET_assert (desc != NULL); |
65 | if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | 65 | if (GNUNET_NETWORK_socket_setsockopt |
66 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | ||
66 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 67 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
67 | "setsockopt"); | 68 | "setsockopt"); |
68 | GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, | 69 | GNUNET_assert (GNUNET_NETWORK_socket_bind |
69 | (const struct sockaddr*) &sa, | 70 | (desc, (const struct sockaddr *) &sa, |
70 | sizeof (sa)) == GNUNET_OK); | 71 | sizeof (sa)) == GNUNET_OK); |
71 | GNUNET_NETWORK_socket_listen (desc, 5); | 72 | GNUNET_NETWORK_socket_listen (desc, 5); |
72 | return desc; | 73 | return desc; |
73 | } | 74 | } |
@@ -89,15 +90,15 @@ run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
89 | { | 90 | { |
90 | 91 | ||
91 | asock = GNUNET_CONNECTION_create_from_accept (tc->sched, | 92 | asock = GNUNET_CONNECTION_create_from_accept (tc->sched, |
92 | NULL, NULL, ls, 1024); | 93 | NULL, NULL, ls, 1024); |
93 | GNUNET_assert (asock != NULL); | 94 | GNUNET_assert (asock != NULL); |
94 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); | 95 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); |
95 | GNUNET_CONNECTION_destroy (lsock); | 96 | GNUNET_CONNECTION_destroy (lsock); |
96 | GNUNET_CONNECTION_receive (asock, | 97 | GNUNET_CONNECTION_receive (asock, |
97 | 1024, | 98 | 1024, |
98 | GNUNET_TIME_relative_multiply | 99 | GNUNET_TIME_relative_multiply |
99 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, | 100 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, |
100 | cls); | 101 | cls); |
101 | } | 102 | } |
102 | 103 | ||
103 | 104 | ||
@@ -120,14 +121,14 @@ task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
120 | lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); | 121 | lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); |
121 | GNUNET_assert (lsock != NULL); | 122 | GNUNET_assert (lsock != NULL); |
122 | csock = GNUNET_CONNECTION_create_from_connect (tc->sched, cfg, | 123 | csock = GNUNET_CONNECTION_create_from_connect (tc->sched, cfg, |
123 | "localhost", PORT, 1024); | 124 | "localhost", PORT, 1024); |
124 | GNUNET_assert (csock != NULL); | 125 | GNUNET_assert (csock != NULL); |
125 | GNUNET_SCHEDULER_add_read_net (tc->sched, | 126 | GNUNET_SCHEDULER_add_read_net (tc->sched, |
126 | GNUNET_NO, | 127 | GNUNET_NO, |
127 | GNUNET_SCHEDULER_PRIORITY_HIGH, | 128 | GNUNET_SCHEDULER_PRIORITY_HIGH, |
128 | GNUNET_SCHEDULER_NO_TASK, | 129 | GNUNET_SCHEDULER_NO_TASK, |
129 | GNUNET_TIME_UNIT_FOREVER_REL, | 130 | GNUNET_TIME_UNIT_FOREVER_REL, |
130 | ls, &run_accept_cancel, cls); | 131 | ls, &run_accept_cancel, cls); |
131 | GNUNET_SCHEDULER_add_delayed (tc->sched, | 132 | GNUNET_SCHEDULER_add_delayed (tc->sched, |
132 | GNUNET_NO, | 133 | GNUNET_NO, |
133 | GNUNET_SCHEDULER_PRIORITY_KEEP, | 134 | GNUNET_SCHEDULER_PRIORITY_KEEP, |