X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=udpinput.cpp;h=887850c91355d17b50d1f2f07a50be5bdd91c72c;hp=3a8beffeabcc8fcfd4aff48e2694f5aaa79603dd;hb=562cf44b96b5c0260d1a1ab18b2dd2408b6d1fc8;hpb=4856c49f1b63753ce86ad759ee649a1117628a8e

diff --git a/udpinput.cpp b/udpinput.cpp
index 3a8beff..887850c 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
@@ -12,15 +13,15 @@
 #include "serverpool.h"
 #include "state.pb.h"
 #include "udpinput.h"
+#include "util.h"
 #include "version.h"
 
 using namespace std;
 
 extern ServerPool *servers;
 
-UDPInput::UDPInput(const string &stream_id, const string &url)
-	: stream_id(stream_id),
-	  url(url),
+UDPInput::UDPInput(const string &url)
+	: url(url),
 	  sock(-1)
 {
 	// Should be verified by the caller.
@@ -32,8 +33,7 @@ UDPInput::UDPInput(const string &stream_id, const string &url)
 }
 
 UDPInput::UDPInput(const InputProto &serialized)
-	: stream_id(serialized.stream_id()),
-	  url(serialized.url()),
+	: url(serialized.url()),
 	  sock(serialized.sock())
 {
 	// Should be verified by the caller.
@@ -47,7 +47,6 @@ UDPInput::UDPInput(const InputProto &serialized)
 InputProto UDPInput::serialize() const
 {
 	InputProto serialized;
-	serialized.set_stream_id(stream_id);
 	serialized.set_url(url);
 	serialized.set_sock(sock);
 	return serialized;
@@ -55,57 +54,46 @@ InputProto UDPInput::serialize() const
 
 void UDPInput::close_socket()
 {
-	int ret;
-	do {
-		ret = close(sock);
-	} while (ret == -1 && errno == EINTR);
-
-	if (ret == -1) {
-		log_perror("close()");
-	}
-
+	safe_close(sock);
 	sock = -1;
 }
 	
 void UDPInput::construct_header()
 {
-	string header =
+	http_header =
 		"HTTP/1.0 200 OK\r\n"
 		"Content-type: application/octet-stream\r\n"
 		"Cache-control: no-cache\r\n"
 		"Server: " SERVER_IDENTIFICATION "\r\n"
-		"\r\n";
-	servers->set_header(stream_id, header);
+	        "Connection: close\r\n";
+}
+	
+void UDPInput::add_destination(int stream_index)
+{
+	stream_indices.push_back(stream_index);
+	servers->set_header(stream_index, http_header, "");
 }
 
 void UDPInput::do_work()
 {
-	while (!should_stop) {
+	while (!should_stop()) {
 		if (sock == -1) {
 			int port_num = atoi(port.c_str());
 			sock = create_server_socket(port_num, UDP_SOCKET);
 			if (sock == -1) {
-				log(WARNING, "UDP socket creation failed. Waiting 0.2 seconds and trying again...");
+				log(WARNING, "[%s] UDP socket creation failed. Waiting 0.2 seconds and trying again...",
+				             url.c_str());
 				usleep(200000);
 				continue;
 			}
 		}
 
-		// Since we are non-blocking, we need to wait for the right state first.
-		// Wait up to 50 ms, then check should_stop.
-		pollfd pfd;
-		pfd.fd = sock;
-		pfd.events = POLLIN;
-
-		int nfds = poll(&pfd, 1, 50);
-		if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
+		// Wait for a packet, or a wakeup.
+		bool activity = wait_for_activity(sock, POLLIN, NULL);
+		if (!activity) {
+			// Most likely, should_stop was set.
 			continue;
 		}
-		if (nfds == -1) {
-			log_perror("poll");
-			close_socket();
-			continue;	
-		}
 
 		char buf[4096];
 		int ret;
@@ -119,6 +107,8 @@ void UDPInput::do_work()
 			continue;
 		}
 		
-		servers->add_data(stream_id, buf, ret);
+		for (size_t i = 0; i < stream_indices.size(); ++i) {
+			servers->add_data(stream_indices[i], buf, ret);
+		}
 	}
 }