X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2Fnet.cpp;h=0686d54eb0b9d87077b2838daac3091c54c79b37;hb=015bb899f8e3fb014bfa69fdcbb30db1c1163384;hp=25e5b43e7bd2ef732dcd4da97d22524a087faf1c;hpb=808d9dbd3ab101c0ff10697e36ef2c45a23b6ef5;p=blank.git

diff --git a/src/net/net.cpp b/src/net/net.cpp
index 25e5b43..0686d54 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -84,6 +84,11 @@ uint16_t Connection::Send(UDPpacket &udp_pack, UDPsocket sock) {
 		throw NetError("SDLNet_UDP_Send");
 	}
 
+	if (HasHandler()) {
+		Handler().PacketOut(udp_pack);
+		Handler().PacketSent(seq);
+	}
+
 	FlagSend();
 	return seq;
 }
@@ -111,6 +116,7 @@ void Connection::Received(const UDPpacket &udp_pack) {
 	}
 
 	Packet::TControl ctrl_new = pack.header.ctrl;
+	Handler().PacketIn(udp_pack);
 	Handler().Handle(udp_pack);
 
 	if (diff > 0) {
@@ -151,20 +157,43 @@ uint16_t Connection::SendPing(UDPpacket &udp_pack, UDPsocket sock) {
 ConnectionHandler::ConnectionHandler()
 : packets_lost(0)
 , packets_received(0)
-, packet_loss(0.0f) {
+, packet_loss(0.0f)
+, stamp_cursor(15)
+, stamp_last(0)
+, rtt(64.0f)
+, next_sample(1000)
+, tx_bytes(0)
+, rx_bytes(0)
+, tx_kbps(0.0f)
+, rx_kbps(0.0f) {
+	Uint32 now = SDL_GetTicks();
+	for (Uint32 &s : stamps) {
+		s = now;
+	}
+	next_sample += now;
+}
 
+void ConnectionHandler::PacketSent(uint16_t seq) noexcept {
+	if (!SamplePacket(seq)) {
+		return;
+	}
+	stamp_cursor = (stamp_cursor + 1) % 16;
+	stamps[stamp_cursor] = SDL_GetTicks();
+	stamp_last = seq;
 }
 
 void ConnectionHandler::PacketLost(uint16_t seq) {
 	OnPacketLost(seq);
 	++packets_lost;
 	UpdatePacketLoss();
+	UpdateRTT(seq);
 }
 
 void ConnectionHandler::PacketReceived(uint16_t seq) {
 	OnPacketReceived(seq);
 	++packets_received;
 	UpdatePacketLoss();
+	UpdateRTT(seq);
 }
 
 void ConnectionHandler::UpdatePacketLoss() noexcept {
@@ -176,6 +205,48 @@ void ConnectionHandler::UpdatePacketLoss() noexcept {
 	}
 }
 
+void ConnectionHandler::UpdateRTT(std::uint16_t seq) noexcept {
+	if (!SamplePacket(seq)) return;
+	int diff = HeadDiff(seq);
+	if (diff > 0 || diff < -15) {
+		// packet outside observed time frame
+		return;
+	}
+	int cur_rtt = SDL_GetTicks() - stamps[(stamp_cursor + diff + 16) % 16];
+	rtt += (cur_rtt - rtt) * 0.1f;
+}
+
+bool ConnectionHandler::SamplePacket(std::uint16_t seq) const noexcept {
+	// only sample every eighth packet
+	return seq % 8 == 0;
+}
+
+int ConnectionHandler::HeadDiff(std::uint16_t seq) const noexcept {
+	int16_t diff = int16_t(seq) - int16_t(stamp_last);
+	return diff / 8;
+}
+
+void ConnectionHandler::PacketIn(const UDPpacket &pack) noexcept {
+	rx_bytes += pack.len + 20; // I know, I know, it's an estimate (about 48 for IPv6)
+	UpdateStats();
+}
+
+void ConnectionHandler::PacketOut(const UDPpacket &pack) noexcept {
+	tx_bytes += pack.len + 20;
+	UpdateStats();
+}
+
+void ConnectionHandler::UpdateStats() noexcept {
+	Uint32 now = SDL_GetTicks();
+	if (now >= next_sample) {
+		tx_kbps = float(tx_bytes) * (1.0f / 1024.0f);
+		rx_kbps = float(rx_bytes) * (1.0f / 1024.0f);
+		tx_bytes = 0;
+		rx_bytes = 0;
+		next_sample += 1000;
+	}
+}
+
 
 ostream &operator <<(ostream &out, const IPaddress &addr) {
 	const unsigned char *host = reinterpret_cast<const unsigned char *>(&addr.host);
@@ -281,6 +352,8 @@ void Packet::Payload::Write(const EntityState &state, size_t off) noexcept {
 	WritePackU(state.block_pos * (1.0f / 16.0f), off + 12);
 	Write(state.velocity, off + 18);
 	Write(state.orient, off + 30);
+	WritePackN(state.pitch * PI_0p5_inv, off + 38);
+	WritePackN(state.yaw * PI_inv, off + 40);
 }
 
 void Packet::Payload::Read(EntityState &state, size_t off) const noexcept {
@@ -288,7 +361,11 @@ void Packet::Payload::Read(EntityState &state, size_t off) const noexcept {
 	ReadPackU(state.block_pos, off + 12);
 	Read(state.velocity, off + 18);
 	Read(state.orient, off + 30);
+	ReadPackN(state.pitch, off + 38);
+	ReadPackN(state.yaw, off + 40);
 	state.block_pos *= 16.0f;
+	state.pitch *= PI_0p5;
+	state.yaw *= PI;
 }
 
 void Packet::Payload::Write(const EntityState &state, const glm::ivec3 &base, size_t off) noexcept {
@@ -296,6 +373,8 @@ void Packet::Payload::Write(const EntityState &state, const glm::ivec3 &base, si
 	WritePackU(state.block_pos * (1.0f / 16.0f), off + 3);
 	Write(state.velocity, off + 9);
 	Write(state.orient, off + 21);
+	WritePackN(state.pitch * PI_0p5_inv, off + 29);
+	WritePackN(state.yaw * PI_inv, off + 31);
 }
 
 void Packet::Payload::Read(EntityState &state, const glm::ivec3 &base, size_t off) const noexcept {
@@ -303,13 +382,12 @@ void Packet::Payload::Read(EntityState &state, const glm::ivec3 &base, size_t of
 	ReadPackU(state.block_pos, off + 3);
 	Read(state.velocity, off + 9);
 	Read(state.orient, off + 21);
+	ReadPackN(state.pitch, off + 29);
+	ReadPackN(state.yaw, off + 31);
 	state.chunk_pos += base;
 	state.block_pos *= 16.0f;
-}
-
-void Packet::Payload::WritePackN(float val, size_t off) noexcept {
-	int16_t raw = glm::clamp(glm::round(val * 32767.0f), -32767.0f, 32767.0f);
-	Write(raw, off);
+	state.pitch *= PI_0p5;
+	state.yaw *= PI;
 }
 
 void Packet::Payload::WritePackB(const glm::ivec3 &val, size_t off) noexcept {
@@ -328,6 +406,11 @@ void Packet::Payload::ReadPackB(glm::ivec3 &val, size_t off) const noexcept {
 	val.z = conv;
 }
 
+void Packet::Payload::WritePackN(float val, size_t off) noexcept {
+	int16_t raw = glm::clamp(glm::round(val * 32767.0f), -32767.0f, 32767.0f);
+	Write(raw, off);
+}
+
 void Packet::Payload::ReadPackN(float &val, size_t off) const noexcept {
 	int16_t raw = 0;
 	Read(raw, off);
@@ -392,11 +475,11 @@ void Packet::Join::ReadPlayerState(EntityState &state) const noexcept {
 }
 
 void Packet::Join::WriteWorldName(const string &name) noexcept {
-	WriteString(name, 54, 32);
+	WriteString(name, 46, 32);
 }
 
 void Packet::Join::ReadWorldName(string &name) const noexcept {
-	ReadString(name, 54, 32);
+	ReadString(name, 46, 32);
 }
 
 void Packet::PlayerUpdate::WritePredictedState(const EntityState &state) noexcept {
@@ -408,47 +491,27 @@ void Packet::PlayerUpdate::ReadPredictedState(EntityState &state) const noexcept
 }
 
 void Packet::PlayerUpdate::WriteMovement(const glm::vec3 &mov) noexcept {
-	WritePackN(mov, 50);
+	WritePackN(mov, 42);
 }
 
 void Packet::PlayerUpdate::ReadMovement(glm::vec3 &mov) const noexcept {
-	ReadPackN(mov, 50);
-}
-
-void Packet::PlayerUpdate::WritePitch(float pitch) noexcept {
-	float conv = pitch * PI_0p5_inv;
-	WritePackN(conv, 56);
-}
-
-void Packet::PlayerUpdate::ReadPitch(float &pitch) const noexcept {
-	ReadPackN(pitch, 56);
-	pitch *= PI_0p5;
-}
-
-void Packet::PlayerUpdate::WriteYaw(float yaw) noexcept {
-	float conv = yaw * PI_inv;
-	WritePackN(conv, 58);
-}
-
-void Packet::PlayerUpdate::ReadYaw(float &yaw) const noexcept {
-	ReadPackN(yaw, 58);
-	yaw *= PI;
+	ReadPackN(mov, 42);
 }
 
 void Packet::PlayerUpdate::WriteActions(uint8_t actions) noexcept {
-	Write(actions, 60);
+	Write(actions, 48);
 }
 
 void Packet::PlayerUpdate::ReadActions(uint8_t &actions) const noexcept {
-	Read(actions, 60);
+	Read(actions, 48);
 }
 
 void Packet::PlayerUpdate::WriteSlot(uint8_t slot) noexcept {
-	Write(slot, 61);
+	Write(slot, 49);
 }
 
 void Packet::PlayerUpdate::ReadSlot(uint8_t &slot) const noexcept {
-	Read(slot, 61);
+	Read(slot, 49);
 }
 
 void Packet::SpawnEntity::WriteEntity(const Entity &e) noexcept {
@@ -459,13 +522,13 @@ void Packet::SpawnEntity::WriteEntity(const Entity &e) noexcept {
 		Write(uint32_t(0), 4);
 	}
 	Write(e.GetState(), 8);
-	Write(e.Bounds(), 58);
+	Write(e.Bounds(), 50);
 	uint32_t flags = 0;
 	if (e.WorldCollidable()) {
 		flags |= 1;
 	}
-	Write(flags, 82);
-	WriteString(e.Name(), 86, 32);
+	Write(flags, 74);
+	WriteString(e.Name(), 78, 32);
 }
 
 void Packet::SpawnEntity::ReadEntityID(uint32_t &id) const noexcept {
@@ -483,9 +546,9 @@ void Packet::SpawnEntity::ReadEntity(Entity &e) const noexcept {
 	string name;
 
 	Read(state, 8);
-	Read(bounds, 58);
-	Read(flags, 82);
-	ReadString(name, 86, 32);
+	Read(bounds, 50);
+	Read(flags, 74);
+	ReadString(name, 78, 32);
 
 	e.SetState(state);
 	e.Bounds(bounds);