X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=udpinput.cpp;h=ae4f288e34fc16da66470f656f6ef369f3322be3;hb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7;hp=cd66f16debff02b6edf6426c136b84a46a1bf7d6;hpb=ca9624c43b968a0f29ea44e47851ff686bb64bb6;p=cubemap

diff --git a/udpinput.cpp b/udpinput.cpp
index cd66f16..ae4f288 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,24 +1,25 @@
+#include <assert.h>
+#include <errno.h>
+#include <poll.h>
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
-#include <arpa/inet.h>
-#include <errno.h>
+#include <unistd.h>
 #include <string>
 
 #include "acceptor.h"
-#include "udpinput.h"
+#include "log.h"
 #include "serverpool.h"
-#include "version.h"
 #include "state.pb.h"
+#include "udpinput.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.
@@ -30,8 +31,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.
@@ -58,7 +58,7 @@ void UDPInput::close_socket()
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
-		perror("close()");
+		log_perror("close()");
 	}
 
 	sock = -1;
@@ -70,9 +70,10 @@ 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"
-		"\r\n";
-	servers->set_header(stream_id, header);
+		"Server: " SERVER_IDENTIFICATION "\r\n";
+	for (size_t i = 0; i < stream_ids.size(); ++i) {
+		servers->set_header(stream_ids[i], header, "");
+	}
 }
 
 void UDPInput::do_work()
@@ -82,7 +83,8 @@ void UDPInput::do_work()
 			int port_num = atoi(port.c_str());
 			sock = create_server_socket(port_num, UDP_SOCKET);
 			if (sock == -1) {
-				fprintf(stderr, "WARNING: UDP socket creation failed. Waiting 0.2 seconds and trying again...\n");
+				log(WARNING, "[%s] UDP socket creation failed. Waiting 0.2 seconds and trying again...",
+				             url.c_str());
 				usleep(200000);
 				continue;
 			}
@@ -99,7 +101,7 @@ void UDPInput::do_work()
 			continue;
 		}
 		if (nfds == -1) {
-			perror("poll");
+			log_perror("poll");
 			close_socket();
 			continue;	
 		}
@@ -111,11 +113,13 @@ void UDPInput::do_work()
 		} while (ret == -1 && errno == EINTR);
 
 		if (ret <= 0) {
-			perror("recv");
+			log_perror("recv");
 			close_socket();
 			continue;
 		}
 		
-		servers->add_data(stream_id, buf, ret);
+		for (size_t i = 0; i < stream_ids.size(); ++i) {
+			servers->add_data(stream_ids[i], buf, ret);
+		}
 	}
 }