X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_send.c;h=a19836af52101fa00aa2b9fdc2d5a52d3c91ec31;hp=a5c37864c199c8dd7d49b5c9bc3756820120ea87;hb=0997c1bbb745384069a55e59a209d7ac52876bac;hpb=4b475cf0b3e7a40a46b14f9e8e2306dd393161cb

diff --git a/http_send.c b/http_send.c
index a5c37864..a19836af 100644
--- a/http_send.c
+++ b/http_send.c
@@ -24,6 +24,7 @@
 #include "net.h"
 #include "fd.h"
 #include "chunk_queue.h"
+#include "acl.h"
 
 /** Message sent to clients that do not send a valid get request. */
 #define HTTP_ERR_MSG "HTTP/1.0 400 Bad Request\n"
@@ -37,8 +38,6 @@ enum http_status {
 	HTTP_GOT_GET_REQUEST,
 	/** We sent the OK message back to the client. */
 	HTTP_SENT_OK_MSG,
-	/** Connection established, we might need to send the audio file header. */
-	HTTP_READY_TO_STREAM,
 	/** Connection is ready for sending audio data. */
 	HTTP_STREAMING,
 	/** We didn't receive a valid get request. */
@@ -66,23 +65,13 @@ struct http_client {
 	int check_w;
 	/** The position of this client in the client list. */
 	struct list_head node;
+	/** non-zero if audio file header has been sent */
+	int header_sent;
 	/** The list of pending chunks for this client. */
 	struct chunk_queue *cq;
 };
 
-/**
- * Describes one entry in the blacklist/whitelist of the http sender.
- */
-struct access_info {
-	/** The address to be black/whitelisted. */
-	struct in_addr addr;
-	/** The netmask for this entry. */
-	unsigned netmask;
-	/** The position of this entry in the acl. */
-	struct list_head node;
-};
-
-static int server_fd = -1, numclients;
+static int listen_fd = -1, numclients;
 static struct sender *self;
 
 
@@ -127,19 +116,37 @@ static int http_send_err_msg(struct http_client *hc)
 	return http_send_msg(hc, HTTP_ERR_MSG);
 }
 
