diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-15 10:46:57 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-15 10:46:57 +0000 |
commit | 81e0ff5318afd7a407395146ff686065f3e76eac (patch) | |
tree | 09532a786f42dc7fa21277beda5e342c9adb4494 /src/util/server.c | |
parent | e0c30daf391bdcbaf873d845a7c7d9347217f884 (diff) | |
download | gnunet-81e0ff5318afd7a407395146ff686065f3e76eac.tar.gz gnunet-81e0ff5318afd7a407395146ff686065f3e76eac.zip |
-remove duplicate setsockopt calls; GNUNET_NETWORK_socket_bind does those already anyway
Diffstat (limited to 'src/util/server.c')
-rw-r--r-- | src/util/server.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/util/server.c b/src/util/server.c index 409e89f16..c21b9e2db 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -454,20 +454,6 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | |||
454 | errno = 0; | 454 | errno = 0; |
455 | return NULL; | 455 | return NULL; |
456 | } | 456 | } |
457 | if (0 != port) | ||
458 | { | ||
459 | if (GNUNET_NETWORK_socket_setsockopt | ||
460 | (sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK) | ||
461 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
462 | "setsockopt"); | ||
463 | #ifdef IPV6_V6ONLY | ||
464 | if ((AF_INET6 == serverAddr->sa_family) && | ||
465 | (GNUNET_NETWORK_socket_setsockopt | ||
466 | (sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)) != GNUNET_OK)) | ||
467 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
468 | "setsockopt"); | ||
469 | #endif | ||
470 | } | ||
471 | /* bind the socket */ | 457 | /* bind the socket */ |
472 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen)) | 458 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen)) |
473 | { | 459 | { |