X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=udp_send.c;h=140458e7ed9b1d4e3a03d05c2e26a6b36d66db54;hb=8e300aadc904a0e8b7453be4fb571f68bab6234c;hp=8bbcbae7fa611473d1abd67a65d70506380aa8a5;hpb=a6cbab95272b31c55b2b41e1d3dd55743c7c774f;p=paraslash.git

diff --git a/udp_send.c b/udp_send.c
index 8bbcbae7..140458e7 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -25,7 +25,8 @@
 #include "net.h"
 #include "fd.h"
 #include "sched.h"
-
+#include "close_on_fork.h"
+#include "chunk_queue.h"
 
 /** Convert in_addr to ascii. */
 #define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
@@ -40,68 +41,200 @@ struct udp_target {
 	int port;
 	/** The socket fd. */
 	int fd;
+	/** The list of queued chunks for this fd. */
+	struct chunk_queue *cq;
 };
 
 static struct list_head targets;
 static int sender_status;
 
+static void udp_close_target(struct udp_target *ut)
+{
+	if (ut->fd < 0)
+		return;
+	close(ut->fd);
+	del_close_on_fork_list(ut->fd);
+	cq_destroy(ut->cq);
+	ut->cq = NULL;
+	ut->fd = -1;
+}
+
 static void udp_delete_target(struct udp_target *ut, const char *msg)
 {
 	PARA_NOTICE_LOG("deleting %s:%d (%s) from list\n", TARGET_ADDR(ut),
 		ut->port, msg);
-	if (ut->fd >= 0)
-		close(ut->fd);
+	udp_close_target(ut);
 	list_del(&ut->node);
 	free(ut);
 }
 
-static void udp_send_buf(char *buf, size_t len)
+/**
+ * Perform AF-independent multicast sender setup.
+ *
+ * \param fd	The connected socket descriptor.
+ * \param ttl	UDPv4 multicast TTL or UDPv6 multicast number of hops.
+ *		Use -1 to mean default, 0..255 otherwise.
+ * \param iface	The outgoing multicast interface, or NULL for the default.
+ *
+ * \return Zero if okay, negative on error.
+ */
+static int mcast_sender_setup(struct udp_target *ut, int ttl, char *iface)
 {
-	struct udp_target *ut, *tmp;
-	int ret;
-
-	list_for_each_entry_safe(ut, tmp, &targets, node) {
-		if (ut->fd < 0)
-			continue;
-		ret = write_nonblock(ut->fd, buf, len, len);
-		if (ret < 0) /* TODO: Use chunk queueing */
-			return udp_delete_target(ut, "send error");
-		if (ret != len)
-			PARA_WARNING_LOG("short write %zu/%zu\n", ret, len);
+	struct sockaddr_storage ss;
+	socklen_t sslen = sizeof(ss);
+
+	const int on = 1;
+	int id = iface == NULL ? 0 : if_nametoindex(iface);
+
+	if (getpeername(ut->fd, (struct sockaddr *)&ss, &sslen) < 0)
+		goto err;
+
+	if (iface != NULL && id == 0)
+		PARA_WARNING_LOG("could not resolve interface %s, using default", iface);
+
+	/* RFC 3493, 5.2: -1 means 'use kernel default' */
+	if (ttl < 0 || ttl > 255)
+		ttl = -1;
+
+	switch (ss.ss_family) {
+	case AF_INET:
+		if (!IN_MULTICAST(htonl(((struct sockaddr_in *)&ss)->sin_addr.s_addr)))
+			return 0;
+		if (id != 0) {
+#ifdef HAVE_IP_MREQN
+			struct ip_mreqn mn;
+
+			memset(&mn, 0, sizeof(mn));
+			mn.imr_ifindex = id;
+			if (setsockopt(ut->fd, IPPROTO_IP, IP_MULTICAST_IF, &mn, sizeof(mn)) < 0)
+				goto err;
+#else
+			PARA_ERROR_LOG("No support for setting outgoing IPv4 mcast interface.");
+#endif
+		}
+		/*
+		 * Enable receiving multicast messages generated on the local host
+		 * At least on Linux, this is enabled by default.
+		 */
+		if (setsockopt(ut->fd, IPPROTO_IP, IP_MULTICAST_LOOP, &on, sizeof(on)) < 0)
+			break;
+
+		/* Default: use local subnet (do not flood out into the WAN) */
+		if (ttl == -1)
+			ttl = 1;
+		if (setsockopt(ut->fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl)) < 0)
+			break;
+		return 0;
+	case AF_INET6:
+		if (!IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6 *)&ss)->sin6_addr))
+			return 0;
+		if (id != 0 &&
+		    setsockopt(ut->fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &id, sizeof(id)) < 0)
+			break;
+		if (setsockopt(ut->fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &on, sizeof(on)) < 0)
+			break;
+		if (setsockopt(ut->fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl)) < 0)
+			break;
+		return 0;
+	default:
+		PARA_ERROR_LOG("address family %d not supported", ss.ss_family);
+		return -E_ADDRESS_LOOKUP;
 	}
