X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=server.cpp;h=b5f58d4c56711968db64a8d6c63e7d9eb08d0e25;hb=8d2593119a04e6b30d5c36a722a77ee32f1d454b;hp=74a20c83d2308c5a0664b2e15ad040970ab47257;hpb=1bc0cd3639cfef1403c74f1d82960df3e8692149;p=cubemap

diff --git a/server.cpp b/server.cpp
index 74a20c8..b5f58d4 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1,9 +1,11 @@
-#include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>
+#include <netinet/in.h>
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/epoll.h>
 #include <sys/sendfile.h>
 #include <sys/socket.h>
@@ -145,18 +147,21 @@ void Server::add_client_deferred(int sock)
 
 void Server::add_client(int sock)
 {
-	clients.insert(make_pair(sock, Client(sock)));
+	pair<map<int, Client>::iterator, bool> ret =
+		clients.insert(make_pair(sock, Client(sock)));
+	assert(ret.second == true);  // Should not already exist.
+	Client *client_ptr = &ret.first->second;
 
 	// Start listening on data from this socket.
 	epoll_event ev;
 	ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
-	ev.data.u64 = reinterpret_cast<uint64_t>(&clients[sock]);
+	ev.data.u64 = reinterpret_cast<uint64_t>(client_ptr);
 	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
 		log_perror("epoll_ctl(EPOLL_CTL_ADD)");
 		exit(1);
 	}
 
-	process_client(&clients[sock]);
+	process_client(client_ptr);
 }
 
 void Server::add_client_from_serialized(const ClientProto &client)
@@ -169,8 +174,10 @@ void Server::add_client_from_serialized(const ClientProto &client)
 	} else {
 		stream = stream_it->second;
 	}
-	clients.insert(make_pair(client.sock(), Client(client, stream)));
-	Client *client_ptr = &clients[client.sock()];
+	pair<map<int, Client>::iterator, bool> ret =
+		clients.insert(make_pair(client.sock(), Client(client, stream)));
+	assert(ret.second == true);  // Should not already exist.
+	Client *client_ptr = &ret.first->second;
 
 	// Start listening on data from this socket.
 	epoll_event ev;