Release Cubemap 1.0.2.

[cubemap] / main.cpp

diff --git a/main.cpp b/main.cpp
index 86ba28a81cf41aef2927659375a169f16f03f434..6535da04eef8adb1da56d257496b9ad6d78324d6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -23,6 +23,7 @@
 #include "input_stats.h"
 #include "log.h"
 #include "markpool.h"
+#include "sa_compare.h"
 #include "serverpool.h"
 #include "state.pb.h"
 #include "stats.h"
@@ -80,27 +81,28 @@ CubemapStateProto collect_state(const timeval &serialize_start,
 // Find all port statements in the configuration file, and create acceptors for htem.
 vector<Acceptor *> create_acceptors(
        const Config &config,
-       map<int, Acceptor *> *deserialized_acceptors)
+       map<sockaddr_in6, Acceptor *, Sockaddr6Compare> *deserialized_acceptors)
 {
        vector<Acceptor *> acceptors;
        for (unsigned i = 0; i < config.acceptors.size(); ++i) {
                const AcceptorConfig &acceptor_config = config.acceptors[i];
                Acceptor *acceptor = NULL;
-               map<int, Acceptor *>::iterator deserialized_acceptor_it =
-                       deserialized_acceptors->find(acceptor_config.port);
+               map<sockaddr_in6, Acceptor *, Sockaddr6Compare>::iterator deserialized_acceptor_it =
+                       deserialized_acceptors->find(acceptor_config.addr);
                if (deserialized_acceptor_it != deserialized_acceptors->end()) {
                        acceptor = deserialized_acceptor_it->second;
                        deserialized_acceptors->erase(deserialized_acceptor_it);
                } else {
-                       int server_sock = create_server_socket(acceptor_config.port, TCP_SOCKET);
-                       acceptor = new Acceptor(server_sock, acceptor_config.port);
+                       int server_sock = create_server_socket(acceptor_config.addr, TCP_SOCKET);
+                       acceptor = new Acceptor(server_sock, acceptor_config.addr);
                }
                acceptor->run();
                acceptors.push_back(acceptor);
        }
 
        // Close all acceptors that are no longer in the configuration file.
-       for (map<int, Acceptor *>::iterator acceptor_it = deserialized_acceptors->begin();
+       for (map<sockaddr_in6, Acceptor *, Sockaddr6Compare>::iterator
+                acceptor_it = deserialized_acceptors->begin();
             acceptor_it != deserialized_acceptors->end();
             ++acceptor_it) {
                acceptor_it->second->close_socket();
@@ -386,7 +388,7 @@ start:
        CubemapStateProto loaded_state;
        struct timeval serialize_start;
        set<string> deserialized_urls;
-       map<int, Acceptor *> deserialized_acceptors;
+       map<sockaddr_in6, Acceptor *, Sockaddr6Compare> deserialized_acceptors;
        multimap<string, InputWithRefcount> inputs;  // multimap due to older versions without deduplication.
        if (state_fd != -1) {
                log(INFO, "Deserializing state from previous process...");
@@ -418,12 +420,6 @@ start:
                                        data_fds.push_back(stream.data_fds(j));
                                }
 
-                               // Older versions stored the data once in the protobuf instead of
-                               // sending around file descriptors.
-                               if (data_fds.empty() && stream.has_data()) {
-                                       data_fds.push_back(make_tempfile(stream.data()));
-                               }
-
                                servers->add_stream_from_serialized(stream, data_fds);
                                deserialized_urls.insert(stream.url());
 
@@ -435,15 +431,6 @@ start:
                for (int i = 0; i < loaded_state.inputs_size(); ++i) {
                        InputProto serialized_input = loaded_state.inputs(i);
 
-                       // Older versions did not store the stream header in the input,
-                       // only in each stream. We need to have the stream header in the
-                       // input as well, in case we create a new stream reusing the same input.
-                       // Thus, we put it into place here if it's missing.
-                       if (!serialized_input.has_stream_header() &&
-                           stream_headers_for_url.count(serialized_input.url()) != 0) {
-                               serialized_input.set_stream_header(stream_headers_for_url[serialized_input.url()]);
-                       }
-
                        InputWithRefcount iwr;
                        iwr.input = create_input(serialized_input);
                        iwr.refcount = 0;
@@ -452,8 +439,9 @@ start:
 
                // Deserialize the acceptors.
                for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
+                       sockaddr_in6 sin6 = ExtractAddressFromAcceptorProto(loaded_state.acceptors(i));
                        deserialized_acceptors.insert(make_pair(
-                               loaded_state.acceptors(i).port(),
+                               sin6,
                                new Acceptor(loaded_state.acceptors(i))));
                }