X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=d9616248b5dcf1a814ef7e3c457891bdd64c2ffb;hp=f570273f6c3b5d4aaa71133463d16c54149efc69;hb=957daedc7a0f238a9d3b34ff4a3c84d5ed3851ec;hpb=6ba0a5055cfdec25d54d90a56f9345d5d4be09be

diff --git a/send_common.c b/send_common.c
index f570273f..d9616248 100644
--- a/send_common.c
+++ b/send_common.c
@@ -6,7 +6,10 @@
 
 /** \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;
@@ -159,8 +162,8 @@ void send_chunk(struct sender_client *sc, struct sender_status *ss,
 			if (ret < 0)
 				goto out;
 		}
-		sc->header_sent = 1;
 	}
+	sc->header_sent = 1;
 	ret = send_queued_chunks(sc->fd, sc->cq, max_bytes_per_write);
 	if (ret < 0) {
 		shutdown_client(sc, ss);
@@ -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)",
@@ -389,7 +392,96 @@ char *generic_sender_help(void)
 {
 	return make_message(
 		"usage: {on|off}\n"
-		"usage: {allow|deny} IP mask\n"
-		"example: allow 127.0.0.1 32\n"
+		"usage: {allow|deny} IP[/netmask]\n"
+		"       where mask defaults to 32\n"
+		"example: allow 192.168.0.1/24\n"
 	);
 }
+
+static int parse_fec_parms(const char *arg, struct sender_command_data *scd)
+{
+	int32_t val;
+	char *a = para_strdup(arg), *b = a, *e = strchr(b, ':');
+	int ret = -E_COMMAND_SYNTAX;
+
+	/* parse max slice bytes */
+	if (!e)
+		goto out;
+	*e = '\0';
+	ret = para_atoi32(b, &val);
+	if (ret < 0)
+		goto out;
+	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+	if (val < 0 || val > 65535)
+		goto out;
+	scd->max_slice_bytes = val;
+	/* parse data_slices_per_group */
+	b = e + 1;
+	e = strchr(b, ':');
+	ret = -E_COMMAND_SYNTAX;
+	if (!e)
+		goto out;
+	*e = '\0';
+	ret = para_atoi32(b, &val);
+	if (ret < 0)
+		goto out;
+	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+	if (val < 0 || val > 255)
+		goto out;
+	scd->data_slices_per_group = val;
+	/* parse slices_per_group */
+	b = e + 1;
+	ret = para_atoi32(b, &val);
+	if (ret < 0)
+		goto out;
+	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+	if (val < 0 || val < scd->data_slices_per_group)
+		goto out;
+	scd->slices_per_group = val;
+	ret = 0;
+out:
+	free(a);
+	return ret;
+}
+
+/**
+ * Parse a FEC URL string.
+ *
+ * \param arg the URL string to parse.
+ * \param scd The structure containing host, port and the FEC parameters.
+ *
+ * \return Standard.
+ *
+ * A FEC URL consists of an ordinary URL string according to RFC 3986,
+ * optionally followed by a slash and the three FEC parameters slice_size,
+ * data_slices_per_group and slices_per_group. The three FEC parameters are
+ * separated by colons.
+ *
+ * \sa \ref parse_url().
+ */
+int parse_fec_url(const char *arg, struct sender_command_data *scd)
+{
+	int ret;
+	ssize_t len = sizeof(scd->host);
+	char *a = para_strdup(arg), *p = strchr(a, '/');
+
+	if (p) {
+		*p = '\0';
+		len = strlen(a);
+	}
+	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+	if (!parse_url(a, scd->host, len, &scd->port))
+		goto out;
+	if (p) {
+		ret = parse_fec_parms(p + 1, scd);
+		goto out;
+	}
+	/* use default fec parameters. */
+	scd->max_slice_bytes = 1490;
+	scd->slices_per_group = 16;
+	scd->data_slices_per_group = 14;
+	ret = 0;
+out:
+	free(a);
+	return ret;
+}