X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.h;h=7fb45286cd61b93fb88f3ac2a0936cbfea5a6dfd;hp=3284c29ad789a359ea9af5253c1cf239a12f7b0d;hb=f161070bfd0eca617daa43368fbf4e373ba9686b;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/recv.h b/recv.h
index 3284c29a..7fb45286 100644
--- a/recv.h
+++ b/recv.h
@@ -32,8 +32,11 @@ struct receiver_node {
 	void *private_data;
 	/** set to 1 if end of file is reached */
 	int eof;
+	int *output_eof;
 	/** pointer to the configuration data for this instance */
 	void *conf;
+	/** the task associated with this instance */
+	struct task task;
 };
 
 /**
@@ -111,44 +114,34 @@ struct receiver {
  *
  * The pre_select function gets called from the driving application before
  * entering its select loop. The receiver may use this hook to add any file
- * descriptors to \a rfds and \a wfds in order to check the result later in the
- * post_select hook.
+ * descriptors to the sets of file descriptors given by \a s.
  *
- * \a timeout is a value-result parameter, initially containing the timeout for
- * select() which was set by the application or by another receiver node. If
- * the receiver wants its pre_select function to be called at some earlier time
- * than the time determined by \a timeout, it may set \a timeout to an
- * appropriate smaller value. However, it must never increase this timeout.
  *
- * This function must return the highest-numbered descriptor it wants to being
- * checked, or -1 if no file descriptors should be checked for this run.
- *
- * \sa select(2), receiver_node:private_data, time.c
+ * \sa select(2), time.c struct task, struct sched
  */
-	int (*pre_select)(struct receiver_node *rn, fd_set *rfds,
-		fd_set *wfds, struct timeval *timeout);
+	void (*pre_select)(struct sched *s, struct task *t);
 /**
  *
  *
  * evaluate the result from select()
  *
- * If the call to select() was succesful, this hook gets called. It should
- * check all file descriptors which were added to any of the the fd sets during
- * the previous call to pre_select. According to the result, it may then use
- * any non-blocking I/O to establish a connection or to receive the audio data.
+ * This hook gets called after the call to select(). It should check all file
+ * descriptors which were added to any of the the fd sets during the previous
+ * call to pre_select. According to the result, it may then use any
+ * non-blocking I/O to establish a connection or to receive the audio data.
  *
- * A negative return value is interpreted as an error.
  *
  * \sa select(2), struct receiver
  */
-	int (*post_select)(struct receiver_node *rn, int select_ret,
-		fd_set *rfds, fd_set *wfds);
+	void (*post_select)(struct sched *s, struct task *t);
 };
 
 
 /** \cond */
 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},
 
 #ifdef HAVE_ORTP
 extern void ortp_recv_init(struct receiver *r);
@@ -166,6 +159,7 @@ extern void (*crypt_function_send)(unsigned long len, const unsigned char *indat
 
 #define DEFINE_RECEIVER_ARRAY struct receiver receivers[] = { \
 	HTTP_RECEIVER \
+	DCCP_RECEIVER \
 	ORTP_RECEIVER \
 	{.name = NULL}};