diff --git a/Cargo.toml b/Cargo.toml index 35a885f..4ab4671 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] +resolver = "2" + members = [ "fake-tcp", "phantun", diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 00e8ab9..147c6ce 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -16,7 +16,7 @@ benchmark = [] [dependencies] bytes = "1" -pnet = "0.33" +pnet = "0.34" tokio = { version = "1.14", features = ["full"] } rand = { version = "0.8", features = ["small_rng"] } log = "0.4" diff --git a/fake-tcp/src/lib.rs b/fake-tcp/src/lib.rs index a5c5863..a66da47 100644 --- a/fake-tcp/src/lib.rs +++ b/fake-tcp/src/lib.rs @@ -146,7 +146,7 @@ impl Socket { ) } - fn build_tcp_packet(&self, flags: u16, payload: Option<&[u8]>) -> Bytes { + fn build_tcp_packet(&self, flags: u8, payload: Option<&[u8]>) -> Bytes { let ack = self.ack.load(Ordering::Relaxed); self.last_ack.store(ack, Ordering::Relaxed); diff --git a/fake-tcp/src/packet.rs b/fake-tcp/src/packet.rs index c2abe56..349ffb7 100644 --- a/fake-tcp/src/packet.rs +++ b/fake-tcp/src/packet.rs @@ -36,7 +36,7 @@ pub fn build_tcp_packet( remote_addr: SocketAddr, seq: u32, ack: u32, - flags: u16, + flags: u8, payload: Option<&[u8]>, ) -> Bytes { let ip_header_len = match local_addr {