+/*
+ * ret: Negative on errors, zero if nothing was written and write returned
+ * EAGAIN, number of bytes written else.
+ */
+static int http_write(int fd, const char *buf, size_t len)
+{
+	size_t written = 0;
+
+	while (written < len) {
+		int ret = write(fd, buf + written, len - written);
+		if (ret < 0 && errno == EAGAIN)
+			return written;
+		if (ret < 0)
+			return -ERRNO_TO_PARA_ERROR(errno);
+		written += ret;
+	}
+	return written;
+}
+
+
 static int send_queued_chunks(struct http_client *hc)
 {
 	struct queued_chunk *qc;
 	while ((qc = cq_peek(hc->cq))) {
 		char *buf;
 		size_t len;
-		int ret = write_ok(hc->fd);
-		if (ret <= 0)
-			return ret? -E_WRITE_OK : 0;
+		int ret;
 		cq_get(qc, &buf, &len);
-		ret = write(hc->fd, buf, len);
+		ret = http_write(hc->fd, buf, len);
 		if (ret < 0)
-			return -E_SEND_QUEUED_CHUNK;
+			return ret;
 		cq_update(hc->cq, ret);
 		if (ret != len)
 			return 1;
@@ -157,27 +164,25 @@ static int queue_chunk_or_shutdown(struct http_client *hc, long unsigned chunk_n
 	return ret;
 }
 
-static void http_send( long unsigned current_chunk,
+static void http_send(long unsigned current_chunk,
 	__a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
 	struct http_client *hc, *tmp;
 	int ret;
 
 	list_for_each_entry_safe(hc, tmp, &clients, node) {
-		if (hc->status != HTTP_STREAMING &&
-				hc->status != HTTP_READY_TO_STREAM)
+		if (hc->status != HTTP_STREAMING)
 			continue;
-		if (hc->status == HTTP_READY_TO_STREAM) {
+		if (!hc->header_sent && current_chunk) {
 			size_t hlen;
 			char *hbuf = vss_get_header(&hlen);
-			if (hbuf && hlen > 0 && current_chunk) {
-				/* need to send header */
+			if (hbuf && hlen > 0) { /* need to send header */
 				PARA_INFO_LOG("queueing header: %zu\n", hlen);
 				if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
 					continue;
 			} else
 				PARA_INFO_LOG("no need to queue header\n");
-			hc->status = HTTP_STREAMING;
+			hc->header_sent = 1;
 		}
 		ret = send_queued_chunks(hc);
 		if (ret < 0) {
@@ -186,13 +191,7 @@ static void http_send( long unsigned current_chunk,
 		}
 		if (!len)
 			continue;
-		if (!ret || write_ok(hc->fd) <= 0) {
-			queue_chunk_or_shutdown(hc, current_chunk, 0);
-			continue;
-		}
-//		PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
-		ret = write(hc->fd, buf, len);
-//		PARA_DEBUG_LOG("ret: %d\n", ret);
+		ret = http_write(hc->fd, buf, len);
 		if (ret < 0) {
 			http_shutdown_client(hc, "send error");
 			continue;
@@ -202,52 +201,19 @@ static void http_send( long unsigned current_chunk,
 	}
 }
 
-/**
- * Return true if addr_1 matches addr_2 in the first `netmask' bits.
- */
-static int v4_addr_match(uint32_t addr_1, uint32_t addr_2, uint8_t netmask)
-{
-	uint32_t mask = ~0U;
-
-	if (netmask < 32)
-		mask <<= (32 - netmask);
-	return (htonl(addr_1) & mask) == (htonl(addr_2) & mask);
-}
-
-static int host_in_access_perm_list(struct http_client *hc)
-{
-	struct access_info *ai, *tmp;
-	struct sockaddr_storage ss;
-	socklen_t sslen = sizeof(ss);
-	struct in_addr v4_addr;
-
-	if (getpeername(hc->fd, (struct sockaddr *)&ss, &sslen) < 0) {
-		PARA_ERROR_LOG("Can not determine peer address: %s\n", strerror(errno));
-		goto no_match;
-	}
-	v4_addr = extract_v4_addr(&ss);
-	if (!v4_addr.s_addr)
-		goto no_match;
-
-	list_for_each_entry_safe(ai, tmp, &http_acl, node)
-		if (v4_addr_match(v4_addr.s_addr, ai->addr.s_addr, ai->netmask))
-			return 1;
-no_match:
-	return 0;
-}
-
 static void http_post_select(fd_set *rfds, fd_set *wfds)
 {
 	int i = -1, match;
 	struct http_client *hc, *tmp;
 	const char *err_msg;
 
+	if (listen_fd < 0)
+		return;
 	list_for_each_entry_safe(hc, tmp, &clients, node) {
 		i++;
 //		PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
 		switch (hc->status) {
 		case HTTP_STREAMING: /* nothing to do */
-		case HTTP_READY_TO_STREAM:
 			break;
 		case HTTP_CONNECTED: /* need to recv get request */
 			if (hc->check_r && FD_ISSET(hc->fd, rfds)) {
@@ -276,15 +242,15 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 			break;
 		case HTTP_SENT_OK_MSG: /* need to send header? */
 			if (hc->check_w && FD_ISSET(hc->fd, wfds))
-				hc->status = HTTP_READY_TO_STREAM;
+				hc->status = HTTP_STREAMING;
 			break;
 		}
 	}
-	if (!FD_ISSET(server_fd, rfds))
+	if (!FD_ISSET(listen_fd, rfds))
 		return;
 	hc = para_calloc(sizeof(struct http_client));
 	err_msg = "accept error";
-	hc->fd = para_accept(server_fd, NULL, 0);
+	hc->fd = para_accept(listen_fd, NULL, 0);
 	if (hc->fd <= 0)
 		goto err_out;
 	hc->name = make_message("%s", remote_name(hc->fd));
@@ -294,13 +260,16 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 		err_msg = "server full";
 		goto err_out;
 	}
-	match = host_in_access_perm_list(hc);
-	PARA_DEBUG_LOG("host_in_access_perm_list: %d\n", match);
+	match = acl_lookup(hc->fd, &http_acl);
+	PARA_DEBUG_LOG("acl lookup returned %d\n", match);
 	if ((match && !conf.http_default_deny_given) ||
 			(!match && conf.http_default_deny_given)) {
 		err_msg = "permission denied";
 		goto err_out;
 	}
+	err_msg = "failed to mark fd non-blocking";
+	if (mark_fd_nonblocking(hc->fd) < 0)
+		goto err_out;
 	hc->status = HTTP_CONNECTED;
 	hc->cq = cq_new(MAX_BACKLOG);
 	numclients++;
@@ -308,7 +277,6 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
 		hc->name, hc->fd);
 	para_list_add(&hc->node, &clients);
 	add_close_on_fork_list(hc->fd);
-	mark_fd_nonblocking(hc->fd);
 	return;
 err_out:
 	PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
@@ -322,16 +290,15 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
 	struct http_client *hc, *tmp;
 
-	if (server_fd < 0)
+	if (listen_fd < 0)
 		return;
-	para_fd_set(server_fd, rfds, max_fileno);
+	para_fd_set(listen_fd, rfds, max_fileno);
 	list_for_each_entry_safe(hc, tmp, &clients, node) {
 		//PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
 		hc->check_r = 0;
 		hc->check_w = 0;
 		switch (hc->status) {
 		case HTTP_STREAMING:
-		case HTTP_READY_TO_STREAM:
 			break;
 		case HTTP_CONNECTED: /* need to recv get request */
 			para_fd_set(hc->fd, rfds, max_fileno);
@@ -352,102 +319,65 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 	}
 }
 
-static int open_tcp_port(int port)
+static int http_open(void)
 {
 	int ret;
 
-	server_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
-	if (server_fd < 0) {
-		http_shutdown_clients();
-		self->status = SENDER_OFF;
-		return server_fd;
-	}
-	ret = mark_fd_nonblocking(server_fd);
+	listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.http_port_arg);
+	if (listen_fd < 0)
+		return listen_fd;
+	ret = mark_fd_nonblocking(listen_fd);
 	if (ret < 0) {
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	self->status = SENDER_ON;
-	add_close_on_fork_list(server_fd);
+	add_close_on_fork_list(listen_fd);
 	return 1;
 }
 
 static int http_com_on(__a_unused struct sender_command_data *scd)
 {
-	if (self->status == SENDER_ON)
+	if (listen_fd >= 0)
 		return 1;
-	return open_tcp_port(conf.http_port_arg);
+	return http_open();
 }
 
 static int http_com_off(__a_unused struct sender_command_data *scd)
 {
-	self->status = SENDER_OFF;
-	if (server_fd > 0) {
-		close(server_fd);
-		del_close_on_fork_list(server_fd);
-		server_fd = -1;
-	}
+	if (listen_fd < 0)
+		return 1;
+	PARA_NOTICE_LOG("closing http port %d\n", conf.http_port_arg);
+	close(listen_fd);
+	del_close_on_fork_list(listen_fd);
 	http_shutdown_clients();
+	listen_fd = -1;
 	return 1;
 }
 
-static void del_perm_list_entry(struct sender_command_data *scd)
-{
-	struct access_info *ai, *tmp;
-
-	list_for_each_entry_safe(ai, tmp, &http_acl, node) {
-		char *nad = para_strdup(inet_ntoa(ai->addr));
-		if (!strcmp(nad, inet_ntoa(scd->addr)) &&
-				ai->netmask == scd->netmask) {
-			PARA_NOTICE_LOG("removing %s/%i from access list\n",
-				nad, ai->netmask);
-			list_del(&ai->node);
-			free(ai);
-		}
-		free(nad);
-	}
-}
-
-static void add_perm_list_entry(struct sender_command_data *scd)
-{
-	struct access_info *ai = para_malloc(sizeof(struct access_info));
-	ai->addr = scd->addr;
-	ai->netmask = scd->netmask;
-	PARA_INFO_LOG("adding %s/%i to access list\n", inet_ntoa(ai->addr),
-		ai->netmask);
-	para_list_add(&ai->node, &http_acl);
-}
-
 static int http_com_deny(struct sender_command_data *scd)
 {
 	if (conf.http_default_deny_given)
-		del_perm_list_entry(scd);
+		acl_del_entry(&http_acl, scd->addr, scd->netmask);
 	else
-		add_perm_list_entry(scd);
+		acl_add_entry(&http_acl, scd->addr, scd->netmask);
 	return 1;
 }
 
 static int http_com_allow(struct sender_command_data *scd)
 {
 	if (conf.http_default_deny_given)
-		add_perm_list_entry(scd);
+		acl_add_entry(&http_acl, scd->addr, scd->netmask);
 	else
-		del_perm_list_entry(scd);
+		acl_del_entry(&http_acl, scd->addr, scd->netmask);
 	return 1;
 }
 
 static char *http_info(void)
 {
-	char *clnts = NULL, *ap = NULL, *ret;
-	struct access_info *ai, *tmp_ai;
+	char *clnts = NULL, *ret;
 	struct http_client *hc, *tmp_hc;
 
-	list_for_each_entry_safe(ai, tmp_ai, &http_acl, node) {
-		char *tmp = make_message("%s%s/%d ", ap? ap : "",
-			inet_ntoa(ai->addr), ai->netmask);
-		free(ap);
-		ap = tmp;
-	}
+	char *acl_contents = acl_get_contents(&http_acl);
 	list_for_each_entry_safe(hc, tmp_hc, &clients, node) {
 		char *tmp = make_message("%s%s ", clnts? clnts : "", hc->name);
 		free(clnts);
@@ -460,48 +390,20 @@ static char *http_info(void)
 		"http maximal number of clients: %d%s\n"
 		"http connected clients: %s\n"
 		"http access %s list: %s\n",
-		(self->status == SENDER_ON)? "on" : "off",
+		(listen_fd >= 0)? "on" : "off",
 		conf.http_port_arg,
 		numclients,
 		conf.http_max_clients_arg,
 		conf.http_max_clients_arg > 0? "" : " (unlimited)",
 		clnts? clnts : "(none)",
 		conf.http_default_deny_given? "allow" : "deny",
-		ap? ap : "(none)"
+		acl_contents? acl_contents : "(none)"
 	);
-	free(ap);
+	free(acl_contents);
 	free(clnts);
 	return ret;
 }
 
-static void init_access_control_list(void)
-{
-	int i;
-	struct sender_command_data scd;
-
-	INIT_LIST_HEAD(&http_acl);
-	for (i = 0; i < conf.http_access_given; i++) {
-		char *arg = para_strdup(conf.http_access_arg[i]);
-		char *p = strchr(arg, '/');
-		if (!p)
-			goto err;
-		*p = '\0';
-		if (!inet_pton(AF_INET, arg, &scd.addr))
-			goto err;
-		scd.netmask = atoi(++p);
-		if (scd.netmask < 0 || scd.netmask > 32)
-			goto err;
-		add_perm_list_entry(&scd);
-		goto success;
-err:
-		PARA_CRIT_LOG("syntax error for http_access option "
-			"#%d, ignoring\n", i);
-success:
-		free(arg);
-		continue;
-	}
-}
-
 static char *http_help(void)
 {
 	return make_message(
@@ -535,8 +437,8 @@ void http_send_init(struct sender *s)
 	s->client_cmds[SENDER_ADD] = NULL;
 	s->client_cmds[SENDER_DELETE] = NULL;
 	self = s;
-	init_access_control_list();
+	acl_init(&http_acl, conf.http_access_arg, conf.http_access_given);
 	if (!conf.http_no_autostart_given)
-		open_tcp_port(conf.http_port_arg); /* ignore errors */
+		http_open(); /* ignore errors */
 	PARA_DEBUG_LOG("%s", "http sender init complete\n");
 }