Refactor TCP logic

.gitignore

@@ -1,3 +1,4 @@
+.env
 .vscode/
 .VSCodeCounter/
 /target/

Cargo.toml

@@ -11,31 +11,29 @@ readme = "README.md"
 
 [dependencies]
 ahash = "0.8"
-tokio = { version = "1.43", features = [
+etherparse = { version = "0.17", default-features = false, features = ["std"] }
+log = { version = "0.4", default-features = false }
+rand = { version = "0.9", default-features = false, features = ["thread_rng"] }
+thiserror = { version = "2.0", default-features = false }
+tokio = { version = "1.43", default-features = false, features = [
     "sync",
     "rt",
     "time",
     "io-util",
     "macros",
-], default-features = false }
-etherparse = { version = "0.17", default-features = false, features = ["std"] }
-thiserror = { version = "2.0", default-features = false }
-log = { version = "0.4", default-features = false }
-rand = { version = "0.9", default-features = false, features = ["thread_rng"] }
+] }
 
 [dev-dependencies]
-tokio = { version = "1.43", features = [
-    "rt-multi-thread",
-], default-features = false }
 clap = { version = "4.5", features = ["derive"] }
+criterion = { version = "0.5" } # Benchmarks
+dotenvy = "0.15"
 env_logger = "0.11"
+tokio = { version = "1.43", default-features = false, features = [
+    "rt-multi-thread",
+] }
+tun = { version = "0.7.13", default-features = false, features = ["async"] }
 udp-stream = { version = "0.0", default-features = false }
 
-# Benchmarks
-criterion = { version = "0.5" }
-
-[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dev-dependencies]
-tun = { version = "0.7.13", features = ["async"], default-features = false }
 [target.'cfg(target_os = "windows")'.dev-dependencies]
 wintun = { version = "0.5", default-features = false }
 

README.md

