aboutsummaryrefslogtreecommitdiff
path: root/src/util/test_connection_addressing.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/util/test_connection_addressing.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/util/test_connection_addressing.c')
-rw-r--r--src/util/test_connection_addressing.c34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 111894a36..2d08acc3c 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -67,9 +67,9 @@ open_listen_socket ()
67 if (GNUNET_NETWORK_socket_setsockopt 67 if (GNUNET_NETWORK_socket_setsockopt
68 (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) 68 (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
69 GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt"); 69 GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt");
70 if (GNUNET_OK != GNUNET_NETWORK_socket_bind (desc, 70 if (GNUNET_OK !=
71 (const struct sockaddr *) &sa, 71 GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *) &sa,
72 sizeof (sa))) 72 sizeof (sa)))
73 { 73 {
74 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, 74 GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
75 "bind"); 75 "bind");
@@ -81,9 +81,7 @@ open_listen_socket ()
81 81
82 82
83static void 83static void
84receive_check (void *cls, 84receive_check (void *cls, const void *buf, size_t available,
85 const void *buf,
86 size_t available,
87 const struct sockaddr *addr, socklen_t addrlen, int errCode) 85 const struct sockaddr *addr, socklen_t addrlen, int errCode)
88{ 86{
89 int *ok = cls; 87 int *ok = cls;
@@ -93,11 +91,10 @@ receive_check (void *cls,
93 sofar += available; 91 sofar += available;
94 if (sofar < 12) 92 if (sofar < 12)
95 { 93 {
96 GNUNET_CONNECTION_receive (asock, 94 GNUNET_CONNECTION_receive (asock, 1024,
97 1024,
98 GNUNET_TIME_relative_multiply 95 GNUNET_TIME_relative_multiply
99 (GNUNET_TIME_UNIT_SECONDS, 5), 96 (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
100 &receive_check, cls); 97 cls);
101 } 98 }
102 else 99 else
103 { 100 {
@@ -132,8 +129,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
132 GNUNET_assert (0 == memcmp (&expect, v4, alen)); 129 GNUNET_assert (0 == memcmp (&expect, v4, alen));
133 GNUNET_free (addr); 130 GNUNET_free (addr);
134 GNUNET_CONNECTION_destroy (lsock, GNUNET_YES); 131 GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
135 GNUNET_CONNECTION_receive (asock, 132 GNUNET_CONNECTION_receive (asock, 1024,
136 1024,
137 GNUNET_TIME_relative_multiply 133 GNUNET_TIME_relative_multiply
138 (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, 134 (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
139 cls); 135 cls);
@@ -162,18 +158,18 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
162 v4.sin_family = AF_INET; 158 v4.sin_family = AF_INET;
163 v4.sin_port = htons (PORT); 159 v4.sin_port = htons (PORT);
164 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); 160 v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
165 csock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET, 161 csock =
166 (const struct sockaddr 162 GNUNET_CONNECTION_create_from_sockaddr (AF_INET,
167 *) &v4, sizeof (v4)); 163 (const struct sockaddr *) &v4,
164 sizeof (v4));
168 GNUNET_assert (csock != NULL); 165 GNUNET_assert (csock != NULL);
169 GNUNET_assert (NULL != 166 GNUNET_assert (NULL !=
170 GNUNET_CONNECTION_notify_transmit_ready (csock, 167 GNUNET_CONNECTION_notify_transmit_ready (csock, 12,
171 12,
172 GNUNET_TIME_UNIT_SECONDS, 168 GNUNET_TIME_UNIT_SECONDS,
173 &make_hello, NULL)); 169 &make_hello, NULL));
174 GNUNET_CONNECTION_destroy (csock, GNUNET_YES); 170 GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
175 GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, 171 GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, &run_accept,
176 ls, &run_accept, cls); 172 cls);
177} 173}
178 174
179 175