This commit is contained in:
parent
53fe3333f0
commit
27b4644730
12 changed files with 852 additions and 642 deletions
|
|
@ -5,7 +5,7 @@ use crate::net::packet::PacketType;
|
|||
|
||||
use super::{
|
||||
packet::{InboundPacket, OutboundPacket, Packet},
|
||||
peer::{PeerChangeEvent, PeerData, PeerMap, PeerReceiveTiming, PeerSendTiming},
|
||||
peer::{PeerChangeMessage, PeerData, PeerMap, PeerReceiveTiming, PeerSendTiming},
|
||||
queues::{NetworkReceive, NetworkSend},
|
||||
};
|
||||
|
||||
|
|
@ -28,9 +28,9 @@ pub fn handle_network_input(
|
|||
from_socket: Res<NetworkReceive>,
|
||||
peer_map: Res<PeerMap>,
|
||||
mut peers: Query<(&PeerData, &mut PeerReceiveTiming)>,
|
||||
mut to_app: EventWriter<InboundPacket>,
|
||||
mut to_app: MessageWriter<InboundPacket>,
|
||||
time: Res<Time>,
|
||||
mut change_peer: EventWriter<PeerChangeEvent>,
|
||||
mut change_peer: MessageWriter<PeerChangeMessage>,
|
||||
) -> Result {
|
||||
for (message, address) in from_socket.iter() {
|
||||
match Packet::try_from(message) {
|
||||
|
|
@ -46,7 +46,7 @@ pub fn handle_network_input(
|
|||
continue;
|
||||
}
|
||||
}
|
||||
change_peer.write(PeerChangeEvent::new(packet.peer, Some(address)));
|
||||
change_peer.write(PeerChangeMessage::new(packet.peer, Some(address)));
|
||||
}
|
||||
Err(err) => warn!("Error reading packet: {:?}", err),
|
||||
}
|
||||
|
|
@ -55,7 +55,7 @@ pub fn handle_network_input(
|
|||
}
|
||||
|
||||
pub fn handle_network_output(
|
||||
mut from_app: EventReader<OutboundPacket>,
|
||||
mut from_app: MessageReader<OutboundPacket>,
|
||||
peer_map: Res<PeerMap>,
|
||||
mut peers: Query<(&PeerData, &mut PeerSendTiming)>,
|
||||
config: Res<Config>,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue