X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=0e41be1c3fa804c772f4547a16ac68ec8b42e262;hp=70aacd8c0d2e9afc3739808de965d3653b31f0bc;hb=ba30bb8d0bb025c0dad80e5ff47352b4bc130423;hpb=875273d8a8cec1055c4d5d3f1211b18e9e2b7412;ds=inline diff --git a/net.c b/net.c index 70aacd8c..0e41be1c 100644 --- a/net.c +++ b/net.c @@ -1,39 +1,33 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file net.c networking-related helper functions */ +#include "error.h" #include "para.h" #include "net.h" #include "string.h" -#include "error.h" -/** \cond holds information about one encrypted connection */ +/** Information about one encrypted connection. */ struct crypt_data { + /** Function used to decrypt received data. */ crypt_function *recv; + /** Function used to encrypt data to be sent. */ crypt_function *send; + /** + * Context-dependent data (crypt keys), passed verbatim to the above + * crypt functions. + */ void *private_data; }; -static unsigned cda_size = 0; +/** Array holding per fd crypt data. */ static struct crypt_data *crypt_data_array; -/** \endcond */ - +/** Current size of the crypt data array. */ +static unsigned cda_size = 0; /** * activate encryption for one file descriptor @@ -116,8 +110,7 @@ void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he) */ static int sendall(int fd, const char *buf, size_t *len) { - int total = 0; /* how many bytes we've sent */ - int bytesleft = *len; /* how many we have left to send */ + size_t total = 0, bytesleft = *len; /* how many we have left to send */ int n = -1; while (total < *len) { @@ -135,15 +128,15 @@ static int sendall(int fd, const char *buf, size_t *len) } /** - * encrypt and send buffer + * Encrypt and send a binary buffer. * - * \param fd: the file descriptor - * \param buf the buffer to be encrypted and sent - * \param len the length of \a buf + * \param fd The file descriptor. + * \param buf The buffer to be encrypted and sent. + * \param len The length of \a buf. * - * Check if encrytpion is available. If yes, encrypt the given buffer. Send out - * the buffer, encrypted or not, and try to resend the remaing part in case of - * short writes. + * Check if encryption is available. If yes, encrypt the given buffer. Send + * out the buffer, encrypted or not, and try to resend the remaing part in case + * of short writes. * * \return Positive on success, \p -E_SEND on errors. */ @@ -158,7 +151,8 @@ int send_bin_buffer(int fd, const char *buf, size_t len) cf = crypt_data_array[fd].send; if (cf) { void *private = crypt_data_array[fd].private_data; - unsigned char *outbuf = para_malloc(len); + /* RC4 may write more than len to the output buffer */ + unsigned char *outbuf = para_malloc(ROUND_UP(len, 8)); (*cf)(len, (unsigned char *)buf, outbuf, private); ret = sendall(fd, (char *)outbuf, &len); free(outbuf); @@ -212,15 +206,15 @@ __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...) * Receive at most \a size bytes from filedescriptor fd. If encryption is * available, decrypt the received buffer. * - * \return the number of bytes received on success. On receive errors, -E_RECV + * \return The number of bytes received on success. On receive errors, -E_RECV * is returned. On crypt errors, the corresponding crypt error number is * returned. * * \sa recv(2) */ -__must_check int recv_bin_buffer(int fd, char *buf, ssize_t size) +__must_check int recv_bin_buffer(int fd, char *buf, size_t size) { - int n; + ssize_t n; crypt_function *cf = NULL; if (fd + 1 <= cda_size) @@ -229,8 +223,11 @@ __must_check int recv_bin_buffer(int fd, char *buf, ssize_t size) unsigned char *tmp = para_malloc(size); void *private = crypt_data_array[fd].private_data; n = recv(fd, tmp, size, 0); - if (n > 0) - (*cf)(n, tmp, (unsigned char *)buf, private); + if (n > 0) { + size_t numbytes = n; + unsigned char *b = (unsigned char *)buf; + (*cf)(numbytes, tmp, b, private); + } free(tmp); } else n = recv(fd, buf, size, 0); @@ -249,11 +246,16 @@ __must_check int recv_bin_buffer(int fd, char *buf, ssize_t size) * Read and decrypt at most \a size - 1 bytes from file descriptor \a fd and * write a NULL byte at the end of the received data. * -*/ -int recv_buffer(int fd, char *buf, ssize_t size) + * \return: The return value of the underlying call to \a recv_bin_buffer(). + * + * \sa recv_bin_buffer() + */ +int recv_buffer(int fd, char *buf, size_t size) { int n; + if (!size) + return -E_RECV; n = recv_bin_buffer(fd, buf, size - 1); if (n >= 0) buf[n] = '\0'; @@ -291,34 +293,15 @@ int get_host_info(char *host, struct hostent **ret) * * \sa socket(2) */ -int get_socket(void) +int get_stream_socket(int domain) { int socket_fd; - if ((socket_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) + if ((socket_fd = socket(domain, SOCK_STREAM, 0)) == -1) return -E_SOCKET; return socket_fd; } -/** - * a wrapper around connect(2) - * - * \param fd the file descriptor - * \param their_addr the address to connect - * - * \return \p -E_CONNECT on errors, 1 on success - * \sa connect(2) - */ -int para_connect(int fd, struct sockaddr_in *their_addr) -{ - int ret; - - if ((ret = connect(fd, (struct sockaddr *)their_addr, - sizeof(struct sockaddr))) == -1) - return -E_CONNECT; - return 1; -} - /** * paraslash's wrapper around the accept system call * @@ -326,13 +309,17 @@ int para_connect(int fd, struct sockaddr_in *their_addr) * \param addr structure which is filled in with the address of the peer socket * \param size should contain the size of the structure pointed to by \a addr * + * Accept incoming connections on \a addr. Retry if interrupted. + * + * \return The new file descriptor on success, \a -E_ACCEPT on errors. + * * \sa accept(2). */ int para_accept(int fd, void *addr, socklen_t size) { int new_fd; - do + do new_fd = accept(fd, (struct sockaddr *) addr, &size); while (new_fd < 0 && errno == EINTR); return new_fd < 0? -E_ACCEPT : new_fd; @@ -370,34 +357,42 @@ int init_unix_addr(struct sockaddr_un *u, const char *name) } /** - * prepare, create, and bind and socket for local communication + * Prepare, create, and bind a socket for local communication. * - * \param name the socket pathname - * \param unix_addr pointer to the \p AF_UNIX socket structure - * \param mode the desired mode of the socket + * \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 functions creates a local socket for sequenced, reliable, * two-way, connection-based byte streams. + * + * \return The file descriptor, on success, negative on errors. + * * \sa socket(2) * \sa bind(2) * \sa chmod(2) */ -int create_pf_socket(const char *name, struct sockaddr_un *unix_addr, int mode) +int create_local_socket(const char *name, struct sockaddr_un *unix_addr, + mode_t mode) { int fd, ret; - fd = socket(PF_UNIX, SOCK_STREAM, 0); - if (fd < 0) - return -E_SOCKET; -// unlink(name); ret = init_unix_addr(unix_addr, name); if (ret < 0) return ret; + fd = socket(PF_UNIX, SOCK_STREAM, 0); + if (fd < 0) + return -E_SOCKET; + ret = -E_BIND; if (bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX) < 0) - return -E_BIND; + goto err; + ret = -E_CHMOD; if (chmod(name, mode) < 0) - return -E_CHMOD; + goto err; return fd; +err: + close(fd); + return ret; } #ifndef HAVE_UCRED @@ -418,6 +413,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size) * * \return On success, this call returns the number of characters sent. On * error, \p -E_SENDMSG ist returned. + * * \sa okir's Black Hats Manual * \sa sendmsg(2) */ @@ -455,7 +451,7 @@ ssize_t send_cred_buffer(int sock, char *buf) return ret; } -static void dispose_fds(int *fds, int num) +static void dispose_fds(int *fds, unsigned num) { int i; @@ -521,12 +517,13 @@ int recv_cred_buffer(int fd, char *buf, size_t size) /** * create a socket, bind it and listen + * * \param port the tcp port to listen on * * \return The file descriptor of the created socket, negative * on errors. * - * \sa get_socket() + * \sa get_stream_socket() * \sa setsockopt(2) * \sa bind(2) * \sa listen(2) @@ -534,7 +531,7 @@ int recv_cred_buffer(int fd, char *buf, size_t size) int init_tcp_socket(int port) { struct sockaddr_in my_addr; - int fd, ret = get_socket(); + int fd, ret = get_stream_socket(AF_INET); if (ret < 0) return ret; @@ -572,6 +569,7 @@ err: * to receive at most \a bufsize bytes from file descriptor \a fd. * If at least \p strlen(\a pattern) bytes were received, the beginning of * the received buffer is compared with \a pattern, ignoring case. + * * \sa recv_buffer() * \sa strncasecmp(3) */