+err:
+	return -ERRNO_TO_PARA_ERROR(errno);
 }
 
+/** The maximal size of the per-target chunk queue. */
+#define UDP_CQ_BYTES 40000
+
 static int udp_init_session(struct udp_target *ut)
 {
 	int ret;
+	char *iface = NULL;
 
 	if (ut->fd >= 0) /* nothing to do */
 		return 0;
-	PARA_NOTICE_LOG("sending to udp %s:%d\n", TARGET_ADDR(ut), ut->port);
-	ret = create_udp_send_socket(TARGET_ADDR(ut), ut->port,
-		conf.udp_ttl_arg);
+
+	ret = makesock(AF_UNSPEC, IPPROTO_UDP, 0, TARGET_ADDR(ut), ut->port);
 	if (ret < 0)
 		return ret;
 	ut->fd = ret;
+
+	if (conf.udp_mcast_iface_given)
+		iface = conf.udp_mcast_iface_arg;
+
+	ret = mcast_sender_setup(ut, conf.udp_ttl_arg, iface);
+	if (ret < 0) {
+		close(ut->fd);
+		return ret;
+	}
+
 	ret = mark_fd_nonblocking(ut->fd);
-	if (ret < 0)
+	if (ret < 0) {
 		close(ut->fd);
-	return ret;
+		return ret;
+	}
+	add_close_on_fork_list(ut->fd);
+	ut->cq = cq_new(UDP_CQ_BYTES);
+	PARA_NOTICE_LOG("sending to udp %s:%d\n", TARGET_ADDR(ut), ut->port);
+	return 1;
+}
+
+static void udp_send_buf(char *buf, size_t len)
+{
+	struct udp_target *ut, *tmp;
+	int ret;
+
+	list_for_each_entry_safe(ut, tmp, &targets, node) {
+		ret = udp_init_session(ut);
+		if (ret < 0) {
+			udp_delete_target(ut, para_strerror(-ret));
+			continue;
+		}
+		ret = send_queued_chunks(ut->fd, ut->cq, 0);
+		if (ret < 0) {
+			udp_delete_target(ut, para_strerror(-ret));
+			continue;
+		}
+		if (!len)
+			continue;
+		if (!ret) { /* still data left in the queue */
+			ret = cq_enqueue(ut->cq, buf, len);
+			if (ret < 0) {
+				udp_delete_target(ut, para_strerror(-ret));
+				continue;
+			}
+		}
+		ret = write_nonblock(ut->fd, buf, len, 0);
+		if (ret < 0) {
+			udp_delete_target(ut, para_strerror(-ret));
+			continue;
+		}
+		if (ret != len) {
+			ret = cq_enqueue(ut->cq, buf + ret, len - ret);
+			if (ret < 0) {
+				udp_delete_target(ut, para_strerror(-ret));
+				continue;
+			}
+		}
+	}
 }
 
 static void udp_shutdown_targets(void)
 {
 	char buf[UDP_AUDIO_HEADER_LEN];
 	struct udp_target *ut, *tmp;
+	struct udp_audio_header uah = {
+		.stream_type = UDP_UNKNOWN_STREAM,
+		.packet_type = UDP_EOF_PACKET,
+	};
 
-	udp_write_packet_type(buf, UDP_EOF_PACKET);
-	udp_write_magic(buf);
+	write_udp_audio_header(buf, &uah);
 	list_for_each_entry_safe(ut, tmp, &targets, node) {
 		if (ut->fd < 0)
 			continue;
 		write(ut->fd, buf, UDP_AUDIO_HEADER_LEN);
-		close(ut->fd);
-		ut->fd = -1;
+		udp_close_target(ut);
 	}
 }
 
