diff options
Diffstat (limited to 'src/util/test_connection_addressing.c')
-rw-r--r-- | src/util/test_connection_addressing.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c index f5328be92..111894a36 100644 --- a/src/util/test_connection_addressing.c +++ b/src/util/test_connection_addressing.c | |||
@@ -66,15 +66,15 @@ open_listen_socket () | |||
66 | GNUNET_assert (desc != 0); | 66 | GNUNET_assert (desc != 0); |
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, | 69 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt"); |
70 | "setsockopt"); | ||
71 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (desc, | 70 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (desc, |
72 | (const struct sockaddr *) &sa, sizeof(sa))) | 71 | (const struct sockaddr *) &sa, |
73 | { | 72 | sizeof (sa))) |
74 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 73 | { |
75 | "bind"); | 74 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
76 | GNUNET_assert (0); | 75 | "bind"); |
77 | } | 76 | GNUNET_assert (0); |
77 | } | ||
78 | GNUNET_NETWORK_socket_listen (desc, 5); | 78 | GNUNET_NETWORK_socket_listen (desc, 5); |
79 | return desc; | 79 | return desc; |
80 | } | 80 | } |
@@ -92,18 +92,18 @@ receive_check (void *cls, | |||
92 | if (0 == memcmp (&"Hello World"[sofar], buf, available)) | 92 | if (0 == memcmp (&"Hello World"[sofar], buf, available)) |
93 | sofar += available; | 93 | sofar += available; |
94 | if (sofar < 12) | 94 | if (sofar < 12) |
95 | { | 95 | { |
96 | GNUNET_CONNECTION_receive (asock, | 96 | GNUNET_CONNECTION_receive (asock, |
97 | 1024, | 97 | 1024, |
98 | GNUNET_TIME_relative_multiply | 98 | GNUNET_TIME_relative_multiply |
99 | (GNUNET_TIME_UNIT_SECONDS, 5), | 99 | (GNUNET_TIME_UNIT_SECONDS, 5), |
100 | &receive_check, cls); | 100 | &receive_check, cls); |
101 | } | 101 | } |
102 | else | 102 | else |
103 | { | 103 | { |
104 | *ok = 0; | 104 | *ok = 0; |
105 | GNUNET_CONNECTION_destroy (asock, GNUNET_YES); | 105 | GNUNET_CONNECTION_destroy (asock, GNUNET_YES); |
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||
@@ -151,6 +151,7 @@ static void | |||
151 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 151 | task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
152 | { | 152 | { |
153 | struct sockaddr_in v4; | 153 | struct sockaddr_in v4; |
154 | |||
154 | ls = open_listen_socket (); | 155 | ls = open_listen_socket (); |
155 | lsock = GNUNET_CONNECTION_create_from_existing (ls); | 156 | lsock = GNUNET_CONNECTION_create_from_existing (ls); |
156 | GNUNET_assert (lsock != NULL); | 157 | GNUNET_assert (lsock != NULL); |