X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send.h;h=9a6e5f745c406abe4a91f34da7a104946922c1d5;hp=cb35e2555dee9b837a4e2c580279ce339af35763;hb=767a4a54c967bc4b80bd14d02e89fe91acd848dd;hpb=abfb661f35e99e99c09a94d84839356d905af080

diff --git a/send.h b/send.h
index cb35e255..9a6e5f74 100644
--- a/send.h
+++ b/send.h
@@ -1,26 +1,27 @@
-/*
- * Copyright (C) 2005-2014 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. */
 
-/** The sender subcommands. */
+#define SENDER_SUBCOMMANDS \
+	SENDER_SUBCOMMAND(add) /**< Add a target (udp only). */ \
+	SENDER_SUBCOMMAND(delete) /**< Delete a target (udp only). */ \
+	SENDER_SUBCOMMAND(allow) /**< Allow connections from given IP address(es). */ \
+	SENDER_SUBCOMMAND(deny) /**< Deny connections from given IP address(es). */ \
+	SENDER_SUBCOMMAND(on) /**< Activate the sender. */ \
+	SENDER_SUBCOMMAND(off) /**< Deactivate the sender. */ \
+
+#define SENDER_SUBCOMMAND(_name) SENDER_ ## _name,
 enum sender_subcommand {
-	SENDER_ADD, /**< Add a target (udp only). */
-	SENDER_DELETE, /**< Delete a target (udp only). */
-	SENDER_ALLOW, /**< Allow connections from given IP address(es). */
-	SENDER_DENY, /**< Deny connections from given IP address(es). */
-	SENDER_ON, /**< Activate the sender. */
-	SENDER_OFF, /**< Deactivate the sender. */
+	SENDER_SUBCOMMANDS
 	NUM_SENDER_CMDS /**< Used as array size in struct \ref sender. */
 };
+#undef SENDER_SUBCOMMAND
+#define SENDER_SUBCOMMAND(_name) #_name,
 
 /**
  * Describes one supported sender of para_server.
  *
- * \sa http_send.c udp_send.c, dccp_send.c.
+ * \sa \ref http_send.c \ref udp_send.c, \ref dccp_send.c.
  */
 struct sender {
 	/** The name of the sender. */
@@ -177,10 +178,10 @@ struct sender_status {
 
 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, 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);
 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,