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

[cubemap] / udpinput.cpp

diff --git a/udpinput.cpp b/udpinput.cpp
index fc0779cebdf25be2eb115b92ce3da73f543ec9eb..ae4f288e34fc16da66470f656f6ef369f3322be3 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "acceptor.h"
+#include "log.h"
 #include "serverpool.h"
 #include "state.pb.h"
 #include "udpinput.h"
@@ -17,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.
@@ -31,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.
@@ -46,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;
@@ -60,7 +58,7 @@ void UDPInput::close_socket()
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1) {
-               perror("close()");
+               log_perror("close()");
        }
 
        sock = -1;
@@ -72,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()
@@ -84,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;
                        }
@@ -101,7 +101,7 @@ void UDPInput::do_work()
                        continue;
                }
                if (nfds == -1) {
-                       perror("poll");
+                       log_perror("poll");
                        close_socket();
                        continue;       
                }
@@ -113,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);
+               }
        }
 }