diff options
-rw-r--r-- | Cargo.lock | 59 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | benches/criterion.rs | 2 | ||||
-rw-r--r-- | src/interface/mod.rs | 2 | ||||
-rw-r--r-- | src/ip_packet.rs | 4 | ||||
-rw-r--r-- | src/lib.rs | 2 |
6 files changed, 7 insertions, 64 deletions
@@ -351,11 +351,6 @@ dependencies = [ ] [[package]] -name = "ipnetwork" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "isatty" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -571,37 +566,11 @@ dependencies = [ ] [[package]] -name = "pnet" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_datalink 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_packet 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_transport 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "pnet_base" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "pnet_datalink" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "pnet_macros" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -632,27 +601,6 @@ dependencies = [ ] [[package]] -name = "pnet_sys" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pnet_transport" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_packet 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "quick-error" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1178,7 +1126,7 @@ dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_packet 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "snow 0.1.8-preview (git+https://github.com/mcginty/snow?branch=wireguard)", "socket2 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1286,7 +1234,6 @@ dependencies = [ "checksum handlebars 0.30.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e201959d296716618ef11dfc9e5d244353207f427392b7d28631746ec02392ed" "checksum hex 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "459d3cf58137bb02ad4adeef5036377ff59f066dbb82517b7192e3a5462a2abc" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" -"checksum ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2134e210e2a024b5684f90e1556d5f71a1ce7f8b12e9ac9924c67fb36f63b336" "checksum isatty 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f2a233726c7bb76995cec749d59582e5664823b7245d4970354408f1d79a7a2" "checksum itertools 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b07332223953b5051bceb67e8c4700aa65291535568e1f12408c43c4a42c0394" "checksum itertools-num 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d78fa608383e6e608ba36f962ac991d5d6878d7203eb93b4711b14fa6717813" @@ -1313,14 +1260,10 @@ dependencies = [ "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" "checksum pest 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "47cb1554f1f0efadbd7196e99f19a11b975d10813a2cb26e8034ce5e7286cb34" "checksum pest_derive 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "be11c37fe199edc626e97f27136f7f357b40cc36b63762d99c13448a7bd2df34" -"checksum pnet 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e866218222e997f8aeebbbda7761d29c3b75772573e65da68fff97c21c5754ad" "checksum pnet_base 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ef91690b568c732663a6b4ccaf6e14fb62b985c9edee933c32c42d55f05a7b5" -"checksum pnet_datalink 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf82511ad5ea82f6d632a624edf7c60592271a1f76ecaeb7a7f2ae55f6e0c38a" "checksum pnet_macros 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60fa5bee262cdfd7cb3871a9b205b2858c262e2e90e48b5e00626f5c0fa32182" "checksum pnet_macros_support 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc4fa05e0ee7d4911bc88f9da16eb0c8f238c5e001f45379e42c2b7cb35e53fc" "checksum pnet_packet 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "081e4b575f26366f33f195281e07a0bde6f2be810f904921887b15a3e82e58e4" -"checksum pnet_sys 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b834fac796acd6a4c66010d7fa14aa34d8a69d780e28aa754a24661d3738df3" -"checksum pnet_transport 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "257eec056138182230f7f3c5dd065848fdfb09c93456adfdb583ec457dd3ed5a" "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" @@ -42,7 +42,7 @@ log = "^0.3" hex = "^0.3" rand = "^0.4" nix = "^0.10" -pnet = "*" +pnet_packet = "^0.20" snow = { git = "https://github.com/mcginty/snow", features = ["ring-accelerated"], branch = "wireguard" } socket2 = "^0.3" subtle = "^0.5" diff --git a/benches/criterion.rs b/benches/criterion.rs index b36b330..37d95fd 100644 --- a/benches/criterion.rs +++ b/benches/criterion.rs @@ -12,7 +12,7 @@ use wireguard::noise; use x25519_dalek::{generate_secret, generate_public}; use rand::OsRng; use std::time::Duration; -use pnet::packet::{Packet, ipv4::MutableIpv4Packet}; +use pnet_packet::{Packet, ipv4::MutableIpv4Packet}; struct Keypair { pub private: [u8; 32], diff --git a/src/interface/mod.rs b/src/interface/mod.rs index d9f078f..22720e5 100644 --- a/src/interface/mod.rs +++ b/src/interface/mod.rs @@ -16,7 +16,7 @@ use std::collections::HashMap; use types::{InterfaceInfo}; use x25519_dalek as x25519; -use pnet::packet::ipv4::Ipv4Packet; +use pnet_packet::ipv4::Ipv4Packet; use futures::{Future, Stream, Sink, future, unsync, sync, stream}; use tokio_core::reactor::Core; diff --git a/src/ip_packet.rs b/src/ip_packet.rs index ad67f3f..1f73888 100644 --- a/src/ip_packet.rs +++ b/src/ip_packet.rs @@ -1,5 +1,5 @@ -use pnet::packet::ipv4::Ipv4Packet; -use pnet::packet::ipv6::Ipv6Packet; +use pnet_packet::ipv4::Ipv4Packet; +use pnet_packet::ipv6::Ipv6Packet; use std::net::IpAddr; pub enum IpPacket<'a> { @@ -19,7 +19,7 @@ extern crate env_logger; extern crate futures; extern crate hex; extern crate nix; -extern crate pnet; +extern crate pnet_packet; extern crate rand; extern crate snow; extern crate socket2; |