Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c0e908e

Browse files
committedMar 7, 2024··
Merge branch 'routing-update-bitflags'
2 parents f6106bb + da556b2 commit c0e908e

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed
 

‎Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎talpid-routing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ netlink-sys = "0.8.3"
3131
# TODO: The PF socket type isn't released yet
3232
nix = { git = "https://github.com/nix-rust/nix", rev = "b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28", features = ["socket"] }
3333
libc = "0.2"
34-
bitflags = "1.2"
34+
bitflags = "2"
3535
system-configuration = "0.5.1"
3636

3737

‎talpid-routing/src/unix/macos/data.rs

+3
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ impl Interface {
655655
bitflags::bitflags! {
656656
/// All enum values of address flags can be iterated via `flag <<= 1`, starting from 1.
657657
/// See https://www.manpagez.com/man/4/route/.
658+
#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Copy, Clone)]
658659
pub struct AddressFlag: i32 {
659660
/// Destination socket address
660661
const RTA_DST = libc::RTA_DST;
@@ -678,6 +679,7 @@ bitflags::bitflags! {
678679
bitflags::bitflags! {
679680
/// Types of routing messages
680681
/// See https://www.manpagez.com/man/4/route/.
682+
#[derive(Debug)]
681683
pub struct MessageType: i32 {
682684
/// Add Route
683685
const RTM_ADD = libc::RTM_ADD;
@@ -715,6 +717,7 @@ bitflags::bitflags! {
715717

716718
/// Routing message flags
717719
/// See https://www.manpagez.com/man/4/route/.
720+
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
718721
pub struct RouteFlag: i32 {
719722
/// route usable
720723
const RTF_UP = libc::RTF_UP;

0 commit comments

Comments
 (0)
Please sign in to comment.