mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 20:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
crosvm/net_util/Cargo.toml

41 lines
1 KiB
TOML
Raw Normal View History

net_util: add crate for creating/configuring tap interfaces Signed-off-by: Stephen Barber <smbarber@chromium.org> BUG=chromium:738639 TEST=cargo test Change-Id: Iddf715d40164abeeb6923e8e5a84c02233e0ab64 Reviewed-on: https://chromium-review.googlesource.com/538103 Commit-Ready: Stephen Barber <smbarber@chromium.org> Tested-by: Stephen Barber <smbarber@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
2017-06-16 06:21:15 +00:00
[package]
name = "net_util"
version = "0.1.0"
Fix remaining Chrome/Chromium OS instances These should be written as ChromeOS and ChromiumOS (without the space) to match the updated branding. The copyright headers were already migrated to the new style (https://crrev.com/c/3894243), but there were some more instances left over. BUG=None TEST=tools/cargo-doc Change-Id: I8c76aea2eb33b2e370ab71ee9b5cc0a4cfd00585 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4129934 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2022-12-29 21:24:33 +00:00
authors = ["The ChromiumOS Authors"]
crosvm: migrate to Rust 2021 edition BUG=none TEST=cq Change-Id: I0059c970879b78bfd40b6ce58b10debcf154b50f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3508322 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Anton Romanov <romanton@google.com>
2022-03-08 01:16:09 +00:00
edition = "2021"
net_util: upstream Windows support Adds the libslirp interface code, as well as the Windows pseudo-tap device. BUG=b:213151463 TEST=bots (unix + windows) Change-Id: I975b27a76c82e25037d4061587fec0c31222a159 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598234 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 22:13:12 +00:00
build = 'build.rs'
[features]
guest-to-host-net-loopback = []
slirp = ["libslirp-sys", "pcap-file"]
slirp-debug = ["slirp"]
slirp-ring-capture = ["slirp"]
net_util: add crate for creating/configuring tap interfaces Signed-off-by: Stephen Barber <smbarber@chromium.org> BUG=chromium:738639 TEST=cargo test Change-Id: Iddf715d40164abeeb6923e8e5a84c02233e0ab64 Reviewed-on: https://chromium-review.googlesource.com/538103 Commit-Ready: Stephen Barber <smbarber@chromium.org> Tested-by: Stephen Barber <smbarber@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
2017-06-16 06:21:15 +00:00
[dependencies]
net_util: upstream Windows support Adds the libslirp interface code, as well as the Windows pseudo-tap device. BUG=b:213151463 TEST=bots (unix + windows) Change-Id: I975b27a76c82e25037d4061587fec0c31222a159 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598234 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 22:13:12 +00:00
base = { path = "../base" }
net_util: refactor unix for cross platforming. BUG=b:213151463 TEST=bots Change-Id: I67d43171df084392175261de98c8dc0404a933d6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598233 Reviewed-by: Dennis Kempin <denniskempin@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 01:49:32 +00:00
cfg-if = "1.0.0"
net_util: upstream Windows support Adds the libslirp interface code, as well as the Windows pseudo-tap device. BUG=b:213151463 TEST=bots (unix + windows) Change-Id: I975b27a76c82e25037d4061587fec0c31222a159 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598234 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 22:13:12 +00:00
cros_async = { path = "../cros_async" }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
libc = "0.2"
net_util: upstream Windows support Adds the libslirp interface code, as well as the Windows pseudo-tap device. BUG=b:213151463 TEST=bots (unix + windows) Change-Id: I975b27a76c82e25037d4061587fec0c31222a159 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598234 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 22:13:12 +00:00
pcap-file = { version = "1.1.0", optional = true }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
remain = "0.2"
net_util: refactor unix for cross platforming. BUG=b:213151463 TEST=bots Change-Id: I67d43171df084392175261de98c8dc0404a933d6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598233 Reviewed-by: Dennis Kempin <denniskempin@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 01:49:32 +00:00
serde = { version = "1", features = [ "derive" ] }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
smallvec = "1"
thiserror = "1"
net_util: upstream Windows support Adds the libslirp interface code, as well as the Windows pseudo-tap device. BUG=b:213151463 TEST=bots (unix + windows) Change-Id: I975b27a76c82e25037d4061587fec0c31222a159 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598234 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 22:13:12 +00:00
virtio_sys = { path = "../virtio_sys" }
crosvm: Uprev zerocopy to 0.7.x zerocopy 0.7.x has finally released as a stable version, uprev it to allow some remaining structs to be derivable. TEST=CQ BUG=b:300969352 FIXED=b:300969352 Change-Id: I90f0dfb09494f875fef1cd11bfcbd48030846092 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4878761 Auto-Submit: Zihan Chen <zihanchen@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Zihan Chen <zihanchen@google.com>
2023-09-20 19:11:35 +00:00
zerocopy = { version = "0.7", features = ["derive"] }
net_util: refactor unix for cross platforming. BUG=b:213151463 TEST=bots Change-Id: I67d43171df084392175261de98c8dc0404a933d6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598233 Reviewed-by: Dennis Kempin <denniskempin@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 01:49:32 +00:00
net_util, devices: refactor platform-specific net code The validate_and_configure_tap() and virtio_features_to_tap_offload() functions already effectively did nothing on Windows, since the implementations of these for Slirp were not provided. These functions are moved to sys so the Linux-specific TAP interfaces are no longer needed in TapTCommon. The get_ifreq() function is only called internally inside the implementation of the Linux Tap struct; it does not need to be part of the TapT trait at all. The MacAddress <-> sockaddr interop is only needed on Linux, and the conversion can be moved into the get_mac_address and set_mac_address implementations for Linux. With these changes, net_sys is used only on Linux, so it can be conditionally compiled and not included in non-Linux builds at all. BUG=None TEST=tools/dev_container tools/presubmit Change-Id: I3419a3bdb1470c4d72588fe19e43fabcdfe4e451 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5046598 Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: Noah Gold <nkgold@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2023-11-20 20:53:06 +00:00
[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
net_sys = { path = "../net_sys" }
net_util: upstream Windows support Adds the libslirp interface code, as well as the Windows pseudo-tap device. BUG=b:213151463 TEST=bots (unix + windows) Change-Id: I975b27a76c82e25037d4061587fec0c31222a159 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3598234 Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Noah Gold <nkgold@google.com>
2022-04-20 22:13:12 +00:00
[target.'cfg(windows)'.dependencies]
metrics = { path = "../metrics" }
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
winapi = { version = "0.3", features = ["everything", "std", "impl-default"] }
net_util: Add windows slirp support BUG=b:237011316 TEST=presubmit and tested in wine Change-Id: I1b6160142b8161d4b09d3fd98dfacde354e238b4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3934818 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Vikram Auradkar <auradkar@google.com>
2022-10-04 20:29:10 +00:00
libslirp-sys = { version = "4.2.1", optional = true }
[build-dependencies]
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
anyhow = "1"
net_util: Add windows slirp support BUG=b:237011316 TEST=presubmit and tested in wine Change-Id: I1b6160142b8161d4b09d3fd98dfacde354e238b4 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3934818 Reviewed-by: Dennis Kempin <denniskempin@google.com> Commit-Queue: Vikram Auradkar <auradkar@google.com>
2022-10-04 20:29:10 +00:00
prebuilts = { path = "../prebuilts" }
Add --net option to the crosvm run command Currently, --tap-name, --tap-name, --host-ip...etc commands are all used to create a vhost-user net device. This CL unifies the command line arguments. BUG=b:246224081 TEST=run the following tests: - `cargo test -p devices virtio::net::tests` - `cargo test -p net_util` Change-Id: Ie1342f23f0951e5a81e54547bf725c0d9be19f97 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3893869 Reviewed-by: Alexandre Courbot <acourbot@chromium.org> Commit-Queue: Koki Ryu <kokiryu@chromium.org>
2022-09-12 08:20:06 +00:00
[dev-dependencies]
Cargo.toml: avoid "*" versions for external crates Ensure that every Cargo.toml dependency on a third-party crates.io crate specifies at least a major version, or a minor version for 0.x crates, to ensure that if a new major version is published, it cannot cause API breaks. The versions are selected to match the ones already in Cargo.lock, so this should have no functional change, but it will help prevent new "*" versions from being introduced via copy-and-paste. For rationale, see the Cargo FAQ: <https://doc.rust-lang.org/cargo/faq.html#can-libraries-use--as-a-version-for-their-dependencies> `minijail`, `audio_streams`, and `cras` are left as "*" for now, since they have unusual situations (imported from a submodule and/or replaced at build time with ebuild magic). BUG=None TEST=tools/dev_container tools/presubmit TEST=verify Cargo.lock is unchanged Change-Id: Ifa18199f812f01d2d10bfb4146b3353c1a76527c Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5555656 Reviewed-by: Frederick Mayle <fmayle@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2024-05-21 22:37:42 +00:00
serde_json = "1"
Reference in a new issue Copy permalink