X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=e01af24be27c49a00a60a61a98448bc3d82046f0;hb=4ce5b6570ed83ef2ab5296f369f147593507286b;hp=91200fc040bcfebafccf9e737fb65514af9ff8f2;hpb=d5e27e2a346da2f18188d317926a60687d082732;p=paraslash.git

diff --git a/net.c b/net.c
index 91200fc0..e01af24b 100644
--- a/net.c
+++ b/net.c
@@ -286,9 +286,9 @@ 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);
+	init_list_head(&new->sockopts);
 	return new;
 }
 
@@ -307,7 +307,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 +317,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 +801,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);