X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=9c03ca082e63a9405b8f158c506c8ee9cfaa0c10;hb=24e2b57dde50a6fe33deee034d34181eece09834;hp=8860312bf531b225bed615d2fa90d10b1f469534;hpb=7f9340341574044e16e1ffc30f856f13d1e3ba6c;p=paraslash.git diff --git a/net.c b/net.c index 8860312b..9c03ca08 100644 --- a/net.c +++ b/net.c @@ -8,6 +8,18 @@ #include +/* At least NetBSD needs these. */ +#ifndef AI_V4MAPPED +#define AI_V4MAPPED 0 +#endif +#ifndef AI_ALL +#define AI_ALL 0 +#endif +#ifndef AI_ADDRCONFIG +#define AI_ADDRCONFIG 0 +#endif + + #include "para.h" #include "error.h" #include "net.h" @@ -72,30 +84,6 @@ void disable_crypt(int fd) } -/** - * Initialize a struct sockaddr_in. - * - * \param addr A pointer to the struct to be initialized. - * \param port The port number to use. - * \param he The address to use. - * - * If \a he is null (server mode), \a addr->sin_addr is initialized with \p - * INADDR_ANY. Otherwise, the address given by \a he is copied to addr. - */ -static void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he) -{ - /* host byte order */ - addr->sin_family = AF_INET; - /* short, network byte order */ - addr->sin_port = htons(port); - if (he) - addr->sin_addr = *((struct in_addr *)he->h_addr); - else - addr->sin_addr.s_addr = INADDR_ANY; - /* zero the rest of the struct */ - memset(&addr->sin_zero, '\0', 8); -} - /** * Determine the socket type for a given layer-4 protocol. * @@ -150,7 +138,7 @@ static const char *layer4_name(const unsigned l4type) * \sa ipv6(7), getaddrinfo(3), bind(2), connect(2) */ int makesock(unsigned l3type, unsigned l4type, int passive, - const char *host, unsigned short port_number) + const char *host, unsigned short port_number) { struct addrinfo *local = NULL, *src, *remote = NULL, *dst, hints; @@ -192,7 +180,7 @@ int makesock(unsigned l3type, unsigned l4type, int passive, */ for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) { if (src && dst && src->ai_family == AF_INET - && dst->ai_family == AF_INET6) /* v4 -> v6 is not possible */ + && dst->ai_family == AF_INET6) /* v4 -> v6 is not possible */ goto get_next_dst; sockfd = socket(src ? src->ai_family : dst->ai_family, socktype, l4type); @@ -260,7 +248,7 @@ int para_listen(unsigned l3type, unsigned l4type, unsigned short port) return -ERRNO_TO_PARA_ERROR(errno); } PARA_INFO_LOG("listening on %s port %u, fd %d\n", - layer4_name(l4type), port, fd); + layer4_name(l4type), port, fd); } return fd; } @@ -280,7 +268,7 @@ char *host_and_port(struct sockaddr *sa, socklen_t len) int ret; ret = getnameinfo(sa, len, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), - NI_NUMERICHOST | NI_NUMERICSERV); + NI_NUMERICHOST | NI_NUMERICSERV); if (ret) { PARA_WARNING_LOG("hostname lookup error (%s).\n", gai_strerror(ret)); sprintf(output, "(unknown)"); @@ -481,58 +469,6 @@ int recv_buffer(int fd, char *buf, size_t size) return n; } -/** - * Establish a tcp connection. - * - * \param host Hostname or IPv4 address. - * \param port The tcp port. - * - * \return Negative on errors, a valid file descriptor on success. - */ -int tcp_connect(char *host, int port) -{ - struct sockaddr_in addr; - struct hostent *he; - int ret, fd; - - PARA_INFO_LOG("getting host info of %s\n", host); - /* FIXME: gethostbyname() is obsolete */ - he = gethostbyname(host); - if (!he) - return -ERRNO_TO_PARA_ERROR(h_errno); - init_sockaddr(&addr, port, he); - ret = get_stream_socket(AF_INET); - if (ret < 0) - return ret; - fd = ret; - ret = PARA_CONNECT(fd, &addr); - if (ret >= 0) - return fd; - close(fd); - return ret; -} - -/** - * A wrapper around socket(2). - * - * \param domain The communication domain that selects the protocol family. - * - * Create an IPv4 socket for sequenced, reliable, two-way, connection-based - * byte streams. - * - * \return The socket fd on success, negative on errors. - * - * \sa socket(2). - */ -int get_stream_socket(int domain) -{ - int fd = socket(domain, SOCK_STREAM, 0); - - if (fd < 0) - return -ERRNO_TO_PARA_ERROR(errno); - return fd; -} - /** * Wrapper around the accept system call. * @@ -567,7 +503,7 @@ int para_accept(int fd, void *addr, socklen_t size) * \return Positive on success, \p -E_NAME_TOO_LONG if \a name is longer * than \p UNIX_PATH_MAX. */ -int init_unix_addr(struct sockaddr_un *u, const char *name) +static int init_unix_addr(struct sockaddr_un *u, const char *name) { if (strlen(name) >= UNIX_PATH_MAX) return -E_NAME_TOO_LONG; @@ -584,7 +520,7 @@ int init_unix_addr(struct sockaddr_un *u, const char *name) * \param unix_addr Pointer to the \p AF_UNIX socket structure. * \param mode The desired mode of the socket. * - * This functions creates a local socket for sequenced, reliable, + * This function creates a local socket for sequenced, reliable, * two-way, connection-based byte streams. * * \return The file descriptor, on success, negative on errors. @@ -619,6 +555,39 @@ err: return ret; } +/** + * Prepare, create, and connect to a Unix domain socket for local communication. + * + * \param name The socket pathname. + * + * This function creates a local socket for sequenced, reliable, two-way, + * connection-based byte streams. + * + * \return The file descriptor, on success, negative on errors. + * + * \sa create_local_socket(), unix(7), connect(2) + */ +int create_remote_socket(const char *name) +{ + struct sockaddr_un unix_addr; + int fd, ret; + + 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); + goto err; + } + return fd; +err: + close(fd); + return ret; +} + #ifndef HAVE_UCRED ssize_t send_cred_buffer(int sock, char *buf) { @@ -736,50 +705,6 @@ int recv_cred_buffer(int fd, char *buf, size_t size) } #endif /* HAVE_UCRED */ -/** - * Create a tcp socket, bind it and listen on the given port. - * - * \param port The tcp port to listen on. - * - * \return The file descriptor of the created socket, negative on errors. - * - * \sa get_stream_socket() - * \sa setsockopt(2) - * \sa bind(2) - * \sa listen(2) - */ -int tcp_listen(int port) -{ - struct sockaddr_in my_addr; - int fd, ret = get_stream_socket(AF_INET); - - if (ret < 0) - return ret; - fd = ret; - ret = 1; - ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &ret, sizeof(int)); - if (ret < 0) { - ret = -ERRNO_TO_PARA_ERROR(errno); - goto err; - } - init_sockaddr(&my_addr, port, NULL); - ret = bind(fd, (struct sockaddr *)&my_addr, sizeof(struct sockaddr)); - if (ret < 0) { - ret = -ERRNO_TO_PARA_ERROR(errno); - goto err; - } - ret = listen(fd, BACKLOG); - if (ret < 0) { - ret = -ERRNO_TO_PARA_ERROR(errno); - goto err; - } - PARA_INFO_LOG("listening on port %d, fd %d\n", port, fd); - return fd; -err: - close(fd); - return ret; -} - /** * receive a buffer and check for a pattern *