X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.h;h=68978a38c90f2dada11f21d0b55b8a078e4b4bef;hp=cc44a602a9f3ca2f63c68c8c984fb83c87f82703;hb=fc8dfbb416ff07cca08fbf4e13efcaa25e17cc54;hpb=a28eef552dc779eac12c1df430522dc4e20ae428

diff --git a/recv.h b/recv.h
index cc44a602..68978a38 100644
--- a/recv.h
+++ b/recv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,13 +11,13 @@
  */
 struct receiver_node {
 	/** Points to the corresponding receiver. */
-	struct receiver *receiver;
+	const struct receiver *receiver;
 	/** Receiver-specific data. */
 	void *private_data;
-	/** Pointer to the configuration data for this instance. */
-	void *conf;
+	/** The parsed command line options for this instance. */
+	struct lls_parse_result *lpr;
 	/** The task associated with this instance. */
-	struct task task;
+	struct task *task;
 	/** The receiver node is always the root of the buffer tree. */
 	struct btr_node *btrn;
 	/** Each receiver node maintains a buffer pool for the received data. */
@@ -44,34 +44,13 @@ struct receiver_node {
  */
 struct receiver {
 	/**
-	 * The name of the receiver.
-	 */
-	const char *name;
-	/**
-	 * The receiver init function.
+	 * The optional receiver init function.
 	 *
-	 * It must fill in all other function pointers and is assumed to succeed.
+	 * Performs any initialization needed before the receiver can be opened.
 	 *
 	 * \sa http_recv_init udp_recv_init.
 	 */
-	void (*init)(struct receiver *r);
-	/**
-	 * The command line parser of the receiver.
-	 *
-	 * It should check whether the command line options given by \a argc and \a
-	 * argv are valid.  On success, it should return a pointer to the
-	 * receiver-specific configuration data determined by \a argc and \a argv.
-	 * Note that this might be called more than once with different values of
-	 * \a argc and \a argv.
-	 */
-	void *(*parse_config)(int argc, char **argv);
-	/**
-	 * Deallocate the configuration structure of a receiver node.
-	 *
-	 * This calls the receiver-specific cleanup function generated by
-	 * gengetopt.
-	 */
-	void (*free_config)(void *conf);
+	void (*init)(void);
 	/**
 	 * Open one instance of the receiver.
 	 *
@@ -103,7 +82,7 @@ struct receiver {
 	 *
 	 * \sa select(2), time.c struct task, struct sched.
 	 */
-	void (*pre_select)(struct sched *s, struct task *t);
+	void (*pre_select)(struct sched *s, void *context);
 	/**
 	 * Evaluate the result from select().
 	 *
@@ -115,10 +94,8 @@ struct receiver {
 	 *
 	 * \sa select(2), struct receiver.
 	 */
-	int (*post_select)(struct sched *s, struct task *t);
+	int (*post_select)(struct sched *s, void *context);
 
-	/** The two help texts of this receiver. */
-	struct ggo_help help;
 	/**
 	 * Answer a buffer tree query.
 	 *
@@ -128,31 +105,23 @@ struct receiver {
 	btr_command_handler execute;
 };
 
-/** Define an array of all available receivers. */
-#define DEFINE_RECEIVER_ARRAY struct receiver receivers[] = { \
-	HTTP_RECEIVER \
-	DCCP_RECEIVER \
-	UDP_RECEIVER \
-	AFH_RECEIVER \
-	{.name = NULL}};
+#define RECV_CMD(_num) (lls_cmd(_num, recv_cmd_suite))
+
+#define RECV_CMD_OPT_RESULT(_recv, _opt, _lpr) \
+	(lls_opt_result(LSG_RECV_CMD_ ## _recv ## _OPT_ ## _opt, _lpr))
+#define RECV_CMD_OPT_GIVEN(_recv, _opt, _lpr) \
+	(lls_opt_given(RECV_CMD_OPT_RESULT(_recv, _opt, _lpr)))
+#define RECV_CMD_OPT_STRING_VAL(_recv, _opt, _lpr) \
+	(lls_string_val(0, RECV_CMD_OPT_RESULT(_recv, _opt, _lpr)))
+#define RECV_CMD_OPT_UINT32_VAL(_recv, _opt, _lpr) \
+	(lls_uint32_val(0, RECV_CMD_OPT_RESULT(_recv, _opt, _lpr)))
+#define RECV_CMD_OPT_INT32_VAL(_recv, _opt, _lpr) \
+	(lls_int32_val(0, RECV_CMD_OPT_RESULT(_recv, _opt, _lpr)))
 
 /** Iterate over all available receivers. */
-#define FOR_EACH_RECEIVER(i) for (i = 0; receivers[i].name; i++)
+#define FOR_EACH_RECEIVER(i) for (i = 1; lls_cmd(i, recv_cmd_suite); i++)
 
 void recv_init(void);
-void *check_receiver_arg(char *ra, int *receiver_num);
-void print_receiver_helps(int detailed);
-int generic_recv_pre_select(struct sched *s, struct task *t);
-
-/** \cond receiver */
-extern void http_recv_init(struct receiver *r);
-#define HTTP_RECEIVER {.name = "http", .init = http_recv_init},
-extern void dccp_recv_init(struct receiver *r);
-#define DCCP_RECEIVER {.name = "dccp", .init = dccp_recv_init},
-extern void udp_recv_init(struct receiver *r);
-#define UDP_RECEIVER {.name = "udp", .init = udp_recv_init},
-#define AFH_RECEIVER /* not active by default */
-
-extern struct receiver receivers[];
-/** \endcond receiver */
-
+int check_receiver_arg(const char *ra, struct lls_parse_result **lprp);
+void print_receiver_helps(bool detailed);
+int generic_recv_pre_select(struct sched *s, struct receiver_node *rn);