X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=acceptor.cpp;h=29a7f8c1f675d356f2af42047b473a9b82f44169;hp=7c28ca58038c27b107cad1b8dd82d6dd3b78bd3c;hb=4935d50a97f7391795b7974b40c85003189f117a;hpb=ef4cf9957b668845eb1064f583a0021009cbeeac

diff --git a/acceptor.cpp b/acceptor.cpp
index 7c28ca5..29a7f8c 100644
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -91,15 +91,20 @@ sockaddr_in6 extract_address_from_acceptor_proto(const AcceptorProto &proto)
 	return sin6;
 }
 	
-Acceptor::Acceptor(int server_sock, const sockaddr_in6 &addr)
+Acceptor::Acceptor(int server_sock, const sockaddr_in6 &addr,
+                   const string &certificate_chain, const string &private_key)
 	: server_sock(server_sock),
-	  addr(addr)
+	  addr(addr),
+	  certificate_chain(certificate_chain),
+	  private_key(private_key)
 {
 }
 
 Acceptor::Acceptor(const AcceptorProto &serialized)
 	: server_sock(serialized.server_sock()),
-	  addr(extract_address_from_acceptor_proto(serialized))
+	  addr(extract_address_from_acceptor_proto(serialized)),
+	  certificate_chain(serialized.certificate_chain()),
+	  private_key(serialized.private_key())
 {
 }
 
@@ -112,6 +117,8 @@ AcceptorProto Acceptor::serialize() const
 	serialized.set_server_sock(server_sock);
 	serialized.set_addr(buf);
 	serialized.set_port(ntohs(addr.sin6_port));
+	serialized.set_certificate_chain(certificate_chain);
+	serialized.set_private_key(private_key);
 	return serialized;
 }
 
@@ -123,7 +130,7 @@ void Acceptor::close_socket()
 void Acceptor::do_work()
 {
 	while (!should_stop()) {
-		if (!wait_for_activity(server_sock, POLLIN, NULL)) {
+		if (!wait_for_activity(server_sock, POLLIN, nullptr)) {
 			continue;
 		}
 
@@ -151,6 +158,6 @@ void Acceptor::do_work()
 		}
 
 		// Pick a server, round-robin, and hand over the socket to it.
-		servers->add_client(sock);
+		servers->add_client(sock, this);
 	}
 }