X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=ea494d9a7b23f5ee87186917d11e883631ec9cbc;hp=acb7aa6d06777863cccffe8a317749618b11060b;hb=HEAD;hpb=d31995b3074bb19aa4da66ce5c4774ca9ed101a1

diff --git a/send_common.c b/send_common.c
index acb7aa6d..8dc82e9c 100644
--- a/send_common.c
+++ b/send_common.c
@@ -21,43 +21,15 @@
 #include "afs.h"
 #include "server.h"
 #include "acl.h"
+#include "sched.h"
 #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. */
 #define MAX_CQ_BYTES 40000
 
-/**
- * Open a passive socket of given layer4 type.
- *
- * Set the resulting file descriptor to nonblocking mode and add it to the list
- * of fds that are being closed in the child process when the server calls
- * fork().
- *
- * \param l4type The transport-layer protocol.
- * \param port The port number.
- *
- * \return The listening fd on success, negative on errors.
- */
-static int open_sender(unsigned l4type, int port)
-{
-	int fd, ret = para_listen_simple(l4type, port);
-
-	if (ret < 0)
-		return ret;
-	fd = ret;
-	ret = mark_fd_nonblocking(fd);
-	if (ret < 0) {
-		close(fd);
-		return ret;
-	}
-	add_close_on_fork_list(fd);
-	return fd;
-}
-
 /**
  * Shut down a client connected to a paraslash sender.
  *
@@ -72,10 +44,12 @@ static int open_sender(unsigned l4type, int port)
  */
 void shutdown_client(struct sender_client *sc, struct sender_status *ss)
 {
-	PARA_INFO_LOG("shutting down %s on fd %d\n", sc->name, sc->fd);
+	if (!process_is_command_handler()) {
+		PARA_INFO_LOG("shutting down %s on fd %d\n", sc->name, sc->fd);
+		close(sc->fd);
+		del_close_on_fork_list(sc->fd);
+	}
 	free(sc->name);
-	close(sc->fd);
-	del_close_on_fork_list(sc->fd);
 	cq_destroy(sc->cq);
 	list_del(&sc->node);
 	free(sc->private_data);
@@ -131,22 +105,40 @@ int send_queued_chunks(int fd, struct chunk_queue *cq)
  *
  * \param ss The struct to initialize.
  * \param acl_opt_result Contains array of --{http|dccp}-access arguments.
- * \param port The tcp or dccp port to listen on.
+ * \param listen_address_opt_result Where to listen on.
+ * \param default_port Used for addresses with no specified port.
  * \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,
-		const struct lls_opt_result *acl_opt_result, int port,
-		int max_clients, int default_deny)
+		const struct lls_opt_result *acl_opt_result,
+		const struct lls_opt_result *listen_address_opt_result,
+		int default_port, int max_clients, int default_deny)
 {
 	int i;
+	unsigned n = lls_opt_given(listen_address_opt_result);
+
+	if (n == 0) {
+		ss->num_listen_fds = 1;
+		ss->listen_addresses = alloc(sizeof(char *));
+		ss->listen_addresses[0] = NULL;
+		ss->listen_fds = alloc(sizeof(int));
+		ss->listen_fds[0] = -1;
+	} else {
+		ss->num_listen_fds = n;
+		ss->listen_addresses = alloc(n * sizeof(char *));
+		ss->listen_fds = alloc(n * sizeof(int));
+		FOR_EACH_LISTEN_FD(i, ss) {
+			ss->listen_addresses[i] = para_strdup(lls_string_val(i,
+				listen_address_opt_result));
+			ss->listen_fds[i] = -1;
+		}
+	}
+	ss->default_port = default_port;
 
-	ss->listen_fd = -1;
-	INIT_LIST_HEAD(&ss->client_list);
-	ss->port = port;
-
+	init_list_head(&ss->client_list);
 	/* Initialize an access control list */
-	INIT_LIST_HEAD(&ss->acl);
+	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];
@@ -162,6 +154,25 @@ void init_sender_status(struct sender_status *ss,
 	ss->default_deny = default_deny;
 }
 
