diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-11 09:43:04 +0000 |
commit | d9d94d0e53d26af75ec8241383d166544ebd79f3 (patch) | |
tree | 9080b73624389403a198257fe0547bb4634e64d2 /src/util/test_connection_receive_cancel.c | |
parent | 2d792ee2e9cc0c993b8907e2c8edb0c2b8465343 (diff) | |
download | gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.tar.gz gnunet-d9d94d0e53d26af75ec8241383d166544ebd79f3.zip |
converting to GNUNET_LOG_from*
Diffstat (limited to 'src/util/test_connection_receive_cancel.c')
-rw-r--r-- | src/util/test_connection_receive_cancel.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c index 63829344d..bd095fdda 100644 --- a/src/util/test_connection_receive_cancel.c +++ b/src/util/test_connection_receive_cancel.c | |||
@@ -65,10 +65,11 @@ 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, "setsockopt"); | 68 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
69 | "setsockopt"); | ||
69 | GNUNET_assert (GNUNET_NETWORK_socket_bind | 70 | GNUNET_assert (GNUNET_NETWORK_socket_bind |
70 | (desc, (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 | } |
@@ -77,7 +78,7 @@ open_listen_socket () | |||
77 | 78 | ||
78 | static void | 79 | static void |
79 | dead_receive (void *cls, const void *buf, size_t available, | 80 | dead_receive (void *cls, const void *buf, size_t available, |
80 | const struct sockaddr *addr, socklen_t addrlen, int errCode) | 81 | const struct sockaddr *addr, socklen_t addrlen, int errCode) |
81 | { | 82 | { |
82 | GNUNET_assert (0); | 83 | GNUNET_assert (0); |
83 | } | 84 | } |
@@ -92,8 +93,9 @@ run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
92 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); | 93 | GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); |
93 | GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); | 94 | GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); |
94 | GNUNET_CONNECTION_receive (asock, 1024, | 95 | GNUNET_CONNECTION_receive (asock, 1024, |
95 | GNUNET_TIME_relative_multiply | 96 | GNUNET_TIME_relative_multiply |
96 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, cls); | 97 | (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, |
98 | cls); | ||
97 | } | 99 | } |
98 | 100 | ||
99 | 101 | ||
@@ -119,9 +121,9 @@ task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
119 | csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT); | 121 | csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT); |
120 | GNUNET_assert (csock != NULL); | 122 | GNUNET_assert (csock != NULL); |
121 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, | 123 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, |
122 | &run_accept_cancel, cls); | 124 | &run_accept_cancel, cls); |
123 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &receive_cancel_task, | 125 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
124 | cls); | 126 | &receive_cancel_task, cls); |
125 | } | 127 | } |
126 | 128 | ||
127 | 129 | ||
@@ -137,7 +139,7 @@ check_receive_cancel () | |||
137 | ok = 1; | 139 | ok = 1; |
138 | cfg = GNUNET_CONFIGURATION_create (); | 140 | cfg = GNUNET_CONFIGURATION_create (); |
139 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 141 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
140 | "localhost"); | 142 | "localhost"); |
141 | GNUNET_SCHEDULER_run (&task_receive_cancel, &ok); | 143 | GNUNET_SCHEDULER_run (&task_receive_cancel, &ok); |
142 | GNUNET_CONFIGURATION_destroy (cfg); | 144 | GNUNET_CONFIGURATION_destroy (cfg); |
143 | return ok; | 145 | return ok; |