@@ -123,16 +256,12 @@ static void udp_send(long unsigned current_chunk, __a_unused long unsigned chunk
 		const char *buf, size_t len, const char *header_buf,
 		size_t header_len)
 {
-	struct udp_target *ut, *tmp;
-	size_t sendbuf_len;
-	uint8_t packet_type = UDP_DATA_PACKET;
-	int ret;
 	char *sendbuf;
+	size_t sendbuf_len;
 	struct timeval *chunk_tv;
-	uint8_t stream_type = header_len? UDP_HEADER_STREAM : UDP_PLAIN_STREAM;
+	struct udp_audio_header uah;
 
-//	PARA_NOTICE_LOG("header_len: %zd, header_buf: %p\n", header_len,
-//		header_buf);
+//	PARA_NOTICE_LOG("len: %zd, header_len: %zd\n", len, header_len);
 	if (sender_status != SENDER_ON)
 		return;
 
@@ -142,27 +271,22 @@ static void udp_send(long unsigned current_chunk, __a_unused long unsigned chunk
 		return;
 	if (list_empty(&targets))
 		return;
-	list_for_each_entry_safe(ut, tmp, &targets, node) {
-		ret = udp_init_session(ut);
-		if (ret < 0)
-			udp_delete_target(ut, para_strerror(-ret));
-	}
-	if (!need_extra_header(current_chunk))
-		header_len = 0;
+	uah.stream_type = header_len? UDP_HEADER_STREAM : UDP_PLAIN_STREAM;
+	uah.header_len = need_extra_header(current_chunk)? header_len : 0;
 	if (!current_chunk)
-		packet_type = UDP_BOF_PACKET;
-	else if (header_len)
-		packet_type = UDP_HEADER_PACKET;
-	sendbuf_len = UDP_AUDIO_HEADER_LEN + header_len + len;
+		uah.packet_type = UDP_BOF_PACKET;
+	else if (uah.header_len)
+		uah.packet_type = UDP_HEADER_PACKET;
+	else
+		uah.packet_type = UDP_DATA_PACKET;
+	uah.payload_len = uah.header_len + len;
+	sendbuf_len = UDP_AUDIO_HEADER_LEN + uah.payload_len;
 	sendbuf = para_malloc(sendbuf_len);
-	udp_write_magic(sendbuf);
-	udp_write_stream_type(sendbuf, stream_type);
-	udp_write_packet_type(sendbuf, packet_type);
-	udp_write_header_len(sendbuf, header_len);
-	if (header_len)
+	write_udp_audio_header(sendbuf, &uah);
+	if (uah.header_len)
 		memcpy(sendbuf + UDP_AUDIO_HEADER_LEN, header_buf,
-			header_len);
-	memcpy(sendbuf + UDP_AUDIO_HEADER_LEN + header_len, buf, len);
+			uah.header_len);
+	memcpy(sendbuf + UDP_AUDIO_HEADER_LEN + uah.header_len, buf, len);
 	udp_send_buf(sendbuf, sendbuf_len);
 	free(sendbuf);
 }