X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send.h;h=67b47e48d9e7fd0b96fa4c5c7abd95594c6e2cf0;hp=b70ba09452a5cf9abff66d8a0c6b40472fd5a502;hb=ba83a291cd486e8ab53ac64d81b17d8f5705d715;hpb=fe3d9cd155b5eac8706015854c343440823e12da

diff --git a/send.h b/send.h
index b70ba094..67b47e48 100644
--- a/send.h
+++ b/send.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file send.h Sender-related defines and structures. */
 
@@ -31,14 +27,11 @@ struct sender {
 	/** The name of the sender. */
 	const char *name;
 	/**
-	 * The init function of this sender.
-	 *
-	 * It must fill in all function pointers of \a s as well as the \a
-	 * client_cmds array, see below. It should also do all necessary
-	 * preparations to init this sending facility, for example it could
-	 * open a tcp port.
+	 * Parse the command line options and initialize this sender (e.g.,
+	 * initialize target or access control lists, listen on a network
+	 * socket, etc.).
 	 */
-	void (*init)(struct sender *s);
+	void (*init)(void);
 	/**
 	 * Return the help text of this sender.
 	 *
@@ -92,6 +85,8 @@ struct sender {
 	 * the clients aware of the end-of-file condition.
 	 */
 	void (*shutdown_clients)(void);
+	/** Dellocate all resources. Only called on exit. */
+	void (*shutdown)(void);
 	/**
 	 * Array of function pointers for the sender subcommands.
 	 *
@@ -111,6 +106,11 @@ struct sender {
 	int (*resolve_target)(const char *, struct sender_command_data *);
 };
 
+/** NULL-terminated list, defined in \ref vss.c. */
+extern const struct sender * const senders[];
+/** Iterate over all senders. */
+#define FOR_EACH_SENDER(_i) for ((_i) = 0; senders[(_i)]; (_i)++)
+
 /** Describes one client, connected to a paraslash sender. */
 struct sender_client {
 	/** The file descriptor of the client. */
@@ -164,10 +164,14 @@ struct fec_client_parms {
 
 /** Describes the current status of one paraslash sender. */
 struct sender_status {
-	/** The file descriptor of the socket this sender is listening on. */
-	int listen_fd;
-	/** The TCP/DCCP port used by this sender. */
-	int port;
+	/** Number of sockets to listen on, size of the two arrays below. */
+	unsigned num_listen_fds;
+	/** Derived from --http-listen-address and --dccp-listen-address. */
+	char **listen_addresses;
+	/** Default TCP/DCCP port number for addresses w/o port. */
+	int default_port;
+	/** The socket fd(s) this sender is listening on. */
+	int *listen_fds;
 	/** The current number of simultaneous connections. */
 	int num_clients;
 	/** The maximal number of simultaneous connections. */
@@ -180,17 +184,22 @@ struct sender_status {
 	struct list_head client_list;
 };
 
+/** Iterate over all listening addresses of the http/dccp sender. */
+#define FOR_EACH_LISTEN_FD(_n, _ss) for (_n = 0; _n < (_ss)->num_listen_fds; _n++)
+
 void shutdown_client(struct sender_client *sc, struct sender_status *ss);
 void shutdown_clients(struct sender_status *ss);
 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);
 char *generic_sender_status(struct sender_status *ss, const char *name);
 void generic_com_allow(struct sender_command_data *scd,
 		struct sender_status *ss);
 void generic_com_deny(struct sender_command_data *scd,
 		struct sender_status *ss);
-int generic_com_on(struct sender_status *ss, unsigned protocol);
+void generic_com_on(struct sender_status *ss, unsigned protocol);
+void generic_acl_deplete(struct list_head *acl);
 void generic_com_off(struct sender_status *ss);
 char *generic_sender_help(void);
 struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds);