X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=4dd376748313c4cd8e614da0744d734062bb5e80;hb=b16ad193bad91e48cdfb9da42ae8192bd129d7fb;hp=e1951e5e8d87501b1ef9096d3f3df64117e904f0;hpb=73a77d2b8293081f7bda2838242935bd74aebbe0;p=paraslash.git

diff --git a/net.c b/net.c
index e1951e5e..4dd37674 100644
--- a/net.c
+++ b/net.c
@@ -273,7 +273,12 @@ struct pre_conn_opt {
 	struct list_head node;		/**< FIFO, as sockopt order matters. */
 };
 
-/** FIFO list of pre-connection socket options to be set */
+/**
+ * List of pre-connection socket options to be set.
+ *
+ * This list contains transport-layer independent encapsulation of socket
+ * options that need to be registered prior to setting up a connection.
+ */
 struct flowopts {
 	struct list_head sockopts;
 };
@@ -286,7 +291,7 @@ struct flowopts {
  */
 struct flowopts *flowopt_new(void)
 {
-	struct flowopts *new = para_malloc(sizeof(*new));
+	struct flowopts *new = alloc(sizeof(*new));
 
 	init_list_head(&new->sockopts);
 	return new;
@@ -307,7 +312,7 @@ struct flowopts *flowopt_new(void)
 void flowopt_add(struct flowopts *fo, int lev, int opt,
 		const char *name, const void *val, int len)
 {
-	struct pre_conn_opt *new = para_malloc(sizeof(*new));
+	struct pre_conn_opt *new = alloc(sizeof(*new));
 
 	new->sock_option = opt;
 	new->sock_level	 = lev;
@@ -317,7 +322,7 @@ void flowopt_add(struct flowopts *fo, int lev, int opt,
 		new->opt_val = NULL;
 		new->opt_len = 0;
 	} else {
-		new->opt_val = para_malloc(len);
+		new->opt_val = alloc(len);
 		new->opt_len = len;
 		memcpy(new->opt_val, val, len);
 	}
@@ -801,25 +806,21 @@ int recv_buffer(int fd, char *buf, size_t size)
  * Wrapper around the accept system call.
  *
  * \param fd The listening socket.
- * \param rfds An optional fd_set pointer.
  * \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 new_fd Result pointer.
  *
- * Accept incoming connections on \a addr, retry if interrupted. If \a rfds is
- * not \p NULL, return 0 if \a fd is not set in \a rfds without calling accept().
+ * Accept incoming connections on addr, retry if interrupted.
  *
  * \return Negative on errors, zero if no connections are present to be accepted,
  * one otherwise.
  *
  * \sa accept(2).
  */
-int para_accept(int fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd)
+int para_accept(int fd, void *addr, socklen_t size, int *new_fd)
 {
 	int ret;
 
-	if (rfds && !FD_ISSET(fd, rfds))
-		return 0;
 	do
 		ret = accept(fd, (struct sockaddr *) addr, &size);
 	while (ret < 0 && errno == EINTR);