X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send.h;h=5420523490808bd68ce4daad23589eb0609fc372;hp=0736b1bc18105d4001263dc383b7fb50d22d622b;hb=8d106ca317a2c42f35a86ba244f843688f6939e6;hpb=435ad905b15bdad01dc3189bed5bf1d647ed1229

diff --git a/send.h b/send.h
index 0736b1bc..54205234 100644
--- a/send.h
+++ b/send.h
@@ -1,21 +1,26 @@
 /*
- * Copyright (C) 2005-2014 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.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.
@@ -177,10 +182,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,