Merge branch 'master' into next

[paraslash.git] / send.h

diff --git a/send.h b/send.h
index 967f8d53e84723fa7fb02e3cab0aa2b4859f87d8..d3be46f07ac756ed270f4908ad3ecf0007025c4f 100644 (file)
--- a/send.h
+++ b/send.h
@@ -131,7 +131,7 @@ void send_chunk(struct sender_client *sc, struct sender_status *ss,
                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);
+char *get_sender_info(struct sender_status *ss, const char *name);
 
 void generic_com_allow(struct sender_command_data *scd,
                struct sender_status *ss);
@@ -141,3 +141,6 @@ 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);
+int parse_fec_url(const char *arg, struct sender_command_data *scd);