X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=b44c8133d821ef2611650eee0ea40039af18bbc3;hp=d9616248b5dcf1a814ef7e3c457891bdd64c2ffb;hb=9b565c60fd159e12d255bb18db9dbff066deebea;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7

diff --git a/send_common.c b/send_common.c
index d9616248..b44c8133 100644
--- a/send_common.c
+++ b/send_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -348,15 +348,18 @@ void generic_com_off(struct sender_status *ss)
  * \sa \ref para_accept(), \ref mark_fd_nonblocking(), \ref acl_check_access(),
  * \ref cq_new(), \ref add_close_on_fork_list().
  */
-struct sender_client *accept_sender_client(struct sender_status *ss)
+struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds)
 {
 	struct sender_client *sc;
-	int fd, ret = para_accept(ss->listen_fd, NULL, 0);
-	if (ret < 0) {
+	int fd, ret;
+
+	if (ss->listen_fd < 0)
+		return NULL;
+	ret = para_accept(ss->listen_fd, rfds, NULL, 0, &fd);
+	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	if (ret <= 0)
 		return NULL;
-	}
-	fd = ret;
 	ret = -E_MAX_CLIENTS;
 	if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients)
 		goto err_out;
@@ -477,7 +480,7 @@ int parse_fec_url(const char *arg, struct sender_command_data *scd)
 		goto out;
 	}
 	/* use default fec parameters. */
-	scd->max_slice_bytes = 1490;
+	scd->max_slice_bytes = 1472;
 	scd->slices_per_group = 16;
 	scd->data_slices_per_group = 14;
 	ret = 0;