X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=b44c8133d821ef2611650eee0ea40039af18bbc3;hp=8653c330e6b0eb24bacb239c3904062105ea3128;hb=f8a941c97b6d0a891d0e075c4996d033a7db63bf;hpb=3bbec8ac8ab1879d24acbff447850c0e3872daa7

diff --git a/send_common.c b/send_common.c
index 8653c330..b44c8133 100644
--- a/send_common.c
+++ b/send_common.c
@@ -1,12 +1,15 @@
 /*
- * 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.
  */
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
+#include <regex.h>
 #include <dirent.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
@@ -39,7 +42,7 @@
  */
 static int open_sender(unsigned l4type, int port)
 {
-	int fd, ret = para_listen(AF_UNSPEC, l4type, port);
+	int fd, ret = para_listen_simple(l4type, port);
 
 	if (ret < 0)
 		return ret;
@@ -214,7 +217,7 @@ void init_sender_status(struct sender_status *ss, char **access_arg,
  *
  * \return The string printed in the "si" command.
  */
-char *get_sender_info(struct sender_status *ss, char *name)
+char *get_sender_info(struct sender_status *ss, const char *name)
 {
 	char *clnts = NULL, *ret;
 	struct sender_client *sc, *tmp_sc;
@@ -228,14 +231,14 @@ char *get_sender_info(struct sender_status *ss, char *name)
 	ret = make_message(
 		"%s sender:\n"
 		"\tstatus: %s\n"
-		"\tport: %d\n"
+		"\tport: %s\n"
 		"\tnumber of connected clients: %d\n"
 		"\tmaximal number of clients: %d%s\n"
 		"\tconnected clients: %s\n"
 		"\taccess %s list: %s\n",
 		name,
 		(ss->listen_fd >= 0)? "on" : "off",
-		ss->port,
+		stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"),
 		ss->num_clients,
 		ss->max_clients,
 		ss->max_clients > 0? "" : " (unlimited)",
@@ -345,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;
@@ -474,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;