diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-05-11 11:50:53 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-05-11 11:50:53 +0000 |
commit | c9b7c04b1c4d6fc15225b5ba860b6e49c707ea6a (patch) | |
tree | d10ff5114d5308398834844a76a5f0f65d3050eb /src | |
parent | 807fcd3b31c5578551326d6fd643c7294b7979ca (diff) | |
download | gnunet-c9b7c04b1c4d6fc15225b5ba860b6e49c707ea6a.tar.gz gnunet-c9b7c04b1c4d6fc15225b5ba860b6e49c707ea6a.zip |
stuff
Diffstat (limited to 'src')
-rw-r--r-- | src/util/network.c | 13 | ||||
-rw-r--r-- | src/util/service.c | 1 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/util/network.c b/src/util/network.c index e7a276422..c4fb73049 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -406,14 +406,12 @@ GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc, | |||
406 | #ifdef MSG_DONTWAIT | 406 | #ifdef MSG_DONTWAIT |
407 | flags |= MSG_DONTWAIT; | 407 | flags |= MSG_DONTWAIT; |
408 | 408 | ||
409 | #endif /* */ | 409 | #endif |
410 | ret = recvfrom (desc->fd, buffer, length, flags, src_addr, addrlen); | 410 | ret = recvfrom (desc->fd, buffer, length, flags, src_addr, addrlen); |
411 | |||
412 | #ifdef MINGW | 411 | #ifdef MINGW |
413 | if (SOCKET_ERROR == ret) | 412 | if (SOCKET_ERROR == ret) |
414 | SetErrnoFromWinsockError (WSAGetLastError ()); | 413 | SetErrnoFromWinsockError (WSAGetLastError ()); |
415 | 414 | #endif | |
416 | #endif /* */ | ||
417 | return ret; | 415 | return ret; |
418 | } | 416 | } |
419 | 417 | ||
@@ -434,15 +432,12 @@ GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc, | |||
434 | 432 | ||
435 | #ifdef MSG_DONTWAIT | 433 | #ifdef MSG_DONTWAIT |
436 | flags |= MSG_DONTWAIT; | 434 | flags |= MSG_DONTWAIT; |
437 | 435 | #endif | |
438 | #endif /* */ | ||
439 | ret = recv (desc->fd, buffer, length, flags); | 436 | ret = recv (desc->fd, buffer, length, flags); |
440 | |||
441 | #ifdef MINGW | 437 | #ifdef MINGW |
442 | if (SOCKET_ERROR == ret) | 438 | if (SOCKET_ERROR == ret) |
443 | SetErrnoFromWinsockError (WSAGetLastError ()); | 439 | SetErrnoFromWinsockError (WSAGetLastError ()); |
444 | 440 | #endif | |
445 | #endif /* */ | ||
446 | return ret; | 441 | return ret; |
447 | } | 442 | } |
448 | 443 | ||
diff --git a/src/util/service.c b/src/util/service.c index ba2db383c..2c2e7d8df 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -1014,7 +1014,6 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, | |||
1014 | #endif | 1014 | #endif |
1015 | ((struct sockaddr_in *) saddrs[1])->sin_family = AF_INET; | 1015 | ((struct sockaddr_in *) saddrs[1])->sin_family = AF_INET; |
1016 | ((struct sockaddr_in *) saddrs[1])->sin_port = htons (port); | 1016 | ((struct sockaddr_in *) saddrs[1])->sin_port = htons (port); |
1017 | |||
1018 | } | 1017 | } |
1019 | } | 1018 | } |
1020 | *addrs = saddrs; | 1019 | *addrs = saddrs; |