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_timeout.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_timeout.c')
-rw-r--r-- | src/util/test_connection_timeout.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c index 5968f797f..0590d36d5 100644 --- a/src/util/test_connection_timeout.c +++ b/src/util/test_connection_timeout.c | |||
@@ -59,12 +59,13 @@ open_listen_socket () | |||
59 | sa.sin_port = htons (PORT); | 59 | sa.sin_port = htons (PORT); |
60 | desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); | 60 | desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0); |
61 | GNUNET_assert (desc != NULL); | 61 | GNUNET_assert (desc != NULL); |
62 | if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | 62 | if (GNUNET_NETWORK_socket_setsockopt |
63 | (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | ||
63 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 64 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
64 | "setsockopt"); | 65 | "setsockopt"); |
65 | GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, | 66 | GNUNET_assert (GNUNET_NETWORK_socket_bind |
66 | (const struct sockaddr*) &sa, | 67 | (desc, (const struct sockaddr *) &sa, |
67 | sizeof (sa)) == GNUNET_OK); | 68 | sizeof (sa)) == GNUNET_OK); |
68 | GNUNET_NETWORK_socket_listen (desc, 5); | 69 | GNUNET_NETWORK_socket_listen (desc, 5); |
69 | return desc; | 70 | return desc; |
70 | } | 71 | } |
@@ -93,9 +94,9 @@ send_kilo (void *cls, size_t size, void *buf) | |||
93 | 94 | ||
94 | GNUNET_assert (NULL != | 95 | GNUNET_assert (NULL != |
95 | GNUNET_CONNECTION_notify_transmit_ready (csock, | 96 | GNUNET_CONNECTION_notify_transmit_ready (csock, |
96 | 1024, | 97 | 1024, |
97 | GNUNET_TIME_UNIT_SECONDS, | 98 | GNUNET_TIME_UNIT_SECONDS, |
98 | &send_kilo, cls)); | 99 | &send_kilo, cls)); |
99 | return 1024; | 100 | return 1024; |
100 | } | 101 | } |
101 | 102 | ||
@@ -108,13 +109,13 @@ task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
108 | lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); | 109 | lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); |
109 | GNUNET_assert (lsock != NULL); | 110 | GNUNET_assert (lsock != NULL); |
110 | csock = GNUNET_CONNECTION_create_from_connect (tc->sched, cfg, | 111 | csock = GNUNET_CONNECTION_create_from_connect (tc->sched, cfg, |
111 | "localhost", PORT, 1024); | 112 | "localhost", PORT, 1024); |
112 | GNUNET_assert (csock != NULL); | 113 | GNUNET_assert (csock != NULL); |
113 | GNUNET_assert (NULL != | 114 | GNUNET_assert (NULL != |
114 | GNUNET_CONNECTION_notify_transmit_ready (csock, | 115 | GNUNET_CONNECTION_notify_transmit_ready (csock, |
115 | 1024, | 116 | 1024, |
116 | GNUNET_TIME_UNIT_SECONDS, | 117 | GNUNET_TIME_UNIT_SECONDS, |
117 | &send_kilo, cls)); | 118 | &send_kilo, cls)); |
118 | } | 119 | } |
119 | 120 | ||
120 | 121 | ||