X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=988e8d48daf502bc70f0ba6cb7377dd1dc90429c;hp=354c9ed509deddc14f4528ce318e0d1ad90a8b7e;hb=8d106ca317a2c42f35a86ba244f843688f6939e6;hpb=779cfd85fd90d1f9182deade08d5fe3f2f3a1530

diff --git a/send_common.c b/send_common.c
index 354c9ed5..988e8d48 100644
--- a/send_common.c
+++ b/send_common.c
@@ -1,13 +1,19 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -128,19 +134,33 @@ int send_queued_chunks(int fd, struct chunk_queue *cq)
  * Initialize a struct sender status.
  *
  * \param ss The struct to initialize.
- * \param access_arg The array of access arguments given at the command line.
- * \param num_access_args The number of elements in \a access_arg.
+ * \param acl_opt_result Contains array of --{http|dccp}-access arguments.
  * \param port The tcp or dccp port to listen on.
  * \param max_clients The maximal number of simultaneous connections.
  * \param default_deny Whether a blacklist should be used for access control.
  */
-void init_sender_status(struct sender_status *ss, char **access_arg,
-	int num_access_args, int port, int max_clients, int default_deny)
+void init_sender_status(struct sender_status *ss,
+		const struct lls_opt_result *acl_opt_result, int port,
+		int max_clients, int default_deny)
 {
+	int i;
+
 	ss->listen_fd = -1;
 	INIT_LIST_HEAD(&ss->client_list);
 	ss->port = port;
-	acl_init(&ss->acl, access_arg, num_access_args);
+
+	/* Initialize an access control list */
+	INIT_LIST_HEAD(&ss->acl);
+	for (i = 0; i < lls_opt_given(acl_opt_result); i++) {
+		const char *arg = lls_string_val(i, acl_opt_result);
+		char addr[16];
+		int mask;
+		if (!parse_cidr(arg, addr, sizeof(addr), &mask))
+			PARA_WARNING_LOG("ACL syntax error: %s, ignoring\n",
+				arg);
+		else
+			acl_add_entry(&ss->acl, addr, mask);
+	}
 	ss->num_clients = 0;
 	ss->max_clients = max_clients;
 	ss->default_deny = default_deny;
@@ -154,7 +174,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, const char *name)
+char *generic_sender_status(struct sender_status *ss, const char *name)
 {
 	char *clnts = NULL, *ret;
 	struct sender_client *sc, *tmp_sc;
@@ -166,14 +186,12 @@ char *get_sender_info(struct sender_status *ss, const char *name)
 		clnts = tmp;
 	}
 	ret = make_message(
-		"%s sender:\n"
-		"\tstatus: %s\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,
+		"status: %s\n"
+		"port: %s\n"
+		"number of connected clients: %d\n"
+		"maximal number of clients: %d%s\n"
+		"connected clients: %s\n"
+		"access %s list: %s\n",
 		(ss->listen_fd >= 0)? "on" : "off",
 		stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"),
 		ss->num_clients,