@@ -5,7 +5,7 @@ An asynchronous lightweight userspace implementation of TCP/IP stack for Tun dev
 Unstable, under development.
 
 [![Crates.io](https://img.shields.io/crates/v/ipstack.svg)](https://crates.io/crates/ipstack)
-![ipstack](https://docs.rs/ipstack/badge.svg)
+[![ipstack](https://docs.rs/ipstack/badge.svg)](https://docs.rs/ipstack)
 [![Documentation](https://img.shields.io/badge/docs-release-brightgreen.svg?style=flat)](https://docs.rs/ipstack)
 [![Download](https://img.shields.io/crates/d/ipstack.svg)](https://crates.io/crates/ipstack)
 [![License](https://img.shields.io/crates/l/ipstack.svg?style=flat)](https://github.com/narrowlink/ipstack/blob/main/LICENSE)
@@ -34,7 +34,7 @@ async fn main() {
 
     #[cfg(target_os = "windows")]
     config.platform_config(|config| {
-        config.device_guid(Some(12324323423423434234_u128));
+        config.device_guid(12324323423423434234_u128);
     });
 
     let mut ipstack_config = ipstack::IpStackConfig::default();
@@ -51,7 +51,7 @@ async fn main() {
                 });
             }
             IpStackStream::Udp(mut udp) => {
-                let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(1, 1, 1, 1)), 53);
+                let addr: SocketAddr = "1.1.1.1:53".parse().unwrap();
                 let mut rhs = UdpStream::connect(addr).await.unwrap();
                 tokio::spawn(async move {
                     let _ = tokio::io::copy_bidirectional(&mut udp, &mut rhs).await;
@@ -60,12 +60,8 @@ async fn main() {
             IpStackStream::UnknownTransport(u) => {
                 if u.src_addr().is_ipv4() && u.ip_protocol() == IpNumber::ICMP {
                     let (icmp_header, req_payload) = Icmpv4Header::from_slice(u.payload()).unwrap();
-                    if let etherparse::Icmpv4Type::EchoRequest(req) = icmp_header.icmp_type {
+                    if let etherparse::Icmpv4Type::EchoRequest(echo) = icmp_header.icmp_type {
                         println!("ICMPv4 echo");
-                        let echo = IcmpEchoHeader {
-                            id: req.id,
-                            seq: req.seq,
-                        };
                         let mut resp = Icmpv4Header::new(etherparse::Icmpv4Type::EchoReply(echo));
                         resp.update_checksum(req_payload);
                         let mut payload = resp.to_bytes().to_vec();
@@ -86,4 +82,4 @@ async fn main() {
 }
 ```
 
-We also suggest that you take a look at the complete [examples](examples).
+We also suggest that you take a look at the complete [examples](./examples).

examples/tun2.rs → examples/tun.rs

@@ -5,7 +5,7 @@
 //!
 //! This example must be run as root or administrator privileges.
 //! ```
-//! sudo target/debug/examples/tun2 --server-addr 127.0.0.1:8080 # Linux or macOS
+//! sudo target/debug/examples/tun --server-addr 127.0.0.1:8080 # Linux or macOS
 //! ```
 //! Then please run the `echo` example server, which listens on TCP & UDP ports 127.0.0.1:8080.
 //! ```
@@ -28,7 +28,7 @@
 //!
 
 use clap::Parser;
-use etherparse::{IcmpEchoHeader, Icmpv4Header};
+use etherparse::Icmpv4Header;
 use ipstack::{stream::IpStackStream, IpNumber};
 use std::net::{Ipv4Addr, SocketAddr};
 use tokio::net::TcpStream;
@@ -71,6 +71,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    dotenvy::dotenv().ok();
     let args = Args::parse();
 
     let default = format!("{:?}", args.verbosity);
@@ -154,12 +155,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 let n = number;
                 if u.src_addr().is_ipv4() && u.ip_protocol() == IpNumber::ICMP {
                     let (icmp_header, req_payload) = Icmpv4Header::from_slice(u.payload())?;
-                    if let etherparse::Icmpv4Type::EchoRequest(req) = icmp_header.icmp_type {
+                    if let etherparse::Icmpv4Type::EchoRequest(echo) = icmp_header.icmp_type {
                         log::info!("#{n} ICMPv4 echo");
-                        let echo = IcmpEchoHeader {
-                            id: req.id,
-                            seq: req.seq,
-                        };
                         let mut resp = Icmpv4Header::new(etherparse::Icmpv4Type::EchoReply(echo));
                         resp.update_checksum(req_payload);
                         let mut payload = resp.to_bytes().to_vec();
@@ -174,7 +171,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 continue;
             }
             IpStackStream::UnknownNetwork(pkt) => {
-                log::info!("#{number} unknown transport - {} bytes", pkt.len());
+                log::info!("#{number} unknown network - {} bytes", pkt.len());
                 continue;
             }
         };

examples/tun_wintun.rs

@@ -1,7 +1,7 @@
 use std::net::{Ipv4Addr, SocketAddr};
 
 use clap::Parser;
-use etherparse::{IcmpEchoHeader, Icmpv4Header};
+use etherparse::Icmpv4Header;
 use ipstack::{stream::IpStackStream, IpNumber};
 use tokio::net::TcpStream;
 use udp_stream::UdpStream;
@@ -19,6 +19,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    dotenvy::dotenv().ok();
     let args = Args::parse();
 
     env_logger::init();
@@ -46,10 +47,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut ip_stack = ipstack::IpStack::new(ipstack_config, tun::create_as_async(&config)?);
 
     #[cfg(target_os = "windows")]
-    let mut ip_stack = ipstack::IpStack::new(
-        ipstack_config,
-        wintun::WinTunDevice::new(ipv4, Ipv4Addr::new(255, 255, 255, 0)),
-    );
+    let mut ip_stack = ipstack::IpStack::new(ipstack_config, wintun::WinTunDevice::new(ipv4, Ipv4Addr::new(255, 255, 255, 0)));
 
     let server_addr = args.server_addr;
 
@@ -86,12 +84,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             IpStackStream::UnknownTransport(u) => {
                 if u.src_addr().is_ipv4() && u.ip_protocol() == IpNumber::ICMP {
                     let (icmp_header, req_payload) = Icmpv4Header::from_slice(u.payload())?;
-                    if let etherparse::Icmpv4Type::EchoRequest(req) = icmp_header.icmp_type {
+                    if let etherparse::Icmpv4Type::EchoRequest(echo) = icmp_header.icmp_type {
                         println!("ICMPv4 echo");
-                        let echo = IcmpEchoHeader {
-                            id: req.id,
-                            seq: req.seq,
-                        };
                         let mut resp = Icmpv4Header::new(etherparse::Icmpv4Type::EchoReply(echo));
                         resp.update_checksum(req_payload);
                         let mut payload = resp.to_bytes().to_vec();
@@ -178,17 +172,11 @@ mod wintun {
             std::task::Poll::Ready(Ok(buf.len()))
         }
 
-        fn poll_flush(
-            self: std::pin::Pin<&mut Self>,
-            _cx: &mut std::task::Context<'_>,
-        ) -> std::task::Poll<Result<(), std::io::Error>> {
+        fn poll_flush(self: std::pin::Pin<&mut Self>, _cx: &mut std::task::Context<'_>) -> std::task::Poll<Result<(), std::io::Error>> {
             std::task::Poll::Ready(Ok(()))
         }
 
-        fn poll_shutdown(
-            self: std::pin::Pin<&mut Self>,
-            _cx: &mut std::task::Context<'_>,
-        ) -> std::task::Poll<Result<(), std::io::Error>> {
+        fn poll_shutdown(self: std::pin::Pin<&mut Self>, _cx: &mut std::task::Context<'_>) -> std::task::Poll<Result<(), std::io::Error>> {
             std::task::Poll::Ready(Ok(()))
         }
     }

rustfmt.toml

@@ -0,0 +1 @@
+max_width = 140