X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2Fnet.cpp;h=18761572bd13364cb10cddd6a2ac410c5d6b4b2d;hb=b5a83cd3df5083ed0cccfe4876143e788b3836f9;hp=9c29c1e09edeb96d9c7de52d433ad4e2f15ec341;hpb=da5073a7fdb1ca066e778a02db33d5d15073aea0;p=blank.git

diff --git a/src/net/net.cpp b/src/net/net.cpp
index 9c29c1e..1876157 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -1,5 +1,7 @@
 #include "Client.hpp"
+#include "ClientConnection.hpp"
 #include "Connection.hpp"
+#include "ConnectionHandler.hpp"
 #include "io.hpp"
 #include "Packet.hpp"
 #include "Server.hpp"
@@ -9,12 +11,19 @@
 
 #include <cstring>
 #include <iostream>
+#include <glm/gtx/io.hpp>
 
 using namespace std;
 
 
 namespace blank {
 
+constexpr size_t Packet::Ping::MAX_LEN;
+constexpr size_t Packet::Login::MAX_LEN;
+constexpr size_t Packet::Join::MAX_LEN;
+constexpr size_t Packet::Part::MAX_LEN;
+constexpr size_t Packet::PlayerUpdate::MAX_LEN;
+
 namespace {
 
 UDPsocket client_bind(Uint16 port) {
@@ -35,9 +44,8 @@ IPaddress client_resolve(const char *host, Uint16 port) {
 
 }
 
-Client::Client(const Config &conf, World &world)
-: world(world)
-, conn(client_resolve(conf.host.c_str(), conf.port))
+Client::Client(const Config &conf)
+: conn(client_resolve(conf.host.c_str(), conf.port))
 , client_sock(client_bind(0))
 , client_pack{ -1, nullptr, 0 } {
 	client_pack.data = new Uint8[sizeof(Packet)];
@@ -80,29 +88,101 @@ void Client::HandlePacket(const UDPpacket &udp_pack) {
 
 void Client::Update(int dt) {
 	conn.Update(dt);
-	if (conn.TimedOut()) {
-		cout << "connection timed out :(" << endl;
-	} else if (conn.ShouldPing()) {
+	if (conn.ShouldPing()) {
 		SendPing();
 	}
 }
 
-void Client::SendPing() {
-	conn.SendPing(client_pack, client_sock);
+uint16_t Client::SendPing() {
+	return conn.SendPing(client_pack, client_sock);
+}
+
+uint16_t Client::SendLogin(const string &name) {
+	auto pack = Packet::Make<Packet::Login>(client_pack);
+	pack.WritePlayerName(name);
+	return conn.Send(client_pack, client_sock);
+}
+
+uint16_t Client::SendPlayerUpdate(const Entity &player) {
+	auto pack = Packet::Make<Packet::PlayerUpdate>(client_pack);
+	pack.WritePlayer(player);
+	return conn.Send(client_pack, client_sock);
+}
+
+
+ClientConnection::ClientConnection(Server &server, const IPaddress &addr)
+: server(server)
+, conn(addr)
+, player(nullptr) {
+	conn.SetHandler(this);
+}
+
+ClientConnection::~ClientConnection() {
+	DetachPlayer();
+}
+
+void ClientConnection::Update(int dt) {
+	conn.Update(dt);
+	if (Disconnected()) {
+		cout << "disconnect from " << conn.Address() << endl;
+	} else if (conn.ShouldPing()) {
+		conn.SendPing(server.GetPacket(), server.GetSocket());
+	}
+}
+
+void ClientConnection::AttachPlayer(Entity &new_player) {
+	DetachPlayer();
+	player = &new_player;
+	player->Ref();
 }
 
-void Client::SendLogin(const string &name) {
-	Packet &pack = *reinterpret_cast<Packet *>(client_pack.data);
-	client_pack.len = pack.MakeLogin(name);
-	conn.Send(client_pack, client_sock);
+void ClientConnection::DetachPlayer() {
+	if (!player) return;
+	player->Kill();
+	player->UnRef();
+	player = nullptr;
+}
+
+void ClientConnection::On(const Packet::Login &pack) {
+	string name;
+	pack.ReadPlayerName(name);
+
+	Entity *new_player = server.GetWorld().AddPlayer(name);
+
+	if (new_player) {
+		// success!
+		AttachPlayer(*new_player);
+		cout << "accepted login from player \"" << name << '"' << endl;
+		auto response = Packet::Make<Packet::Join>(server.GetPacket());
+		response.WritePlayer(*new_player);
+		response.WriteWorldName(server.GetWorld().Name());
+		conn.Send(server.GetPacket(), server.GetSocket());
+	} else {
+		// aw no :(
+		cout << "rejected login from player \"" << name << '"' << endl;
+		Packet::Make<Packet::Part>(server.GetPacket());
+		conn.Send(server.GetPacket(), server.GetSocket());
+		conn.Close();
+	}
+}
+
+void ClientConnection::On(const Packet::Part &) {
+	conn.Close();
+}
+
+void ClientConnection::On(const Packet::PlayerUpdate &pack) {
+	if (!HasPlayer()) return;
+	pack.ReadPlayer(Player());
 }
 
 
 Connection::Connection(const IPaddress &addr)
-: addr(addr)
-, send_timer(3000)
+: handler(nullptr)
+, addr(addr)
+, send_timer(500)
 , recv_timer(10000)
-, ctrl{ 0, 0xFFFF, 0xFFFF }
+, ctrl_out{ 0, 0xFFFF, 0xFFFFFFFF }
+, ctrl_in{ 0, 0xFFFF, 0xFFFFFFFF }
 , closed(false) {
 	send_timer.Start();
 	recv_timer.Start();
@@ -121,7 +201,7 @@ void Connection::FlagRecv() noexcept {
 }
 
 bool Connection::ShouldPing() const noexcept {
-	return send_timer.HitOnce();
+	return !closed && send_timer.HitOnce();
 }
 
 bool Connection::TimedOut() const noexcept {
@@ -131,14 +211,19 @@ bool Connection::TimedOut() const noexcept {
 void Connection::Update(int dt) {
 	send_timer.Update(dt);
 	recv_timer.Update(dt);
+	if (TimedOut()) {
+		Close();
+		if (HasHandler()) {
+			Handler().OnTimeout();
+		}
+	}
 }
 
 
-void Connection::Send(UDPpacket &udp_pack, UDPsocket sock) {
+uint16_t Connection::Send(UDPpacket &udp_pack, UDPsocket sock) {
 	Packet &pack = *reinterpret_cast<Packet *>(udp_pack.data);
-	pack.header.ctrl = ctrl;
-
-	cout << "sending " << pack.GetType() << " to " << Address() << endl;
+	pack.header.ctrl = ctrl_out;
+	uint16_t seq = ctrl_out.seq++;
 
 	udp_pack.address = addr;
 	if (SDLNet_UDP_Send(sock, -1, &udp_pack) == 0) {
@@ -146,49 +231,66 @@ void Connection::Send(UDPpacket &udp_pack, UDPsocket sock) {
 	}
 
 	FlagSend();
+	return seq;
 }
 
 void Connection::Received(const UDPpacket &udp_pack) {
 	Packet &pack = *reinterpret_cast<Packet *>(udp_pack.data);
 
-	cout << "received " << pack.GetType() << " from " << Address() << endl;
-
-	int diff = std::int16_t(pack.header.ctrl.seq) - std::int16_t(ctrl.ack);
-
+	// ack to the remote
+	int16_t diff = int16_t(pack.header.ctrl.seq) - int16_t(ctrl_out.ack);
 	if (diff > 0) {
-		// incoming more recent than last acked
-
-		// TODO: packets considered lost are detected here
-		//       this should have ones for all of them:
-		//       ~hist & ((1 << dist) - 1) if dist is < 32
-
 		if (diff >= 32) {
-			// missed more than the last 32 oO
-			ctrl.hist = 0;
-		} else {
-			ctrl.hist >>= diff;
-			ctrl.hist |= 1 << (32 - diff);
-		}
-	} else if (diff < 0) {
-		// incoming older than acked
-		if (diff > -32) {
-			// too late :/
+			ctrl_out.hist = 0;
 		} else {
-			ctrl.hist |= 1 << (32 + diff);
+			ctrl_out.hist <<= diff;
+			ctrl_out.hist |= 1 << (diff - 1);
 		}
-	} else {
-		// incoming the same as last acked oO
+	} else if (diff < 0 && diff >= -32) {
+		ctrl_out.hist |= 1 << (-diff - 1);
 	}
+	ctrl_out.ack = pack.header.ctrl.seq;
+	FlagRecv();
 
-	ctrl.ack = pack.header.ctrl.seq;
+	if (!HasHandler()) {
+		return;
+	}
 
-	FlagRecv();
+	Packet::TControl ctrl_new = pack.header.ctrl;
+	Handler().Handle(udp_pack);
+
+	if (diff > 0) {
+		// if the packet holds more recent information
+		// check if remote failed to ack one of our packets
+		diff = int16_t(ctrl_new.ack) - int16_t(ctrl_in.ack);
+		// should always be true, but you never know…
+		if (diff > 0) {
+			for (int i = 0; i < diff; ++i) {
+				if (i > 32 || (i < 32 && (ctrl_in.hist & (1 << (31 - i))) == 0)) {
+					Handler().OnPacketLost(ctrl_in.ack - 32 + i);
+				}
+			}
+		}
+		// check for newly ack'd packets
+		for (uint16_t s = ctrl_new.AckBegin(); s != ctrl_new.AckEnd(); ++s) {
+			if (ctrl_new.Acks(s) && !ctrl_in.Acks(s)) {
+				Handler().OnPacketReceived(s);
+			}
+		}
+		ctrl_in = ctrl_new;
+	}
 }
 
-void Connection::SendPing(UDPpacket &udp_pack, UDPsocket sock) {
-	Packet &pack = *reinterpret_cast<Packet *>(udp_pack.data);
-	udp_pack.len = pack.MakePing();
-	Send(udp_pack, sock);
+bool Packet::TControl::Acks(uint16_t s) const noexcept {
+	int16_t diff = int16_t(ack) - int16_t(s);
+	if (diff == 0) return true;
+	if (diff < 0 || diff > 32) return false;
+	return (hist & (1 << (diff - 1))) != 0;
+}
+
+uint16_t Connection::SendPing(UDPpacket &udp_pack, UDPsocket sock) {
+	Packet::Make<Packet::Ping>(udp_pack);
+	return Send(udp_pack, sock);
 }
 
 
@@ -205,85 +307,160 @@ ostream &operator <<(ostream &out, const IPaddress &addr) {
 }
 
 
-const char *Packet::Type2String(Type t) noexcept {
+const char *Packet::Type2String(uint8_t t) noexcept {
 	switch (t) {
-		case PING:
-			return "PING";
-		case LOGIN:
-			return "LOGIN";
-		case JOIN:
-			return "JOIN";
-		case PART:
-			return "PART";
+		case Ping::TYPE:
+			return "Ping";
+		case Login::TYPE:
+			return "Login";
+		case Join::TYPE:
+			return "Join";
+		case Part::TYPE:
+			return "Part";
+		case PlayerUpdate::TYPE:
+			return "PlayerUpdate";
 		default:
-			return "UNKNOWN";
+			return "Unknown";
 	}
 }
 
-void Packet::Tag() noexcept {
-	header.tag = TAG;
+template<class T>
+void Packet::Payload::Write(const T &src, size_t off) noexcept {
+	if ((length - off) < sizeof(T)) {
+		// dismiss out of bounds write
+		return;
+	}
+	*reinterpret_cast<T *>(&data[off]) = src;
 }
 
-size_t Packet::MakePing() noexcept {
-	Tag();
-	header.type = PING;
-	return sizeof(Header);
+template<class T>
+void Packet::Payload::Read(T &dst, size_t off) const noexcept {
+	if ((length - off) < sizeof(T)) {
+		// dismiss out of bounds read
+		return;
+	}
+	dst = *reinterpret_cast<T *>(&data[off]);
 }
 
-size_t Packet::MakeLogin(const string &name) noexcept {
-	constexpr size_t maxname = 32;
-
-	Tag();
-	header.type = LOGIN;
-	if (name.size() < maxname) {
-		memset(payload, '\0', maxname);
-		memcpy(payload, name.c_str(), name.size());
+void Packet::Payload::WriteString(const string &src, size_t off, size_t maxlen) noexcept {
+	uint8_t *dst = &data[off];
+	size_t len = min(maxlen, length - off);
+	if (src.size() < len) {
+		memset(dst, '\0', len);
+		memcpy(dst, src.c_str(), src.size());
 	} else {
-		memcpy(payload, name.c_str(), maxname);
+		memcpy(dst, src.c_str(), len);
 	}
-	return sizeof(Header) + maxname;
 }
 
-size_t Packet::MakeJoin(const Entity &player, const string &world_name) noexcept {
-	constexpr size_t maxname = 32;
+void Packet::Payload::ReadString(string &dst, size_t off, size_t maxlen) const noexcept {
+	size_t len = min(maxlen, length - off);
+	dst.clear();
+	dst.reserve(len);
+	for (size_t i = 0; i < len && data[off + i] != '\0'; ++i) {
+		dst.push_back(data[off + i]);
+	}
+}
 
-	Tag();
-	header.type = JOIN;
 
-	uint8_t *cursor = &payload[0];
+void Packet::Login::WritePlayerName(const string &name) noexcept {
+	WriteString(name, 0, 32);
+}
 
-	// TODO: generate entity IDs
-	*reinterpret_cast<uint32_t *>(cursor) = 1;
-	cursor += 4;
+void Packet::Login::ReadPlayerName(string &name) const noexcept {
+	ReadString(name, 0, 32);
+}
 
-	*reinterpret_cast<glm::ivec3 *>(cursor) = player.ChunkCoords();
-	cursor += 12;
+void Packet::Join::WritePlayer(const Entity &player) noexcept {
+	Write(player.ID(), 0);
+	Write(player.ChunkCoords(), 4);
+	Write(player.Position(), 16);
+	Write(player.Velocity(), 28);
+	Write(player.Orientation(), 40);
+	Write(player.AngularVelocity(), 56);
+}
 
-	*reinterpret_cast<glm::vec3 *>(cursor) = player.Position();
-	cursor += 12;
-	*reinterpret_cast<glm::vec3 *>(cursor) = player.Velocity();
-	cursor += 12;
+void Packet::Join::ReadPlayerID(uint32_t &id) const noexcept {
+	Read(id, 0);
+}
 
-	*reinterpret_cast<glm::quat *>(cursor) = player.Orientation();
-	cursor += 16;
-	*reinterpret_cast<glm::vec3 *>(cursor) = player.AngularVelocity();
-	cursor += 12;
+void Packet::Join::ReadPlayer(Entity &player) const noexcept {
+	glm::ivec3 chunk_coords(0);
+	glm::vec3 pos;
+	glm::vec3 vel;
+	glm::quat rot;
+	glm::vec3 ang;
 
-	if (world_name.size() < maxname) {
-		memset(cursor, '\0', maxname);
-		memcpy(cursor, world_name.c_str(), world_name.size());
-	} else {
-		memcpy(cursor, world_name.c_str(), maxname);
-	}
-	cursor += maxname;
+	Read(chunk_coords, 4);
+	Read(pos, 16);
+	Read(vel, 28);
+	Read(rot, 40);
+	Read(ang, 56);
+
+	player.Position(chunk_coords, pos);
+	player.Velocity(vel);
+	player.Orientation(rot);
+	player.AngularVelocity(ang);
+}
+
+void Packet::Join::WriteWorldName(const string &name) noexcept {
+	WriteString(name, 68, 32);
+}
 
-	return sizeof(Header) + (cursor - &payload[0]);
+void Packet::Join::ReadWorldName(string &name) const noexcept {
+	ReadString(name, 68, 32);
 }
 
-size_t Packet::MakePart() noexcept {
-	Tag();
-	header.type = PART;
-	return sizeof(Header);
+void Packet::PlayerUpdate::WritePlayer(const Entity &player) noexcept {
+	Write(player.ChunkCoords(), 0);
+	Write(player.Position(), 12);
+	Write(player.Velocity(), 24);
+	Write(player.Orientation(), 36);
+	Write(player.AngularVelocity(), 52);
+}
+
+void Packet::PlayerUpdate::ReadPlayer(Entity &player) const noexcept {
+	glm::ivec3 chunk_coords(0);
+	glm::vec3 pos;
+	glm::vec3 vel;
+	glm::quat rot;
+	glm::vec3 ang;
+
+	Read(chunk_coords, 0);
+	Read(pos, 12);
+	Read(vel, 24);
+	Read(rot, 36);
+	Read(ang, 52);
+
+	player.Position(chunk_coords, pos);
+	player.Velocity(vel);
+	player.Orientation(rot);
+	player.AngularVelocity(ang);
+}
+
+
+void ConnectionHandler::Handle(const UDPpacket &udp_pack) {
+	const Packet &pack = *reinterpret_cast<const Packet *>(udp_pack.data);
+	switch (pack.Type()) {
+		case Packet::Ping::TYPE:
+			On(Packet::As<Packet::Ping>(udp_pack));
+			break;
+		case Packet::Login::TYPE:
+			On(Packet::As<Packet::Login>(udp_pack));
+			break;
+		case Packet::Join::TYPE:
+			On(Packet::As<Packet::Join>(udp_pack));
+			break;
+		case Packet::Part::TYPE:
+			On(Packet::As<Packet::Part>(udp_pack));
+			break;
+		case Packet::PlayerUpdate::TYPE:
+			On(Packet::As<Packet::PlayerUpdate>(udp_pack));
+			break;
+		default:
+			// drop unknown or unhandled packets
+			break;
+	}
 }
 
 
@@ -330,87 +507,29 @@ void Server::HandlePacket(const UDPpacket &udp_pack) {
 		return;
 	}
 
-	Connection &client = GetClient(udp_pack.address);
-	client.Received(udp_pack);
-
-	switch (pack.header.type) {
-		case Packet::LOGIN:
-			HandleLogin(client, udp_pack);
-			break;
-		case Packet::PART:
-			HandlePart(client, udp_pack);
-			break;
-		default:
-			// just drop packets of unknown or unhandled type
-			break;
-	}
+	ClientConnection &client = GetClient(udp_pack.address);
+	client.GetConnection().Received(udp_pack);
 }
 
-Connection &Server::GetClient(const IPaddress &addr) {
-	for (Connection &client : clients) {
+ClientConnection &Server::GetClient(const IPaddress &addr) {
+	for (ClientConnection &client : clients) {
 		if (client.Matches(addr)) {
 			return client;
 		}
 	}
-	clients.emplace_back(addr);
-	OnConnect(clients.back());
+	clients.emplace_back(*this, addr);
 	return clients.back();
 }
 
-void Server::OnConnect(Connection &client) {
-	cout << "new connection from " << client.Address() << endl;
-	// tell it we're alive
-	client.SendPing(serv_pack, serv_sock);
-}
-
 void Server::Update(int dt) {
-	for (list<Connection>::iterator client(clients.begin()), end(clients.end()); client != end;) {
+	for (list<ClientConnection>::iterator client(clients.begin()), end(clients.end()); client != end;) {
 		client->Update(dt);
-		if (client->Closed()) {
-			OnDisconnect(*client);
+		if (client->Disconnected()) {
 			client = clients.erase(client);
 		} else {
-			if (client->ShouldPing()) {
-				client->SendPing(serv_pack, serv_sock);
-			}
 			++client;
 		}
 	}
 }
 
-void Server::OnDisconnect(Connection &client) {
-	cout << "connection timeout from " << client.Address() << endl;
-}
-
-
-void Server::HandleLogin(Connection &client, const UDPpacket &udp_pack) {
-	const Packet &pack = *reinterpret_cast<const Packet *>(udp_pack.data);
-	size_t maxlen = min(udp_pack.len - int(sizeof(Packet::Header)), 32);
-	string name;
-	name.reserve(maxlen);
-	for (size_t i = 0; i < maxlen && pack.payload[i] != '\0'; ++i) {
-		name.push_back(pack.payload[i]);
-	}
-
-	Entity *player = world.AddPlayer(name);
-	Packet &response = *reinterpret_cast<Packet *>(serv_pack.data);
-
-	if (player) {
-		// success!
-		cout << "accepted login from player \"" << name << '"' << endl;
-		response.MakeJoin(*player, world.Name());
-		client.Send(serv_pack, serv_sock);
-	} else {
-		// aw no :(
-		cout << "rejected login from player \"" << name << '"' << endl;
-		response.MakePart();
-		client.Send(serv_pack, serv_sock);
-		client.Close();
-	}
-}
-
-void Server::HandlePart(Connection &client, const UDPpacket &udp_pack) {
-	client.Close();
-}
-
 }