Merge commit 'athcx/master'

[paraslash.git] / send.h

diff --git a/send.h b/send.h
index 8ec5e7baf3386d420b3cb97fdba173c5bfc74fb1..c1ed00cf33a628e3aec9862874a2d1d3d1809ebe 100644 (file)
--- a/send.h
+++ b/send.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,7 +12,7 @@ enum {SENDER_ADD, SENDER_DELETE, SENDER_ALLOW, SENDER_DENY, SENDER_ON, SENDER_OF
 /**
  * Describes one supported sender of para_server.
  *
- * \sa http_send.c ortp_send.c, dccp_send.c.
+ * \sa http_send.c udp_send.c, dccp_send.c.
  */
 struct sender {
        /** The name of the sender. */
@@ -49,7 +49,8 @@ struct sender {
         * should be sent, and \a len is the length of this buffer.
        */
        void (*send)(long unsigned current_chunk, long unsigned chunks_sent,
-               const char *buf, size_t len);
+               const char *buf, size_t len, const char *header_buf,
+               size_t header_len);
        /**
         * Add file descriptors to fd_sets.
         *
@@ -104,23 +105,30 @@ struct sender_client {
        void *private_data;
 };
 
+/** Describes the current status of one paraslash sender. */
 struct sender_status {
+       /** The file descriptor of the socket this sender is listening on. */
        int listen_fd;
+       /** The TCP/DCCP port used by this sender. */
        int port;
+       /** The current number of simultaneous connections. */
        int num_clients;
+       /** The maximal number of simultaneous connections. */
        int max_clients;
+       /** Whether the access control list is a whitelist. */
        int default_deny;
-       /** The list of connected clients. */
-       struct list_head client_list;
        /** The whitelist/blacklist. */
        struct list_head acl;
+       /** The list of connected clients. */
+       struct list_head client_list;
 };
 
 void shutdown_client(struct sender_client *sc, struct sender_status *ss);
 void shutdown_clients(struct sender_status *ss);
 void send_chunk(struct sender_client *sc, struct sender_status *ss,
                size_t max_bytes_per_write, long unsigned current_chunk,
-               const char *buf, size_t len);
+               const char *buf, size_t len, const char *header_buf,
+               size_t header_len);
 void init_sender_status(struct sender_status *ss, char **access_arg, int num_access_args,
        int port, int max_clients, int default_deny);
 char *get_sender_info(struct sender_status *ss, char *name);
@@ -133,3 +141,5 @@ int generic_com_on(struct sender_status *ss, unsigned protocol);
 void generic_com_off(struct sender_status *ss);
 char *generic_sender_help(void);
 struct sender_client *accept_sender_client(struct sender_status *ss);
+int send_queued_chunks(int fd, struct chunk_queue *cq,
+               size_t max_bytes_per_write);