X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=udpinput.cpp;h=bd83381b563dc9b897b70f8d89b66a39a3da0ef1;hb=340489a8e732519182ecbc92116e7dfa2997143c;hp=ed53edeea073604d93de240ffea6b5c7d04d323d;hpb=4f4e1384b4299611924a39f59f536b4964806135;p=cubemap

diff --git a/udpinput.cpp b/udpinput.cpp
index ed53ede..bd83381 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -18,9 +18,8 @@ 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 +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.
@@ -47,7 +45,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;
@@ -75,7 +72,9 @@ void UDPInput::construct_header()
 		"Cache-control: no-cache\r\n"
 		"Server: " SERVER_IDENTIFICATION "\r\n"
 		"\r\n";
-	servers->set_header(stream_id, header);
+	for (size_t i = 0; i < stream_ids.size(); ++i) {
+		servers->set_header(stream_ids[i], header);
+	}
 }
 
 void UDPInput::do_work()
@@ -86,7 +85,7 @@ void UDPInput::do_work()
 			sock = create_server_socket(port_num, UDP_SOCKET);
 			if (sock == -1) {
 				log(WARNING, "[%s] UDP socket creation failed. Waiting 0.2 seconds and trying again...",
-				             stream_id.c_str());
+				             url.c_str());
 				usleep(200000);
 				continue;
 			}
@@ -120,6 +119,8 @@ void UDPInput::do_work()
 			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);
+		}
 	}
 }