diff options
Diffstat (limited to 'src/microhttpd')
-rw-r--r-- | src/microhttpd/test_upgrade.c | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c index 377e712d..4fc4051c 100644 --- a/src/microhttpd/test_upgrade.c +++ b/src/microhttpd/test_upgrade.c | |||
@@ -201,7 +201,8 @@ typedef struct wr_socket_strc* wr_socket; | |||
201 | * Create wr_socket with plain TCP underlying socket | 201 | * Create wr_socket with plain TCP underlying socket |
202 | * @return created socket on success, WR_BAD otherwise | 202 | * @return created socket on success, WR_BAD otherwise |
203 | */ | 203 | */ |
204 | static wr_socket wr_create_plain_sckt(void) | 204 | static wr_socket |
205 | wr_create_plain_sckt(void) | ||
205 | { | 206 | { |
206 | wr_socket s = (wr_socket)malloc(sizeof(struct wr_socket_strc)); | 207 | wr_socket s = (wr_socket)malloc(sizeof(struct wr_socket_strc)); |
207 | if (WR_BAD == s) | 208 | if (WR_BAD == s) |
@@ -219,7 +220,8 @@ static wr_socket wr_create_plain_sckt(void) | |||
219 | * Create wr_socket with TLS TCP underlying socket | 220 | * Create wr_socket with TLS TCP underlying socket |
220 | * @return created socket on success, WR_BAD otherwise | 221 | * @return created socket on success, WR_BAD otherwise |
221 | */ | 222 | */ |
222 | static wr_socket wr_create_tls_sckt(void) | 223 | static wr_socket |
224 | wr_create_tls_sckt(void) | ||
223 | { | 225 | { |
224 | #ifdef HTTPS_SUPPORT | 226 | #ifdef HTTPS_SUPPORT |
225 | wr_socket s = (wr_socket)malloc(sizeof(struct wr_socket_strc)); | 227 | wr_socket s = (wr_socket)malloc(sizeof(struct wr_socket_strc)); |
@@ -264,9 +266,11 @@ static wr_socket wr_create_tls_sckt(void) | |||
264 | * @param plain_sk real TCP socket | 266 | * @param plain_sk real TCP socket |
265 | * @return created socket on success, WR_BAD otherwise | 267 | * @return created socket on success, WR_BAD otherwise |
266 | */ | 268 | */ |
267 | static wr_socket wr_create_from_plain_sckt(MHD_socket plain_sk) | 269 | static wr_socket |
270 | wr_create_from_plain_sckt(MHD_socket plain_sk) | ||
268 | { | 271 | { |
269 | wr_socket s = (wr_socket)malloc(sizeof(struct wr_socket_strc)); | 272 | wr_socket s = (wr_socket)malloc(sizeof(struct wr_socket_strc)); |
273 | |||
270 | if (WR_BAD == s) | 274 | if (WR_BAD == s) |
271 | return WR_BAD; | 275 | return WR_BAD; |
272 | s->t = wr_plain; | 276 | s->t = wr_plain; |
@@ -282,32 +286,25 @@ static wr_socket wr_create_from_plain_sckt(MHD_socket plain_sk) | |||
282 | * @param length of sturcture pointed by @a addr | 286 | * @param length of sturcture pointed by @a addr |
283 | * @return zero on success, -1 otherwise. | 287 | * @return zero on success, -1 otherwise. |
284 | */ | 288 | */ |
285 | static int wr_connect(wr_socket s, struct sockaddr * addr, int length) | 289 | static int |
290 | wr_connect(wr_socket s, | ||
291 | const struct sockaddr *addr, | ||
292 | int length) | ||
286 | { | 293 | { |
287 | if (0 != connect(s->fd, addr, length)) | 294 | if (0 != connect (s->fd, addr, length)) |
288 | return -1; | 295 | return -1; |
289 | if (wr_plain == s->t) | 296 | if (wr_plain == s->t) |
290 | return 0; | 297 | return 0; |
291 | #ifdef HTTPS_SUPPORT | 298 | #ifdef HTTPS_SUPPORT |
292 | if (wr_tls == s->t) | 299 | if (wr_tls == s->t) |
293 | { | 300 | { |
294 | s->tls_connected = 0; | ||
295 | return 0; | ||
296 | /* Do not try handshake here as | 301 | /* Do not try handshake here as |
297 | * it require processing on MHD side and | 302 | * it require processing on MHD side and |
298 | * when testing with "external" polling, | 303 | * when testing with "external" polling, |
299 | * test will call MHD processing only | 304 | * test will call MHD processing only |
300 | * after return from wr_connect(). */ | 305 | * after return from wr_connect(). */ |
301 | /* | 306 | s->tls_connected = 0; |
302 | int res = gnutls_handshake (s->tls_s); | 307 | return 0; |
303 | if (GNUTLS_E_SUCCESS == res) | ||
304 | { | ||
305 | s->tls_connected = !0; | ||
306 | return 0; | ||
307 | } | ||
308 | if (GNUTLS_E_AGAIN == res) | ||
309 | return 0; | ||
310 | */ | ||
311 | } | 308 | } |
312 | #endif /* HTTPS_SUPPORT */ | 309 | #endif /* HTTPS_SUPPORT */ |
313 | return -1; | 310 | return -1; |
@@ -319,7 +316,7 @@ static bool wr_handshake(wr_socket s) | |||
319 | { | 316 | { |
320 | int res = gnutls_handshake (s->tls_s); | 317 | int res = gnutls_handshake (s->tls_s); |
321 | if (GNUTLS_E_SUCCESS == res) | 318 | if (GNUTLS_E_SUCCESS == res) |
322 | s->tls_connected = !0; | 319 | s->tls_connected = true; |
323 | else if (GNUTLS_E_AGAIN == res) | 320 | else if (GNUTLS_E_AGAIN == res) |
324 | MHD_socket_set_error_ (MHD_SCKT_EAGAIN_); | 321 | MHD_socket_set_error_ (MHD_SCKT_EAGAIN_); |
325 | else | 322 | else |
@@ -338,7 +335,10 @@ static bool wr_handshake(wr_socket s) | |||
338 | * -1 if failed. Use #MHD_socket_get_error_() | 335 | * -1 if failed. Use #MHD_socket_get_error_() |
339 | * to get socket error. | 336 | * to get socket error. |
340 | */ | 337 | */ |
341 | static ssize_t wr_send(wr_socket s, const void *buf, size_t len) | 338 | static ssize_t |
339 | wr_send (wr_socket s, | ||
340 | const void *buf, | ||
341 | size_t len) | ||
342 | { | 342 | { |
343 | if (wr_plain == s->t) | 343 | if (wr_plain == s->t) |
344 | return MHD_send_(s->fd, buf, len); | 344 | return MHD_send_(s->fd, buf, len); |
@@ -371,7 +371,10 @@ static ssize_t wr_send(wr_socket s, const void *buf, size_t len) | |||
371 | * -1 if failed. Use #MHD_socket_get_error_() | 371 | * -1 if failed. Use #MHD_socket_get_error_() |
372 | * to get socket error. | 372 | * to get socket error. |
373 | */ | 373 | */ |
374 | static ssize_t wr_recv(wr_socket s, void *buf, size_t len) | 374 | static ssize_t |
375 | wr_recv (wr_socket s, | ||
376 | void *buf, | ||
377 | size_t len) | ||
375 | { | 378 | { |
376 | if (wr_plain == s->t) | 379 | if (wr_plain == s->t) |
377 | return MHD_recv_ (s->fd, buf, len); | 380 | return MHD_recv_ (s->fd, buf, len); |
@@ -401,7 +404,7 @@ static ssize_t wr_recv(wr_socket s, void *buf, size_t len) | |||
401 | * @return zero on succeed, -1 otherwise | 404 | * @return zero on succeed, -1 otherwise |
402 | */ | 405 | */ |
403 | static int | 406 | static int |
404 | wr_close(wr_socket s) | 407 | wr_close (wr_socket s) |
405 | { | 408 | { |
406 | int ret = (MHD_socket_close_(s->fd)) ? 0 : -1; | 409 | int ret = (MHD_socket_close_(s->fd)) ? 0 : -1; |
407 | #ifdef HTTPS_SUPPORT | 410 | #ifdef HTTPS_SUPPORT |