X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.h;h=ee8138f9d9c12a9674600091d3073b1807dc41ba;hp=74ccf77d7115b5f77ce36de21522b62f78a456e2;hb=bda95f9508b456dcea89d300f6d4104e30ab9f3e;hpb=6bdac07456cb5872f824028912d1049883a9c21f

diff --git a/recv.h b/recv.h
index 74ccf77d..ee8138f9 100644
--- a/recv.h
+++ b/recv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,18 +12,14 @@
 struct receiver_node {
 	/** Points to the corresponding receiver. */
 	struct receiver *receiver;
-	/** The output buffer. */
-	char *buf;
-	/** The amount of bytes in \a buf. */
-	size_t loaded;
 	/** Receiver-specific data. */
 	void *private_data;
-	/** Pointer to the error member of the consumer. */
-	int *output_error;
 	/** Pointer to the configuration data for this instance. */
 	void *conf;
 	/** The task associated with this instance. */
 	struct task task;
+	/** The receiver node is always the root of the buffer tree. */
+	struct btr_node *btrn;
 };
 
 /**
@@ -54,6 +50,13 @@ struct receiver {
 	 * \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);
 	/**
 	 * Open one instance of the receiver.
 	 *
@@ -75,12 +78,6 @@ struct receiver {
 	 * \sa receiver_node.
 	 */
 	void (*close)(struct receiver_node *rn);
-	/**
-	 * Deactivate the receiver.
-	 *
-	 * Clean up what init has allocated.
-	 */
-	void (*shutdown)(void);
 	/**
 	 * Add file descriptors to fd_sets and compute timeout for select(2).
 	 *
@@ -105,9 +102,24 @@ struct receiver {
 	 */
 	void (*post_select)(struct sched *s, struct task *t);
 
+	/** The two help texts of this receiver. */
 	struct ggo_help help;
 };
 
+/** Define an array of all available receivers. */
+#define DEFINE_RECEIVER_ARRAY struct receiver receivers[] = { \
+	HTTP_RECEIVER \
+	DCCP_RECEIVER \
+	UDP_RECEIVER \
+	{.name = NULL}};
+
+/** Iterate over all available receivers. */
+#define FOR_EACH_RECEIVER(i) for (i = 0; receivers[i].name; 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 */
 extern void http_recv_init(struct receiver *r);
@@ -120,14 +132,3 @@ extern void udp_recv_init(struct receiver *r);
 extern struct receiver receivers[];
 /** \endcond */
 
-/** Define an array of all available receivers. */
-#define DEFINE_RECEIVER_ARRAY struct receiver receivers[] = { \
-	HTTP_RECEIVER \
-	DCCP_RECEIVER \
-	UDP_RECEIVER \
-	{.name = NULL}};
-
-#define FOR_EACH_RECEIVER(i) for (i = 0; receivers[i].name; i++)
-
-void *check_receiver_arg(char *ra, int *receiver_num);
-void print_receiver_helps(int detailed);