X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=7947c221beb13d803a9b6c6a0c9d14a56f190e8d;hb=e2355b50a0d31f675e16593299256334c2baa2c4;hp=9eac33ece573ed35edb24b78893b855f75c0feb3;hpb=4727825186798902f68df5b99a6a32f0ef618454;p=blank.git

diff --git a/src/server/net.cpp b/src/server/net.cpp
index 9eac33e..7947c22 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -162,7 +162,7 @@ void ChunkTransmitter::SendData(size_t i) {
 	if (data_packets[i] == -1) {
 		++confirm_wait;
 	}
-	data_packets[i] = conn.Send();
+	data_packets[i] = conn.Send(Packet::ChunkData::GetSize(len));
 }
 
 void ChunkTransmitter::Release() {
@@ -188,7 +188,8 @@ ClientConnection::ClientConnection(Server &server, const IPaddress &addr)
 , old_actions(0)
 , transmitter(*this)
 , chunk_queue()
-, old_base() {
+, old_base()
+, chunk_blocks_skipped(0) {
 	conn.SetHandler(this);
 }
 
@@ -202,58 +203,60 @@ void ClientConnection::Update(int dt) {
 		return;
 	}
 	if (HasPlayer()) {
-		// sync entities
-		auto global_iter = server.GetWorld().Entities().begin();
-		auto global_end = server.GetWorld().Entities().end();
-		auto local_iter = spawns.begin();
-		auto local_end = spawns.end();
-
-		while (global_iter != global_end && local_iter != local_end) {
-			if (global_iter->ID() == local_iter->entity->ID()) {
-				// they're the same
-				if (CanDespawn(*global_iter)) {
-					SendDespawn(*local_iter);
-				} else if (SendingUpdates()) {
-					// update
-					QueueUpdate(*local_iter);
-				}
-				++global_iter;
-				++local_iter;
-			} else if (global_iter->ID() < local_iter->entity->ID()) {
-				// global entity was inserted
-				if (CanSpawn(*global_iter)) {
-					auto spawned = spawns.emplace(local_iter, *global_iter);
-					SendSpawn(*spawned);
-				}
-				++global_iter;
-			} else {
-				// global entity was removed
+		CheckPlayerFix();
+		CheckChunkQueue();
+		CheckEntities();
+		SendUpdates();
+	}
+	if (conn.ShouldPing()) {
+		conn.SendPing(server.GetPacket(), server.GetSocket());
+	}
+}
+
+void ClientConnection::CheckEntities() {
+	auto global_iter = server.GetWorld().Entities().begin();
+	auto global_end = server.GetWorld().Entities().end();
+	auto local_iter = spawns.begin();
+	auto local_end = spawns.end();
+
+	while (global_iter != global_end && local_iter != local_end) {
+		if (global_iter->ID() == local_iter->entity->ID()) {
+			// they're the same
+			if (CanDespawn(*global_iter)) {
 				SendDespawn(*local_iter);
-				++local_iter;
+			} else if (SendingUpdates()) {
+				// update
+				QueueUpdate(*local_iter);
 			}
-		}
-
-		// leftover spawns
-		while (global_iter != global_end) {
+			++global_iter;
+			++local_iter;
+		} else if (global_iter->ID() < local_iter->entity->ID()) {
+			// global entity was inserted
 			if (CanSpawn(*global_iter)) {
-				spawns.emplace_back(*global_iter);
-				SendSpawn(spawns.back());
+				auto spawned = spawns.emplace(local_iter, *global_iter);
+				SendSpawn(*spawned);
 			}
 			++global_iter;
-		}
-
-		// leftover despawns
-		while (local_iter != local_end) {
+		} else {
+			// global entity was removed
 			SendDespawn(*local_iter);
 			++local_iter;
 		}
-		SendUpdates();
+	}
 
-		CheckPlayerFix();
-		CheckChunkQueue();
+	// leftover spawns
+	while (global_iter != global_end) {
+		if (CanSpawn(*global_iter)) {
+			spawns.emplace_back(*global_iter);
+			SendSpawn(spawns.back());
+		}
+		++global_iter;
 	}
-	if (conn.ShouldPing()) {
-		conn.SendPing(server.GetPacket(), server.GetSocket());
+
+	// leftover despawns
+	while (local_iter != local_end) {
+		SendDespawn(*local_iter);
+		++local_iter;
 	}
 }
 
@@ -311,7 +314,7 @@ void ClientConnection::SendDespawn(SpawnStatus &status) {
 }
 
 bool ClientConnection::SendingUpdates() const noexcept {
-	return entity_updates_skipped >= NetStat().SuggestedPacketSkip();
+	return entity_updates_skipped >= NetStat().SuggestedPacketHold();
 }
 
 void ClientConnection::QueueUpdate(SpawnStatus &status) {
@@ -399,13 +402,14 @@ void ClientConnection::CheckChunkQueue() {
 		old_base = PlayerChunks().Base();
 		sort(chunk_queue.begin(), chunk_queue.end(), QueueCompare(old_base));
 	}
-	// if we have packet skip enabled and just pushed an entity
-	// update, don't also send chunk data
-	if (NetStat().SuggestedPacketSkip() > 0 && entity_updates_skipped == 0) {
+	// don't push entity updates and chunk data in the same tick
+	if (chunk_blocks_skipped >= NetStat().SuggestedPacketHold() && !SendingUpdates()) {
+		++chunk_blocks_skipped;
 		return;
 	}
 	if (transmitter.Transmitting()) {
 		transmitter.Transmit();
+		chunk_blocks_skipped = 0;
 		return;
 	}
 	if (transmitter.Idle()) {
@@ -418,6 +422,7 @@ void ClientConnection::CheckChunkQueue() {
 				Chunk *chunk = PlayerChunks().Get(pos);
 				if (chunk) {
 					transmitter.Send(*chunk);
+					chunk_blocks_skipped = 0;
 					return;
 				} else {
 					chunk_queue.push_back(pos);
@@ -575,10 +580,16 @@ void ClientConnection::On(const Packet::PlayerUpdate &pack) {
 	pack.ReadActions(new_actions);
 	pack.ReadSlot(slot);
 
+	// accept client's orientation as is
+	input->GetPlayer().GetEntity().Orientation(player_update_state.orient);
+	// simulate movement
 	input->SetMovement(movement);
+	// rotate head to match client's "prediction"
 	input->TurnHead(player_update_state.pitch - input->GetPitch(), player_update_state.yaw - input->GetYaw());
+	// select the given inventory slot
 	input->SelectInventory(slot);
 
+	// check if any actions have been started or stopped
 	if ((new_actions & 0x01) && !(old_actions & 0x01)) {
 		input->StartPrimaryAction();
 	} else if (!(new_actions & 0x01) && (old_actions & 0x01)) {
@@ -622,28 +633,54 @@ Server::Server(
 	const WorldSave &save)
 : serv_sock(nullptr)
 , serv_pack{ -1, nullptr, 0 }
+, serv_set(SDLNet_AllocSocketSet(1))
 , clients()
 , world(world)
 , spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , save(save)
 , player_model(nullptr)
 , cli(world) {
+	if (!serv_set) {
+		throw NetError("SDLNet_AllocSocketSet");
+	}
+
 	serv_sock = SDLNet_UDP_Open(conf.port);
 	if (!serv_sock) {
+		SDLNet_FreeSocketSet(serv_set);
 		throw NetError("SDLNet_UDP_Open");
 	}
 
+	if (SDLNet_UDP_AddSocket(serv_set, serv_sock) == -1) {
+		SDLNet_UDP_Close(serv_sock);
+		SDLNet_FreeSocketSet(serv_set);
+		throw NetError("SDLNet_UDP_AddSocket");
+	}
+
 	serv_pack.data = new Uint8[sizeof(Packet)];
 	serv_pack.maxlen = sizeof(Packet);
 }
 
 Server::~Server() {
+	for (ClientConnection &client : clients) {
+		client.Disconnected();
+	}
+	clients.clear();
 	world.Chunks().UnregisterIndex(spawn_index);
 	delete[] serv_pack.data;
+	SDLNet_UDP_DelSocket(serv_set, serv_sock);
 	SDLNet_UDP_Close(serv_sock);
+	SDLNet_FreeSocketSet(serv_set);
 }
 
 
+void Server::Wait(int dt) noexcept {
+	SDLNet_CheckSockets(serv_set, dt);
+}
+
+bool Server::Ready() noexcept {
+	return SDLNet_CheckSockets(serv_set, 0) > 0;
+}
+
 void Server::Handle() {
 	int result = SDLNet_UDP_Recv(serv_sock, &serv_pack);
 	while (result > 0) {