X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=udpinput.cpp;h=3e4b9b79c0cd872bcd140401b0f9a7a16238b21f;hp=8659141b2ed0e11d8be8e93ae1d0b74c3867da86;hb=845934ca50eee40884e8cc85ea81eb310efa5ca3;hpb=3b8ad87137cff7522ed12f4675d5ff26933bc94a

diff --git a/udpinput.cpp b/udpinput.cpp
index 8659141..3e4b9b7 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
-#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -12,6 +12,7 @@
 #include "serverpool.h"
 #include "state.pb.h"
 #include "udpinput.h"
+#include "util.h"
 #include "version.h"
 
 using namespace std;
@@ -52,15 +53,7 @@ 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;
 }
 	
@@ -70,18 +63,19 @@ void UDPInput::construct_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";
+		"Server: " SERVER_IDENTIFICATION "\r\n"
+	        "Connection: close\r\n";
 }
 	
-void UDPInput::add_destination(const string &stream_id)
+void UDPInput::add_destination(int stream_index)
 {
-	stream_ids.push_back(stream_id);
-	servers->set_header(stream_id, http_header, "");
+	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);
@@ -93,26 +87,16 @@ void UDPInput::do_work()
 			}
 		}
 
-		// 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;
 		do {
-			ret = recv(sock, buf, sizeof(buf), 0);
+			ret = recv(sock, packet_buf, sizeof(packet_buf), 0);
 		} while (ret == -1 && errno == EINTR);
 
 		if (ret <= 0) {
@@ -121,8 +105,8 @@ void UDPInput::do_work()
 			continue;
 		}
 		
-		for (size_t i = 0; i < stream_ids.size(); ++i) {
-			servers->add_data(stream_ids[i], buf, ret);
+		for (size_t i = 0; i < stream_indices.size(); ++i) {
+			servers->add_data(stream_indices[i], packet_buf, ret);
 		}
 	}
 }