aboutsummaryrefslogtreecommitdiff
path: root/src/util/server.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-09 20:16:52 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-09 20:16:52 +0000
commitd36a5863ee8d8f440934f93969da167cb383f4c7 (patch)
tree17d9540d0de3f99feae37f16423c033e75414723 /src/util/server.c
parentbc28ff95e287a6794890c75348075fa9bd7af2f7 (diff)
downloadgnunet-d36a5863ee8d8f440934f93969da167cb383f4c7.tar.gz
gnunet-d36a5863ee8d8f440934f93969da167cb383f4c7.zip
removing remenants of abstract unix domain socket handling, this finishes addressing #2887
Diffstat (limited to 'src/util/server.c')
-rw-r--r--src/util/server.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/util/server.c b/src/util/server.c
index 8a36877dd..7c3829244 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -495,15 +495,10 @@ open_listen_socket (const struct sockaddr *server_addr, socklen_t socklen)
495 (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6"); 495 (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
496 else if (AF_UNIX == server_addr->sa_family) 496 else if (AF_UNIX == server_addr->sa_family)
497 { 497 {
498 const struct sockaddr_un *un = (const struct sockaddr_un *) server_addr;
499 unsigned int off = 0;
500
501 if ('\0' == un->sun_path[0])
502 off = 1; /* some UNIXPATHs start with 0 */
503 LOG (GNUNET_ERROR_TYPE_WARNING, 498 LOG (GNUNET_ERROR_TYPE_WARNING,
504 _("`%s' failed for `%.*s': address already in use\n"), "bind", 499 _("`%s' failed for `%s': address already in use\n"),
505 (int) ((sizeof (un->sun_path) - off)), 500 "bind",
506 (&un->sun_path[off])); 501 GNUNET_a2s (server_addr, socklen));
507 } 502 }
508 } 503 }
509 GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock)); 504 GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
@@ -531,7 +526,7 @@ open_listen_socket (const struct sockaddr *server_addr, socklen_t socklen)
531 * @param access_cls closure for access 526 * @param access_cls closure for access
532 * @param lsocks NULL-terminated array of listen sockets 527 * @param lsocks NULL-terminated array of listen sockets
533 * @param idle_timeout after how long should we timeout idle connections? 528 * @param idle_timeout after how long should we timeout idle connections?
534 * @param require_found if YES, connections sending messages of unknown type 529 * @param require_found if #GNUNET_YES, connections sending messages of unknown type
535 * will be closed 530 * will be closed
536 * @return handle for the new server, NULL on error 531 * @return handle for the new server, NULL on error
537 * (typically, "port" already in use) 532 * (typically, "port" already in use)