X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=9d0cb6c09aeaf2ba9ff19057f146e5f3d922e3ae;hp=70aacd8c0d2e9afc3739808de965d3653b31f0bc;hb=2ecabb05dbeb0948e514cdad1bb811d9edf97e2e;hpb=875273d8a8cec1055c4d5d3f1211b18e9e2b7412 diff --git a/net.c b/net.c index 70aacd8c..9d0cb6c0 100644 --- a/net.c +++ b/net.c @@ -1,19 +1,7 @@ /* - * 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 */ @@ -24,15 +12,19 @@ #include "error.h" -/** \cond holds information about one encrypted connection */ +/** holds 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, passed to \a recv() and \a send() */ void *private_data; }; -static unsigned cda_size = 0; +/** array holding per fd crypt data per */ static struct crypt_data *crypt_data_array; -/** \endcond */ +/** current size of the crypt data array */ +static unsigned cda_size = 0; /** @@ -116,8 +108,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) { @@ -212,15 +203,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 +220,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 +243,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'; @@ -307,6 +306,7 @@ int get_socket(void) * \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) @@ -326,13 +326,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; @@ -378,11 +382,15 @@ int init_unix_addr(struct sockaddr_un *u, const char *name) * * 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_pf_socket(const char *name, struct sockaddr_un *unix_addr, + mode_t mode) { int fd, ret; @@ -418,6 +426,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 +464,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,6 +530,7 @@ 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 @@ -572,6 +582,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) */