X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=6248de5506eb131828bc4a63f5a55a88c4bc30b4;hp=b05f74da69b62d3fd3a25a7ac58633f1628c1249;hb=c2eecbd1d8445b6605f0d07aea0ed9a66499e5dd;hpb=c839ef92e35d5604748aa4674b400156ff7baced diff --git a/net.c b/net.c index b05f74da..6248de55 100644 --- a/net.c +++ b/net.c @@ -1,5 +1,5 @@ /* - * 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 @@ -24,15 +24,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; /** @@ -78,12 +82,13 @@ 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. + * \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. */ void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he) { @@ -101,18 +106,21 @@ void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he) /* * send out a buffer, resend on short writes - * @param fd the file descriptor - * @param buf The buffer to be sent - * @len The length of \a buf + * + * \param fd the file descriptor + * \param buf The buffer to be sent + * \param len The length of \a buf * * Due to circumstances beyond your control, the kernel might not send all the * data out in one chunk, and now, my friend, it's up to us to get the data out * there (Beej's Guide to Network Programming). + * + * \return This function returns 1 on success and \a -E_SEND on errors. The + * number of bytes actually sent is stored upon successful return in \a len. */ 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) { @@ -131,15 +139,16 @@ static int sendall(int fd, const char *buf, size_t *len) /** * encrypt and send buffer - * @param fd: the file descriptor - * @param buf the buffer to be encrypted and sent - * @param len the length of \a buf * - * Check if encrytion is available. If yes, encrypt the given buffer. Send out + * \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. * - * @return Positive on success, \p -E_SEND on errors. + * \return Positive on success, \p -E_SEND on errors. */ int send_bin_buffer(int fd, const char *buf, size_t len) { @@ -163,12 +172,13 @@ int send_bin_buffer(int fd, const char *buf, size_t len) /** * encrypt and send null terminated buffer. - * @param fd the file descriptor - * @param buf the null-terminated buffer to be send + * + * \param fd the file descriptor + * \param buf the null-terminated buffer to be send * * This is equivalent to send_bin_buffer(fd, buf, strlen(buf)). * - * @return Positive on success, \p -E_SEND on errors. + * \return Positive on success, \p -E_SEND on errors. */ int send_buffer(int fd, const char *buf) { @@ -178,10 +188,11 @@ int send_buffer(int fd, const char *buf) /** * send and encrypt a buffer given by a format string - * @param fd the file descriptor - * @param fmt a format string * - * @return Positive on success, \p -E_SEND on errors. + * \param fd the file descriptor + * \param fmt a format string + * + * \return Positive on success, \p -E_SEND on errors. */ __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...) { @@ -197,21 +208,22 @@ __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...) /** * receive and decrypt. * - * @param fd the file descriptor - * @param buf the buffer to write the decrypted data to - * @param size the size of @param buf + * \param fd the file descriptor + * \param buf the buffer to write the decrypted data to + * \param size the size of \a buf * - * Receive at most \a size bytes from filedescriptor fd. If encrytion is + * 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) @@ -220,8 +232,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); @@ -233,18 +248,23 @@ __must_check int recv_bin_buffer(int fd, char *buf, ssize_t size) /** * receive, decrypt and write terminating NULL byte * - * @param fd the file descriptor - * @param buf the buffer to write the decrypted data to - * @param size the size of \a buf + * \param fd the file descriptor + * \param buf the buffer to write the decrypted data to + * \param size the size of \a buf + * + * 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. * - * Read and decrypt at most size - 1 bytes from file descriptor \a fd and write - * a NULL byte at the end of the received data. + * \return: The return value of the underlying call to \a recv_bin_buffer(). * -*/ -int recv_buffer(int fd, char *buf, ssize_t size) + * \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'; @@ -278,7 +298,8 @@ int get_host_info(char *host, struct hostent **ret) * Create an IPv4 socket for sequenced, reliable, two-way, connection-based * byte streams. * - * @return The socket fd on success, -E_SOCKET on errors. + * \return The socket fd on success, -E_SOCKET on errors. + * * \sa socket(2) */ int get_socket(void) @@ -293,10 +314,11 @@ int get_socket(void) /** * a wrapper around connect(2) * - * @param fd the file descriptor - * @param their_addr the address to connect + * \param fd the file descriptor + * \param their_addr the address to connect + * + * \return \p -E_CONNECT on errors, 1 on success * - * @return \p -E_CONNECT on errors, 1 on success * \sa connect(2) */ int para_connect(int fd, struct sockaddr_in *their_addr) @@ -312,9 +334,13 @@ int para_connect(int fd, struct sockaddr_in *their_addr) /** * paraslash's wrapper around the accept system call * - * @param fd the listening socket - * @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 + * \param fd the listening socket + * \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). */ @@ -322,8 +348,10 @@ int para_accept(int fd, void *addr, socklen_t size) { int new_fd; - new_fd = accept(fd, (struct sockaddr *) addr, &size); - return new_fd == -1? -E_ACCEPT : new_fd; + do + new_fd = accept(fd, (struct sockaddr *) addr, &size); + while (new_fd < 0 && errno == EINTR); + return new_fd < 0? -E_ACCEPT : new_fd; } static int setserversockopts(int socket_fd) @@ -366,11 +394,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; @@ -389,9 +421,6 @@ int create_pf_socket(const char *name, struct sockaddr_un *unix_addr, int mode) } #ifndef HAVE_UCRED - struct ucred { - uid_t uid, pid, gid; -}; ssize_t send_cred_buffer(int sock, char *buf) { return send_buffer(sock, buf); @@ -409,6 +438,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) */ @@ -446,7 +476,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; @@ -512,6 +542,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 @@ -563,6 +594,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) */