X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=194ffc7fa97c77fcdc13d9872a234141bb762cb3;hp=86ba28a81cf41aef2927659375a169f16f03f434;hb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91

diff --git a/main.cpp b/main.cpp
index 86ba28a..194ffc7 100644
--- 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...");
@@ -452,8 +454,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))));
 		}