Remove unused packet variant, move peer UUID to start of packet

This commit is contained in:
Michael Bradley 2025-10-25 22:22:11 -04:00
parent fee5fb3c95
commit fe967d70b9
Signed by: MichaelBradley
SSH key fingerprint: SHA256:BKO2eI2LPsCbQS3n3i5SdwZTAIV3F1lHezR07qP+Ob0
5 changed files with 18 additions and 66 deletions

View file

@ -1,8 +1,6 @@
use bevy::prelude::*;
use uuid::Uuid;
use crate::net::packet::PacketType;
use super::{
packet::{InboundPacket, OutboundPacket, Packet},
peer::{PeerChangeMessage, PeerData, PeerMap, PeerReceiveTiming, PeerSendTiming},
@ -20,8 +18,8 @@ impl Default for Config {
}
}
pub fn format_message(data: &Vec<u8>, variant: PacketType, id: Uuid) -> Vec<u8> {
[data.as_slice(), &[variant as u8], id.as_bytes()].concat()
pub fn format_message(id: Uuid, data: &Vec<u8>) -> Vec<u8> {
[id.as_bytes(), data.as_slice()].concat()
}
pub fn handle_network_input(
@ -65,7 +63,7 @@ pub fn handle_network_output(
for OutboundPacket(packet) in from_app.read() {
let peer_id = peer_map.try_get(&packet.peer)?;
let (peer, mut last) = peers.get_mut(*peer_id)?;
let message = format_message(&packet.message, packet.variant, config.id);
let message = format_message(config.id, &packet.message);
to_socket.send(message, peer.addr.into())?;
last.update(&time);
}