diff options
Diffstat (limited to 'src/util/test_connection_receive_cancel.c')
-rw-r--r-- | src/util/test_connection_receive_cancel.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c index 1e6720235..d635f5742 100644 --- a/src/util/test_connection_receive_cancel.c +++ b/src/util/test_connection_receive_cancel.c | |||
@@ -65,8 +65,7 @@ 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); |
@@ -97,8 +96,7 @@ run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
97 | GNUNET_CONNECTION_receive (asock, | 96 | GNUNET_CONNECTION_receive (asock, |
98 | 1024, | 97 | 1024, |
99 | GNUNET_TIME_relative_multiply | 98 | GNUNET_TIME_relative_multiply |
100 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, | 99 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, cls); |
101 | cls); | ||
102 | } | 100 | } |
103 | 101 | ||
104 | 102 | ||
@@ -106,6 +104,7 @@ static void | |||
106 | receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 104 | receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
107 | { | 105 | { |
108 | int *ok = cls; | 106 | int *ok = cls; |
107 | |||
109 | GNUNET_CONNECTION_receive_cancel (asock); | 108 | GNUNET_CONNECTION_receive_cancel (asock); |
110 | GNUNET_CONNECTION_destroy (csock, GNUNET_YES); | 109 | GNUNET_CONNECTION_destroy (csock, GNUNET_YES); |
111 | GNUNET_CONNECTION_destroy (asock, GNUNET_YES); | 110 | GNUNET_CONNECTION_destroy (asock, GNUNET_YES); |
@@ -120,8 +119,7 @@ task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
120 | ls = open_listen_socket (); | 119 | ls = open_listen_socket (); |
121 | lsock = GNUNET_CONNECTION_create_from_existing (ls); | 120 | lsock = GNUNET_CONNECTION_create_from_existing (ls); |
122 | GNUNET_assert (lsock != NULL); | 121 | GNUNET_assert (lsock != NULL); |
123 | csock = GNUNET_CONNECTION_create_from_connect (cfg, | 122 | csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT); |
124 | "localhost", PORT); | ||
125 | GNUNET_assert (csock != NULL); | 123 | GNUNET_assert (csock != NULL); |
126 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 124 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
127 | ls, &run_accept_cancel, cls); | 125 | ls, &run_accept_cancel, cls); |