X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=18976fc833b6d49a981af6fc67e79fe1efa64469;hp=7da66507a366881c51dc652500cc0704b66fee60;hb=6d34c5b6d8e5bec5d1421eadc103f38d206f34f1;hpb=58dd753c464d917dc446e2cbb4c01fd750d4eb87

diff --git a/main.cpp b/main.cpp
index 7da6650..18976fc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <getopt.h>
 #include <limits.h>
 #include <signal.h>
@@ -521,7 +522,9 @@ start:
 	     loaded_state.mutable_clients()->end(),
 	     OrderByConnectionTime());
 	for (int i = 0; i < loaded_state.clients_size(); ++i) {
-		if (all_urls.count(loaded_state.clients(i).url()) == 0) {
+		if (!loaded_state.clients(i).url().empty() &&
+		    all_urls.count(loaded_state.clients(i).url()) == 0) {
+			// Belongs to a dead stream (not keepalive), so we just have to close.
 			safe_close(loaded_state.clients(i).sock());
 		} else {
 			servers->add_client_from_serialized(loaded_state.clients(i), short_response_pool);
@@ -530,6 +533,15 @@ start:
 	
 	short_response_pool.clear();  // No longer needed; the clients have their own refcounts now.
 
+	// Put back the HLS zombies. There's no really good allocation here
+	// except round-robin; it would be marginally more efficient to match it
+	// to the client (since that would have them deleted immediately when
+	// the client requests the next fragment, instead of being later weeded
+	// out during statistics collection), but it's not a big deal.
+	for (const HLSZombieProto &zombie_proto : loaded_state.hls_zombies()) {
+		servers->add_hls_zombie_from_serialized(zombie_proto);
+	}
+
 	servers->run();
 
 	// Now delete all inputs that are longer in use, and start the others.
@@ -650,6 +662,10 @@ start:
 	char buf[16];
 	sprintf(buf, "%d", state_fd);
 
+	// Unset the close-on-exec flag for the state fd.
+	// (This can't leak into a child, since there's only one thread left.)
+	fcntl(state_fd, F_SETFD, 0);
+
 	for ( ;; ) {
 		execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, nullptr);
 		open_logs(config.log_destinations);