X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=acb7aa6d06777863cccffe8a317749618b11060b;hp=33c56e7ab135b50a4c77242cb3534ec67d5d9608;hb=a35c113e0bb9fa9ac02b77eb01dd32f49cd5c8d0;hpb=c773ec0d537d239e2eebe2d77a786f0ba49fdc22

diff --git a/send_common.c b/send_common.c
index 33c56e7a..acb7aa6d 100644
--- a/send_common.c
+++ b/send_common.c
@@ -1,14 +1,15 @@
-/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file 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 <dirent.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -23,6 +24,7 @@
 #include "send.h"
 #include "close_on_fork.h"
 #include "chunk_queue.h"
+#include "sched.h"
 #include "vss.h"
 
 /** Clients will be kicked if there are more than that many bytes pending. */
@@ -66,7 +68,7 @@ static int open_sender(unsigned l4type, int port)
  * list, destroy the chunk queue of this client, delete the client from the
  * list of connected clients and free the sender_client struct.
  *
- * \sa shutdown_clients().
+ * \sa \ref shutdown_clients().
  */
 void shutdown_client(struct sender_client *sc, struct sender_status *ss)
 {
@@ -113,7 +115,7 @@ int send_queued_chunks(int fd, struct chunk_queue *cq)
 		int ret;
 
 		cq_get(qc, &buf, &len);
-		ret = write_nonblock(fd, buf, len);
+		ret = xwrite(fd, buf, len);
 		if (ret < 0)
 			return ret;
 		cq_update(cq, ret);
@@ -128,19 +130,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 +170,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 +182,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,
@@ -194,7 +208,7 @@ char *get_sender_info(struct sender_status *ss, const char *name)
  * \param scd Contains the IP and the netmask.
  * \param ss The sender.
  *
- * \sa generic_com_deny().
+ * \sa \ref generic_com_deny().
  */
 void generic_com_allow(struct sender_command_data *scd,
 		struct sender_status *ss)
@@ -208,7 +222,7 @@ void generic_com_allow(struct sender_command_data *scd,
  * \param scd see \ref generic_com_allow().
  * \param ss see \ref generic_com_allow().
  *
- * \sa generic_com_allow().
+ * \sa \ref generic_com_allow().
  */
 void generic_com_deny(struct sender_command_data *scd,
 		struct sender_status *ss)
@@ -244,7 +258,7 @@ int generic_com_on(struct sender_status *ss, unsigned protocol)
  *
  * \param ss The sender to deactivate.
  *
- * \sa \ref del_close_on_fork_list(), shutdown_clients().
+ * \sa \ref del_close_on_fork_list(), \ref shutdown_clients().
  */
 void generic_com_off(struct sender_status *ss)
 {