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

diff --git a/udpinput.cpp b/udpinput.cpp
index 4222515..07bf63d 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -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;
 }
 	
@@ -82,7 +75,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);
@@ -94,21 +87,12 @@ 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;