X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=udpinput.cpp;h=4222515e71c58366cc372c9faf33ea8a5b6788f4;hp=07bf63d344e8ba6e38d7d8d399acafad3016058c;hb=71fc5575037bead8b6e927a1fffd199e4fc4514b;hpb=ba03a3ed19cc8b02d4bb198edfd1c8bee9f28e35

diff --git a/udpinput.cpp b/udpinput.cpp
index 07bf63d..4222515 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -12,7 +12,6 @@
 #include "serverpool.h"
 #include "state.pb.h"
 #include "udpinput.h"
-#include "util.h"
 #include "version.h"
 
 using namespace std;
@@ -53,7 +52,15 @@ InputProto UDPInput::serialize() const
 
 void UDPInput::close_socket()
 {
-	safe_close(sock);
+	int ret;
+	do {
+		ret = close(sock);
+	} while (ret == -1 && errno == EINTR);
+
+	if (ret == -1) {
+		log_perror("close()");
+	}
+
 	sock = -1;
 }
 	
@@ -75,7 +82,7 @@ void UDPInput::add_destination(const string &stream_id)
 
 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);
@@ -87,12 +94,21 @@ void UDPInput::do_work()
 			}
 		}
 
-		// Wait for a packet, or a wakeup.
-		bool activity = wait_for_activity(sock, POLLIN, NULL);
-		if (!activity) {
-			// Most likely, should_stop was set.
+		// 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)) {
 			continue;
 		}
+		if (nfds == -1) {
+			log_perror("poll");
+			close_socket();
+			continue;	
+		}
 
 		char buf[4096];
 		int ret;