External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 11:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: bump pnet from 0.30.0 to 0.31.0

Browse Source 
Bumps [pnet](https://github.com/libpnet/libpnet) from 0.30.0 to 0.31.0.
- [Release notes](https://github.com/libpnet/libpnet/releases)
- [Commits](https://github.com/libpnet/libpnet/compare/v0.30.0...v0.31.0)

---
updated-dependencies:
- dependency-name: pnet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2022-06-03 01:16:58 +00:00
parent 3742cc42ae
commit 9ba6767a90
3 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Cargo.lock generated
View File

@ -396,15 +396,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "ipnetwork"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "ipnetwork" name = "ipnetwork"
version = "0.19.0" version = "0.19.0"
@ -567,6 +558,7 @@ dependencies = [
"log", "log",
"net_gen", "net_gen",
"pnet", "pnet",
"pnet_datalink",
"rate_limiter", "rate_limiter",
"serde", "serde",
"serde_json", "serde_json",
@ -702,34 +694,32 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
[[package]] [[package]]
name = "pnet" name = "pnet"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5cc57672f576f6b95370277fb445738d4887195c6cf4192bdf4f44697e2389b" checksum = "0caaf5b11fd907ff15cf14a4477bfabca4b37ab9e447a4f8dead969a59cdafad"
dependencies = [ dependencies = [
"ipnetwork 0.19.0",
"pnet_base", "pnet_base",
"pnet_datalink", "pnet_datalink",
"pnet_packet", "pnet_packet",
"pnet_sys",
"pnet_transport", "pnet_transport",
] ]
[[package]] [[package]]
name = "pnet_base" name = "pnet_base"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e88341c6c842f89bdc7287f7b1e26b6fa64fa11c7ea3756971e6f18cd2510c4" checksum = "f9d3a993d49e5fd5d4d854d6999d4addca1f72d86c65adf224a36757161c02b6"
dependencies = [ dependencies = [
"no-std-net", "no-std-net",
] ]
[[package]] [[package]]
name = "pnet_datalink" name = "pnet_datalink"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6e55d71c51db73372db35bc54f43abd8460adff1c3a9b717804ca6416d5df2" checksum = "e466faf03a98ad27f6e15cd27a2b7cc89e73e640a43527742977bc503c37f8aa"
dependencies = [ dependencies = [
"ipnetwork 0.18.0", "ipnetwork",
"libc", "libc",
"pnet_base", "pnet_base",
"pnet_sys", "pnet_sys",
@ -738,9 +728,9 @@ dependencies = [
[[package]] [[package]]
name = "pnet_macros" name = "pnet_macros"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebfcdc9c072966723026b3596a1f655fb8bbfe0142f9770f8d481aee4459d6b9" checksum = "48dd52a5211fac27e7acb14cfc9f30ae16ae0e956b7b779c8214c74559cef4c3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -750,18 +740,18 @@ dependencies = [
[[package]] [[package]]
name = "pnet_macros_support" name = "pnet_macros_support"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bba532f5a4b320c029d89e612671fb621851b3b07e972c53850d34130033a5cd" checksum = "89de095dc7739349559913aed1ef6a11e73ceade4897dadc77c5e09de6740750"
dependencies = [ dependencies = [
"pnet_base", "pnet_base",
] ]
[[package]] [[package]]
name = "pnet_packet" name = "pnet_packet"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7009716ac86091c1b6e2cdec95a2b028c880f516054c1ec11edd02f9f463cbde" checksum = "bc3b5111e697c39c8b9795b9fdccbc301ab696699e88b9ea5a4e4628978f495f"
dependencies = [ dependencies = [
"glob", "glob",
"pnet_base", "pnet_base",
@ -771,9 +761,9 @@ dependencies = [
[[package]] [[package]]
name = "pnet_sys" name = "pnet_sys"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e2a05efbc55c22f664c0ea475fbc4ffc4d09346aff9068438279d7e3d431f6f" checksum = "328e231f0add6d247d82421bf3790b4b33b39c8930637f428eef24c4c6a90805"
dependencies = [ dependencies = [
"libc", "libc",
"winapi", "winapi",
@ -781,9 +771,9 @@ dependencies = [
[[package]] [[package]]
name = "pnet_transport" name = "pnet_transport"
version = "0.30.0" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b8ff06f37863f7590183f7044ab2e8d4dae991ecea0c791e3c6dd61ed2913d" checksum = "ff597185e6f1f5671b3122e4dba892a1c73e17c17e723d7669bd9299cbe7f124"
dependencies = [ dependencies = [
"libc", "libc",
"pnet_base", "pnet_base",

3
net_util/Cargo.toml
View File

@ -22,5 +22,6 @@ vmm-sys-util = "0.9.0"
[dev-dependencies] [dev-dependencies]
lazy_static = "1.4.0" lazy_static = "1.4.0"
pnet = "0.30.0" pnet = "0.31.0"
pnet_datalink = "0.31.0"
serde_json = "1.0.81" serde_json = "1.0.81"

22
net_util/src/tap.rs
View File

@ -395,22 +395,20 @@ impl AsRawFd for Tap {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
extern crate pnet;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::str; use std::str;
use std::sync::{mpsc, Mutex}; use std::sync::{mpsc, Mutex};
use std::thread; use std::thread;
use std::time::Duration; use std::time::Duration;
use self::pnet::datalink::Channel::Ethernet; use pnet::packet::ethernet::{EtherTypes, EthernetPacket, MutableEthernetPacket};
use self::pnet::datalink::{self, DataLinkReceiver, DataLinkSender, NetworkInterface}; use pnet::packet::ip::IpNextHeaderProtocols;
use self::pnet::packet::ethernet::{EtherTypes, EthernetPacket, MutableEthernetPacket}; use pnet::packet::ipv4::{Ipv4Packet, MutableIpv4Packet};
use self::pnet::packet::ip::IpNextHeaderProtocols; use pnet::packet::udp::{MutableUdpPacket, UdpPacket};
use self::pnet::packet::ipv4::{Ipv4Packet, MutableIpv4Packet}; use pnet::packet::{MutablePacket, Packet};
use self::pnet::packet::udp::{MutableUdpPacket, UdpPacket}; use pnet::util::MacAddr;
use self::pnet::packet::{MutablePacket, Packet}; use pnet_datalink::Channel::Ethernet;
use self::pnet::util::MacAddr; use pnet_datalink::{DataLinkReceiver, DataLinkSender, NetworkInterface};
use super::*; use super::*;
@ -543,10 +541,10 @@ mod tests {
let interface_name_matches = |iface: &NetworkInterface| iface.name == ifname; let interface_name_matches = |iface: &NetworkInterface| iface.name == ifname;
// Find the network interface with the provided name. // Find the network interface with the provided name.
let interfaces = datalink::interfaces(); let interfaces = pnet_datalink::interfaces();
let interface = interfaces.into_iter().find(interface_name_matches).unwrap(); let interface = interfaces.into_iter().find(interface_name_matches).unwrap();
if let Ok(Ethernet(tx, rx)) = datalink::channel(&interface, Default::default()) { if let Ok(Ethernet(tx, rx)) = pnet_datalink::channel(&interface, Default::default()) {
(interface.mac.unwrap(), tx, rx) (interface.mac.unwrap(), tx, rx)
} else { } else {
panic!("datalink channel error or unhandled channel type"); panic!("datalink channel error or unhandled channel type");