X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=889b737fcbe3c08d3983e00677b37cc5aff8aa7d;hp=86ba28a81cf41aef2927659375a169f16f03f434;hb=07569f8e011cd9b064c64bef1ce56f77bf7ddf53;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91 diff --git a/main.cpp b/main.cpp index 86ba28a..889b737 100644 --- a/main.cpp +++ b/main.cpp @@ -22,7 +22,7 @@ #include "input.h" #include "input_stats.h" #include "log.h" -#include "markpool.h" +#include "sa_compare.h" #include "serverpool.h" #include "state.pb.h" #include "stats.h" @@ -34,7 +34,6 @@ using namespace std; AccessLogThread *access_log = NULL; ServerPool *servers = NULL; -vector mark_pools; volatile bool hupped = false; volatile bool stopped = false; @@ -80,27 +79,28 @@ CubemapStateProto collect_state(const timeval &serialize_start, // Find all port statements in the configuration file, and create acceptors for htem. vector create_acceptors( const Config &config, - map *deserialized_acceptors) + map *deserialized_acceptors) { vector acceptors; for (unsigned i = 0; i < config.acceptors.size(); ++i) { const AcceptorConfig &acceptor_config = config.acceptors[i]; Acceptor *acceptor = NULL; - map::iterator deserialized_acceptor_it = - deserialized_acceptors->find(acceptor_config.port); + map::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::iterator acceptor_it = deserialized_acceptors->begin(); + for (map::iterator + acceptor_it = deserialized_acceptors->begin(); acceptor_it != deserialized_acceptors->end(); ++acceptor_it) { acceptor_it->second->close_socket(); @@ -149,11 +149,6 @@ void create_streams(const Config &config, const set &deserialized_urls, multimap *inputs) { - for (unsigned i = 0; i < config.mark_pools.size(); ++i) { - const MarkPoolConfig &mp_config = config.mark_pools[i]; - mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to)); - } - // HTTP streams. set expecting_urls = deserialized_urls; for (unsigned i = 0; i < config.streams.size(); ++i) { @@ -180,10 +175,6 @@ void create_streams(const Config &config, Stream::Encoding(stream_config.encoding)); } - if (stream_config.mark_pool != -1) { - servers->set_mark_pool(stream_index, mark_pools[stream_config.mark_pool]); - } - servers->set_pacing_rate(stream_index, stream_config.pacing_rate); string src = stream_config.src; @@ -210,11 +201,11 @@ void create_streams(const Config &config, // UDP streams. for (unsigned i = 0; i < config.udpstreams.size(); ++i) { const UDPStreamConfig &udpstream_config = config.udpstreams[i]; - MarkPool *mark_pool = NULL; - if (udpstream_config.mark_pool != -1) { - mark_pool = mark_pools[udpstream_config.mark_pool]; - } - int stream_index = servers->add_udpstream(udpstream_config.dst, mark_pool, udpstream_config.pacing_rate); + int stream_index = servers->add_udpstream( + udpstream_config.dst, + udpstream_config.pacing_rate, + udpstream_config.ttl, + udpstream_config.multicast_iface_index); string src = udpstream_config.src; if (!src.empty()) { @@ -336,7 +327,7 @@ int main(int argc, char **argv) char argv0_canon[PATH_MAX]; char config_filename_canon[PATH_MAX]; - if (realpath(argv[0], argv0_canon) == NULL) { + if (realpath("/proc/self/exe", argv0_canon) == NULL) { log_perror(argv[0]); exit(1); } @@ -386,12 +377,12 @@ start: CubemapStateProto loaded_state; struct timeval serialize_start; set deserialized_urls; - map deserialized_acceptors; + map deserialized_acceptors; multimap inputs; // multimap due to older versions without deduplication. if (state_fd != -1) { log(INFO, "Deserializing state from previous process..."); string serialized; - if (!read_tempfile(state_fd, &serialized)) { + if (!read_tempfile_and_close(state_fd, &serialized)) { exit(1); } if (!loaded_state.ParseFromString(serialized)) { @@ -418,12 +409,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 +420,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 +428,9 @@ start: // Deserialize the acceptors. for (int i = 0; i < loaded_state.acceptors_size(); ++i) { + sockaddr_in6 sin6 = extract_address_from_acceptor_proto(loaded_state.acceptors(i)); deserialized_acceptors.insert(make_pair( - loaded_state.acceptors(i).port(), + sin6, new Acceptor(loaded_state.acceptors(i)))); } @@ -468,8 +445,7 @@ start: vector acceptors = create_acceptors(config, &deserialized_acceptors); // Put back the existing clients. It doesn't matter which server we - // allocate them to, so just do round-robin. However, we need to add - // them after the mark pools have been set up. + // allocate them to, so just do round-robin. for (int i = 0; i < loaded_state.clients_size(); ++i) { if (deleted_urls.count(loaded_state.clients(i).url()) != 0) { safe_close(loaded_state.clients(i).sock()); @@ -566,11 +542,6 @@ start: } delete servers; - for (unsigned i = 0; i < mark_pools.size(); ++i) { - delete mark_pools[i]; - } - mark_pools.clear(); - access_log->stop(); delete access_log; shut_down_logging();