X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=3df694de912e5a9d6e85544b3a68e68168004e31;hp=dace5c23c6574527a6b8c26880eb63bd896b8aca;hb=0b786d977ded3c3922e851e5b8d60837b43469b9;hpb=c1d48060c104aecc99175155309ff2bca32494ca

diff --git a/http_send.c b/http_send.c
index dace5c23..3df694de 100644
--- a/http_send.c
+++ b/http_send.c
@@ -235,30 +235,13 @@ static char *http_status(void)
 	return generic_sender_status(hss, "http");
 }
 
-/**
- * The init function of the http sender.
- *
- * \param s Pointer to the http sender struct.
- *
- * It initializes all function pointers of \a s, the client list and the access
- * control list. If the autostart option was given, the tcp port is opened.
+/*
+ * Initialize the client list and the access control list, and optionally
+ * listen on the tcp port.
  */
-void http_send_init(struct sender *s)
+static void http_send_init(void)
 {
 	int ret;
-	s->status = http_status;
-	s->send = http_send;
-	s->pre_select = http_pre_select;
-	s->post_select = http_post_select;
-	s->shutdown_clients = http_shutdown_clients;
-	s->resolve_target = NULL;
-	s->help = generic_sender_help;
-	s->client_cmds[SENDER_on] = http_com_on;
-	s->client_cmds[SENDER_off] = http_com_off;
-	s->client_cmds[SENDER_deny] = http_com_deny;
-	s->client_cmds[SENDER_allow] = http_com_allow;
-	s->client_cmds[SENDER_add] = NULL;
-	s->client_cmds[SENDER_delete] = NULL;
 
 	init_sender_status(hss, OPT_RESULT(HTTP_ACCESS),
 		OPT_UINT32_VAL(HTTP_PORT), OPT_UINT32_VAL(HTTP_MAX_CLIENTS),
@@ -269,3 +252,30 @@ void http_send_init(struct sender *s)
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 }
+
+/**
+ * The HTTP sender.
+ *
+ * This is the only sender which does not FEC-encode the stream. This is not
+ * necessary because HTTP sits on top of TCP, a reliable transport which
+ * retransmits lost packets automatically. The sender employs per-client queues
+ * which queue chunks of audio data if they can not be sent immediately because
+ * the write operation would block. Most methods of the sender are implemented
+ * as wrappers for the generic functions defined in \ref send_common.c.
+ */
+const struct sender http_sender = {
+	.name = "http",
+	.init = http_send_init,
+	.pre_select = http_pre_select,
+	.post_select = http_post_select,
+	.send = http_send,
+	.shutdown_clients = http_shutdown_clients,
+	.client_cmds = {
+		[SENDER_on] = http_com_on,
+		[SENDER_off] = http_com_off,
+		[SENDER_deny] = http_com_deny,
+		[SENDER_allow] = http_com_allow,
+	},
+	.help = generic_sender_help,
+	.status = http_status,
+};