From 7db71641933888cb874dfc25120f0168d47c05e1 Mon Sep 17 00:00:00 2001 From: Datong Sun Date: Tue, 7 Dec 2021 00:56:13 -0800 Subject: [PATCH] chore(*) use `tokio-tun` v0.5 instead of forked version. Bumped `fake-tcp` to `v0.2.3` --- fake-tcp/Cargo.toml | 4 ++-- fake-tcp/src/lib.rs | 1 - phantun/Cargo.toml | 4 ++-- phantun/src/bin/client.rs | 2 -- phantun/src/bin/server.rs | 2 -- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 2821676..eb48835 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fake-tcp" -version = "0.2.2" +version = "0.2.3" edition = "2021" authors = ["Datong Sun "] license = "MIT OR Apache-2.0" @@ -21,4 +21,4 @@ tokio = { version = "1.14", features = ["full"] } rand = { version = "0.8", features = ["small_rng"] } log = "0.4" internet-checksum = "0.2" -dndx-fork-tokio-tun = "0.4" +tokio-tun = "0.5" diff --git a/fake-tcp/src/lib.rs b/fake-tcp/src/lib.rs index 6874eee..274c932 100644 --- a/fake-tcp/src/lib.rs +++ b/fake-tcp/src/lib.rs @@ -1,7 +1,6 @@ #![cfg_attr(feature = "benchmark", feature(test))] pub mod packet; -extern crate dndx_fork_tokio_tun as tokio_tun; use bytes::{Bytes, BytesMut}; use log::{error, info, trace, warn}; diff --git a/phantun/Cargo.toml b/phantun/Cargo.toml index 84e2153..a2506dd 100644 --- a/phantun/Cargo.toml +++ b/phantun/Cargo.toml @@ -13,9 +13,9 @@ Layer 3 & Layer 4 (NAPT) firewalls/NATs. [dependencies] clap = "2.34" socket2 = { version = "0.4", features = ["all"] } -fake-tcp = "0.2.2" +fake-tcp = "0.2" tokio = { version = "1.14", features = ["full"] } log = "0.4" pretty_env_logger = "0.4" -dndx-fork-tokio-tun = "0.4" +tokio-tun = "0.5" num_cpus = "1.13" diff --git a/phantun/src/bin/client.rs b/phantun/src/bin/client.rs index ac10883..4b1060d 100644 --- a/phantun/src/bin/client.rs +++ b/phantun/src/bin/client.rs @@ -1,5 +1,3 @@ -extern crate dndx_fork_tokio_tun as tokio_tun; - use clap::{crate_version, App, Arg}; use fake_tcp::packet::MAX_PACKET_LEN; use fake_tcp::{Socket, Stack}; diff --git a/phantun/src/bin/server.rs b/phantun/src/bin/server.rs index 1d2b4d3..70267dd 100644 --- a/phantun/src/bin/server.rs +++ b/phantun/src/bin/server.rs @@ -1,5 +1,3 @@ -extern crate dndx_fork_tokio_tun as tokio_tun; - use clap::{crate_version, App, Arg}; use fake_tcp::packet::MAX_PACKET_LEN; use fake_tcp::Stack;