+/**
+ * Deallocate all resources allocated in \ref init_sender_status().
+ *
+ * \param ss The structure whose components should be freed.
+ *
+ * This frees the dynamically allocated parts of the structure which was
+ * initialized by an earlier call to \ref init_sender_status(). It does *not*
+ * call free(ss), though.
+ */
+void free_sender_status(const struct sender_status *ss)
+{
+	int i;
+
+	free(ss->listen_fds);
+	FOR_EACH_LISTEN_FD(i, ss)
+		free(ss->listen_addresses[i]);
+	free(ss->listen_addresses);
+}
+
 /**
  * Return a string containing the current status of a sender.
  *
@@ -170,26 +181,37 @@ void init_sender_status(struct sender_status *ss,
  *
  * \return The string printed in the "si" command.
  */
-char *generic_sender_status(struct sender_status *ss, const char *name)
+__malloc char *generic_sender_status(struct sender_status *ss, const char *name)
 {
-	char *clnts = NULL, *ret;
+	char *clnts = NULL, *ret, *addr = NULL;
 	struct sender_client *sc, *tmp_sc;
-
+	unsigned n;
 	char *acl_contents = acl_get_contents(&ss->acl);
+
 	list_for_each_entry_safe(sc, tmp_sc, &ss->client_list, node) {
 		char *tmp = make_message("%s%s ", clnts? clnts : "", sc->name);
 		free(clnts);
 		clnts = tmp;
 	}
+	FOR_EACH_LISTEN_FD(n, ss) {
+		char *url = format_url(ss->listen_addresses[n], ss->default_port);
+		char *tmp = make_message("%s%s%s (fd %d)", addr?
+			addr : "", addr? ", " : "", url,
+			ss->listen_fds[n]);
+		free(url);
+		free(addr);
+		addr = tmp;
+	}
 	ret = make_message(
-		"status: %s\n"
-		"port: %s\n"
+		"listening address(es): %s\n"
+		"default 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"),
+		addr,
+		stringify_port(ss->default_port,
+			strcmp(name, "http")? "dccp" : "tcp"),
 		ss->num_clients,
 		ss->max_clients,
 		ss->max_clients > 0? "" : " (unlimited)",
@@ -216,6 +238,22 @@ void generic_com_allow(struct sender_command_data *scd,
 	acl_allow(scd->host, scd->netmask, &ss->acl, ss->default_deny);
 }
 
+/**
+ * Empty the access control list of a sender.
+ *
+ * \param acl The access control list of the sender.
+ *
+ * This is called from the ->shutdown methods of the http and the dccp sender.
+ */
+void generic_acl_deplete(struct list_head *acl)
+{
+	/*
+	 * Since default_deny is false, the ACL is considered a blacklist. A
+	 * netmask of zero matches any IP address, so this call empties the ACL.
+	 */
+	acl_allow("0.0.0.0", 0 /* netmask */, acl, 0 /* default_deny */);
+}
+
 /**
  * Deny connections from the given range of IP addresses.
  *
@@ -234,21 +272,48 @@ void generic_com_deny(struct sender_command_data *scd,
  * Activate a paraslash sender.
  *
  * \param ss The sender to activate.
- * \param protocol The symbolic name of the transport-layer protocol.
+ * \param protocol layer4 type (IPPROTO_TCP or IPPROTO_DCCP).
  *
- * \return Standard.
+ * This opens a passive socket of given layer4 type, sets the resulting file
+ * descriptor to nonblocking mode and adds it to the close on fork list.
+ *
+ * Errors are logged but otherwise ignored.
  */
-int generic_com_on(struct sender_status *ss, unsigned protocol)
+void generic_com_on(struct sender_status *ss, unsigned protocol)
 {
 	int ret;
-
-	if (ss->listen_fd >= 0)
-		return 1;
-	ret = open_sender(protocol, ss->port);
-	if (ret < 0)
-		return ret;
-	ss->listen_fd = ret;
-	return 1;
+	unsigned n;
+
+	FOR_EACH_LISTEN_FD(n, ss) {
+		if (ss->listen_fds[n] >= 0)
+			continue;
+		ret = para_listen(protocol, ss->listen_addresses[n],
+			ss->default_port);
+		if (ret < 0) {
+			char *url = format_url(ss->listen_addresses[n],
+				ss->default_port);
+			PARA_ERROR_LOG("could not listen on %s %s: %s\n",
+				protocol == IPPROTO_TCP? "TCP" : "DCCP",
+				url, para_strerror(-ret));
+			free(url);
+			continue;
+		}
+		ss->listen_fds[n] = ret;
+		ret = mark_fd_nonblocking(ss->listen_fds[n]);
+		if (ret < 0) {
+			char *url = format_url(ss->listen_addresses[n],
+				ss->default_port);
+			PARA_ERROR_LOG("could not set %s socket fd for %s to "
+				"nonblocking mode: %s\n",
+				protocol == IPPROTO_TCP? "TCP" : "DCCP", url,
+				para_strerror(-ret));
+			free(url);
+			close(ss->listen_fds[n]);
+			ss->listen_fds[n] = -1;
+			continue;
+		}
+		add_close_on_fork_list(ss->listen_fds[n]);
+	}
 }
 
 /**
@@ -262,24 +327,25 @@ int generic_com_on(struct sender_status *ss, unsigned protocol)
  */
 void generic_com_off(struct sender_status *ss)
 {
-	if (ss->listen_fd < 0)
-		return;
-	PARA_NOTICE_LOG("closing port %d\n", ss->port);
-	close(ss->listen_fd);
-	del_close_on_fork_list(ss->listen_fd);
-	shutdown_clients(ss);
-	ss->listen_fd = -1;
+	unsigned n;
+
+	FOR_EACH_LISTEN_FD(n, ss) {
+		if (ss->listen_fds[n] < 0)
+			return;
+		close(ss->listen_fds[n]);
+		del_close_on_fork_list(ss->listen_fds[n]);
+		shutdown_clients(ss);
+		ss->listen_fds[n] = -1;
+	}
 }
 
 /**
- * Accept a connection on the socket this server is listening on.
+ * Accept a connection on the socket(s) this server is listening on.
  *
  * \param ss The sender whose listening fd is ready for reading.
- * \param rfds Passed to para_accept(),
  *
- * This must be called only if the socket fd of \a ss is ready for reading.  It
- * calls para_accept() to accept the connection and performs the following
- * actions on the resulting file descriptor \a fd:
+ * This accepts incoming connections on any of the listening sockets of the
+ * server. If there is a connection pending, the function
  *
  *	- Checks whether the maximal number of connections are exceeded.
  *	- Sets \a fd to nonblocking mode.
@@ -300,40 +366,44 @@ 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, fd_set *rfds)
+struct sender_client *accept_sender_client(struct sender_status *ss)
 {
 	struct sender_client *sc;
 	int fd, ret;
+	unsigned n;
 
-	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;
-	ret = -E_MAX_CLIENTS;
-	if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients)
-		goto err_out;
-	ret = mark_fd_nonblocking(fd);
-	if (ret < 0)
-		goto err_out;
-	ret = acl_check_access(fd, &ss->acl, ss->default_deny);
-	if (ret < 0)
-		goto err_out;
-	ss->num_clients++;
-	sc = para_calloc(sizeof(*sc));
-	sc->fd = fd;
-	sc->name = para_strdup(remote_name(fd));
-	sc->cq = cq_new(MAX_CQ_BYTES);
-	para_list_add(&sc->node, &ss->client_list);
-	add_close_on_fork_list(fd);
-	PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", ss->num_clients,
-		sc->name, fd);
-	return sc;
-err_out:
-	PARA_WARNING_LOG("%s\n", para_strerror(-ret));
-	close(fd);
+	FOR_EACH_LISTEN_FD(n, ss) {
+		if (ss->listen_fds[n] < 0)
+			continue;
+		ret = para_accept(ss->listen_fds[n], NULL, 0, &fd);
+		if (ret < 0)
+			goto warn;
+		if (ret == 0)
+			continue;
+		ret = -E_MAX_CLIENTS;
+		if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients)
+			goto close_fd_and_warn;
+		ret = mark_fd_nonblocking(fd);
+		if (ret < 0)
+			goto close_fd_and_warn;
+		ret = acl_check_access(fd, &ss->acl, ss->default_deny);
+		if (ret < 0)
+			goto close_fd_and_warn;
+		ss->num_clients++;
+		sc = zalloc(sizeof(*sc));
+		sc->fd = fd;
+		sc->name = para_strdup(remote_name(fd));
+		sc->cq = cq_new(MAX_CQ_BYTES);
+		para_list_add(&sc->node, &ss->client_list);
+		add_close_on_fork_list(fd);
+		PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", ss->num_clients,
+			sc->name, fd);
+		return sc;
+close_fd_and_warn:
+		close(fd);
+warn:
+		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
+	}
 	return NULL;
 }
 
@@ -343,7 +413,7 @@ err_out:
  * \return A dynamically allocated string containing the help text for
  * a paraslash sender.
  */
-char *generic_sender_help(void)
+__malloc char *generic_sender_help(void)
 {
 	return make_message(
 		"usage: {on|off}\n"