When closing unused inputs, remember to take down their sockets.

[cubemap] / udpinput.cpp

diff --git a/udpinput.cpp b/udpinput.cpp
index ed53edeea073604d93de240ffea6b5c7d04d323d..ae4f288e34fc16da66470f656f6ef369f3322be3 100644 (file)
--- 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;
@@ -73,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()
@@ -86,7 +84,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 +118,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);
+               }
        }
 }