X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=023d78d08175f2f3810af6dd387f5eec14a06dcc;hp=aa5615fbe9c8df16ebc9175a43981928807a3e80;hb=4d067435b1167dbf5217c875ac9fd7ac69ad91bd;hpb=300f8b11d60c651d73af3da13c74a02586a06b9c diff --git a/net.c b/net.c index aa5615fb..023d78d0 100644 --- a/net.c +++ b/net.c @@ -1,16 +1,12 @@ /* - * Copyright (C) 2005-2014 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file net.c Networking-related helper functions. */ -/* - * Since glibc 2.8, the _GNU_SOURCE feature test macro must be defined in order - * to obtain the definition of the ucred structure. - */ -#define _GNU_SOURCE +#include "para.h" #include #include @@ -32,7 +28,6 @@ #include -#include "para.h" #include "error.h" #include "net.h" #include "string.h" @@ -180,8 +175,7 @@ char *parse_url(const char *url, } if (*o == ':') - if (para_atoi32(++o, port) < 0 || - *port < 0 || *port > 0xffff) + if (para_atoi32(++o, port) < 0 || *port < 0 || *port > 0xffff) goto failed; if (host_string_ok(host)) return host; @@ -192,6 +186,7 @@ failed: /** * Stringify port number, resolve into service name where defined. + * * \param port 2-byte port number, in host-byte-order. * \param transport Transport protocol name (e.g. "udp", "tcp"), or NULL. * \return Pointer to static result buffer. @@ -381,7 +376,7 @@ int lookup_address(unsigned l4type, bool passive, const char *host, struct addrinfo *addr = NULL, hints; *result = NULL; - sprintf(port, "%u", port_number & 0xffff); + sprintf(port, "%d", port_number & 0xffff); /* Set up address hint structure */ memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_UNSPEC; @@ -622,11 +617,9 @@ int generic_max_transport_msg_size(int sockfd) } /** - * Look up the local or remote side of a connected socket structure. + * Look up the remote side of a connected socket structure. * * \param fd The socket descriptor of the connected socket. - * \param getname Either \p getsockname() for local, or \p getpeername() for - * remote side. * * \return A static character string identifying hostname and port of the * chosen side in numeric host:port format. @@ -634,7 +627,7 @@ int generic_max_transport_msg_size(int sockfd) * \sa getsockname(2), getpeername(2), parse_url(), getnameinfo(3), * services(5), nsswitch.conf(5). */ -static char *__get_sock_name(int fd, typeof(getsockname) getname) +char *remote_name(int fd) { struct sockaddr_storage ss; const struct sockaddr *sa; @@ -643,7 +636,7 @@ static char *__get_sock_name(int fd, typeof(getsockname) getname) static char output[sizeof(hbuf) + sizeof(sbuf) + 4]; int ret; - if (getname(fd, (struct sockaddr *)&ss, &sslen) < 0) { + if (getpeername(fd, (struct sockaddr *)&ss, &sslen) < 0) { PARA_ERROR_LOG("can not determine address from fd %d: %s\n", fd, strerror(errno)); snprintf(output, sizeof(output), "(unknown)"); @@ -663,19 +656,6 @@ static char *__get_sock_name(int fd, typeof(getsockname) getname) return output; } -/** - * Look up the remote side of a connected socket structure. - * - * \param sockfd The file descriptor of the socket. - * - * \return A pointer to a static buffer containing hostname an port. This - * buffer must not be freed by the caller. - */ -char *remote_name(int sockfd) -{ - return __get_sock_name(sockfd, getpeername); -} - /** * Extract IPv4 or IPv6-mapped-IPv4 address from sockaddr_storage. * @@ -838,63 +818,85 @@ int dccp_available_ccids(uint8_t **ccid_array) return nccids; } -/** - * Prepare a structure for \p AF_UNIX socket addresses. - * - * \param u Pointer to the struct to be prepared. - * \param name The socket pathname. +/* + * Prepare a structure for AF_UNIX socket addresses. * - * This just copies \a name to the sun_path component of \a u. + * This just copies name to the sun_path component of u, prepending a zero byte + * if abstract sockets are supported. * - * \return Positive on success, \p -E_NAME_TOO_LONG if \a name is longer - * than \p UNIX_PATH_MAX. + * The first call to this function tries to bind a socket to the abstract name + * space. The result of this test is stored in a static variable. Subsequent + * calls read this variable and create abstract sockets on systems that support + * them. */ static int init_unix_addr(struct sockaddr_un *u, const char *name) { - if (strlen(name) >= UNIX_PATH_MAX) + static int use_abstract; + + if (strlen(name) + 1 >= UNIX_PATH_MAX) return -E_NAME_TOO_LONG; memset(u->sun_path, 0, UNIX_PATH_MAX); u->sun_family = PF_UNIX; - strcpy(u->sun_path, name); + if (use_abstract == 0) { /* executed only once */ + int fd = socket(PF_UNIX, SOCK_STREAM, 0); + memcpy(u->sun_path, "\0x\0", 3); + if (bind(fd, (struct sockaddr *)u, sizeof(*u)) == 0) + use_abstract = 1; /* yes */ + else + use_abstract = -1; /* no */ + close(fd); + PARA_NOTICE_LOG("%susing abstract socket namespace\n", + use_abstract == 1? "" : "not "); + } + strcpy(u->sun_path + (use_abstract == 1? 1 : 0), name); return 1; } /** - * Prepare, create, and bind a socket for local communication. + * Create a socket for local communication and listen on it. * * \param name The socket pathname. - * \param unix_addr Pointer to the \p AF_UNIX socket structure. - * \param mode The desired mode of the socket. * - * This function creates a local socket for sequenced, reliable, - * two-way, connection-based byte streams. + * This function creates a passive local socket for sequenced, reliable, + * two-way, connection-based byte streams. The socket file descriptor is set to + * nonblocking mode and listen(2) is called to prepare the socket for + * accepting incoming connection requests. * - * \return The file descriptor, on success, negative on errors. + * \return The file descriptor on success, negative error code on failure. * - * \sa socket(2) - * \sa bind(2) - * \sa chmod(2) + * \sa socket(2), \sa bind(2), \sa chmod(2), listen(2), unix(7). */ -int create_local_socket(const char *name, struct sockaddr_un *unix_addr, - mode_t mode) +int create_local_socket(const char *name) { + struct sockaddr_un unix_addr; int fd, ret; - ret = init_unix_addr(unix_addr, name); + ret = init_unix_addr(&unix_addr, name); if (ret < 0) return ret; ret = socket(PF_UNIX, SOCK_STREAM, 0); if (ret < 0) return -ERRNO_TO_PARA_ERROR(errno); fd = ret; - ret = bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX); + ret = mark_fd_nonblocking(fd); + if (ret < 0) + goto err; + ret = bind(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)); if (ret < 0) { ret = -ERRNO_TO_PARA_ERROR(errno); goto err; } - ret = -E_CHMOD; - if (chmod(name, mode) < 0) + if (unix_addr.sun_path[0] != 0) { /* pathname socket */ + mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP + | S_IROTH | S_IWOTH; + ret = -E_CHMOD; + if (chmod(name, mode) < 0) + goto err; + } + if (listen(fd , 5) < 0) { + ret = -ERRNO_TO_PARA_ERROR(errno); goto err; + } return fd; err: close(fd); @@ -920,17 +922,15 @@ int connect_local_socket(const char *name) int fd, ret; PARA_DEBUG_LOG("connecting to %s\n", name); - ret = init_unix_addr(&unix_addr, name); - if (ret < 0) - return ret; fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd < 0) return -ERRNO_TO_PARA_ERROR(errno); - if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) == -1) { - ret = -ERRNO_TO_PARA_ERROR(errno); + ret = init_unix_addr(&unix_addr, name); + if (ret < 0) goto err; - } - return fd; + if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) != -1) + return fd; + ret = -ERRNO_TO_PARA_ERROR(errno); err: close(fd); return ret; @@ -1014,7 +1014,7 @@ static void dispose_fds(int *fds, unsigned num) */ int recv_cred_buffer(int fd, char *buf, size_t size) { - char control[255]; + char control[255] __a_aligned(8); struct msghdr msg; struct cmsghdr *cmsg; struct iovec iov;