projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time.c: Add GPL header and improve documentation.
[paraslash.git]
/
net.c
diff --git
a/net.c
b/net.c
index 458f5c8da356345fc5e0f18ece9d2b89a0957565..3dcd9c0be5884f59293d012c3e117ea61b83a282 100644
(file)
--- a/
net.c
+++ b/
net.c
@@
-12,21
+12,23
@@
#include "error.h"
#include "error.h"
-/**
holds information about one encrypted connection
*/
+/**
Information about one encrypted connection.
*/
struct crypt_data {
struct crypt_data {
- /**
function used to decrypt received data
*/
+ /**
Function used to decrypt received data.
*/
crypt_function *recv;
crypt_function *recv;
- /**
function used to encrypt data to be sent
*/
+ /**
Function used to encrypt data to be sent.
*/
crypt_function *send;
crypt_function *send;
- /** context-dependent data, passed to \a recv() and \a send() */
+ /**
+ * Context-dependent data (crypt keys), passed verbatim to the above
+ * crypt functions.
+ */
void *private_data;
};
void *private_data;
};
-/**
array holding per fd crypt data per
*/
+/**
Array holding per fd crypt data.
*/
static struct crypt_data *crypt_data_array;
static struct crypt_data *crypt_data_array;
-/**
current size of the crypt data array
*/
+/**
Current size of the crypt data array.
*/
static unsigned cda_size = 0;
static unsigned cda_size = 0;
-
/**
* activate encryption for one file descriptor
*
/**
* activate encryption for one file descriptor
*
@@
-149,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;
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);
(*cf)(len, (unsigned char *)buf, outbuf, private);
ret = sendall(fd, (char *)outbuf, &len);
free(outbuf);
@@
-290,11
+293,11
@@
int get_host_info(char *host, struct hostent **ret)
*
* \sa socket(2)
*/
*
* \sa socket(2)
*/
-int get_s
ocket(void
)
+int get_s
tream_socket(int domain
)
{
int socket_fd;
{
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;
}
return -E_SOCKET;
return socket_fd;
}
@@
-374,11
+377,11
@@
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.
*
* This functions creates a local socket for sequenced, reliable,
* two-way, connection-based byte streams.
@@
-394,18
+397,22
@@
int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
{
int fd, ret;
{
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;
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)
if (bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX) < 0)
- return -E_BIND;
+ goto err;
+ ret = -E_CHMOD;
if (chmod(name, mode) < 0)
if (chmod(name, mode) < 0)
-
return -E_CHMOD
;
+
goto err
;
return fd;
return fd;
+err:
+ close(fd);
+ return ret;
}
#ifndef HAVE_UCRED
}
#ifndef HAVE_UCRED
@@
-536,7
+543,7
@@
int recv_cred_buffer(int fd, char *buf, size_t size)
* \return The file descriptor of the created socket, negative
* on errors.
*
* \return The file descriptor of the created socket, negative
* on errors.
*
- * \sa get_socket()
+ * \sa get_s
tream_s
ocket()
* \sa setsockopt(2)
* \sa bind(2)
* \sa listen(2)
* \sa setsockopt(2)
* \sa bind(2)
* \sa listen(2)
@@
-544,7
+551,7
@@
int recv_cred_buffer(int fd, char *buf, size_t size)
int init_tcp_socket(int port)
{
struct sockaddr_in my_addr;
int init_tcp_socket(int port)
{
struct sockaddr_in my_addr;
- int fd, ret = get_s
ocket(
);
+ int fd, ret = get_s
tream_socket(AF_INET
);
if (ret < 0)
return ret;
if (ret < 0)
return ret;