diff options
Diffstat (limited to 'src/util/test_connection_receive_cancel.c')
-rw-r--r-- | src/util/test_connection_receive_cancel.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c index bd095fdda..63829344d 100644 --- a/src/util/test_connection_receive_cancel.c +++ b/src/util/test_connection_receive_cancel.c | |||
@@ -65,11 +65,10 @@ open_listen_socket () | |||
65 | GNUNET_assert (desc != NULL); | 65 | GNUNET_assert (desc != NULL); |
66 | if (GNUNET_NETWORK_socket_setsockopt | 66 | if (GNUNET_NETWORK_socket_setsockopt |
67 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | 67 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) |
68 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 68 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt"); |
69 | "setsockopt"); | ||
70 | GNUNET_assert (GNUNET_NETWORK_socket_bind | 69 | GNUNET_assert (GNUNET_NETWORK_socket_bind |
71 | (desc, (const struct sockaddr *) &sa, | 70 | (desc, (const struct sockaddr *) &sa, |
72 | sizeof (sa)) == GNUNET_OK); | 71 | sizeof (sa)) == GNUNET_OK); |
73 | GNUNET_NETWORK_socket_listen (desc, 5); | 72 | GNUNET_NETWORK_socket_listen (desc, 5); |
74 | return desc; | 73 | return desc; |
75 | } | 74 | } |
@@ -78,7 +77,7 @@ open_listen_socket () | |||
78 | 77 | ||
79 | static void | 78 | static void |
80 | dead_receive (void *cls, const void *buf, size_t available, | 79 | dead_receive (void *cls, const void *buf, size_t available, |
81 | const struct sockaddr *addr, socklen_t addrlen, int errCode) | 80 | const struct sockaddr *addr, socklen_t addrlen, int errCode) |
82 | { | 81 | { |
83 | GNUNET_assert (0); | 82 | GNUNET_assert (0); |
84 | } | 83 | } |
@@ -93,9 +92,8 @@ run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
93 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); | 92 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); |
94 | GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); | 93 | GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); |
95 | GNUNET_CONNECTION_receive (asock, 1024, | 94 | GNUNET_CONNECTION_receive (asock, 1024, |
96 | GNUNET_TIME_relative_multiply | 95 | GNUNET_TIME_relative_multiply |
97 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, | 96 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, cls); |
98 | cls); | ||
99 | } | 97 | } |
100 | 98 | ||
101 | 99 | ||
@@ -121,9 +119,9 @@ task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
121 | csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT); | 119 | csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT); |
122 | GNUNET_assert (csock != NULL); | 120 | GNUNET_assert (csock != NULL); |
123 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, | 121 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, |
124 | &run_accept_cancel, cls); | 122 | &run_accept_cancel, cls); |
125 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, | 123 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &receive_cancel_task, |
126 | &receive_cancel_task, cls); | 124 | cls); |
127 | } | 125 | } |
128 | 126 | ||
129 | 127 | ||
@@ -139,7 +137,7 @@ check_receive_cancel () | |||
139 | ok = 1; | 137 | ok = 1; |
140 | cfg = GNUNET_CONFIGURATION_create (); | 138 | cfg = GNUNET_CONFIGURATION_create (); |
141 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 139 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
142 | "localhost"); | 140 | "localhost"); |
143 | GNUNET_SCHEDULER_run (&task_receive_cancel, &ok); | 141 | GNUNET_SCHEDULER_run (&task_receive_cancel, &ok); |
144 | GNUNET_CONFIGURATION_destroy (cfg); | 142 | GNUNET_CONFIGURATION_destroy (cfg); |
145 | return ok; | 143 | return ok; |