diff options
Diffstat (limited to 'src/recv_worker.rs')
-rw-r--r-- | src/recv_worker.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/recv_worker.rs b/src/recv_worker.rs index d1ae5b1..578cf2e 100644 --- a/src/recv_worker.rs +++ b/src/recv_worker.rs @@ -1,6 +1,5 @@ -use crate::{error::Error, CtlType, InPkt, Pkt, PktType, RudpShare, UdpReceiver, UdpSender}; -use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; -use num_enum::{TryFromPrimitive, TryFromPrimitiveError}; +use crate::{error::Error, *}; +use byteorder::{BigEndian, ReadBytesExt}; use std::{ cell::Cell, io, result, @@ -8,7 +7,7 @@ use std::{ }; fn to_seqnum(seqnum: u16) -> usize { - (seqnum as usize) & (crate::REL_BUFFER - 1) + (seqnum as usize) & (REL_BUFFER - 1) } struct RelChan { @@ -36,11 +35,11 @@ impl<R: UdpReceiver, S: UdpSender> RecvWorker<R, S> { } pub fn run(&self) { - let mut recv_chans = (0..crate::NUM_CHANS as u8) + let mut recv_chans = (0..NUM_CHANS as u8) .map(|num| RelChan { num, - packets: (0..crate::REL_BUFFER).map(|_| Cell::new(None)).collect(), - seqnum: crate::INIT_SEQNUM, + packets: (0..REL_BUFFER).map(|_| Cell::new(None)).collect(), + seqnum: INIT_SEQNUM, }) .collect(); @@ -70,7 +69,7 @@ impl<R: UdpReceiver, S: UdpSender> RecvWorker<R, S> { let mut cursor = io::Cursor::new(self.udp_rx.recv()?); let proto_id = cursor.read_u32::<BigEndian>()?; - if proto_id != crate::PROTO_ID { + if proto_id != PROTO_ID { do yeet InvalidProtoId(proto_id); } |