Skip to content

route: allow IPv6 gateway in IPv4 route #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −18
Open

route: allow IPv6 gateway in IPv4 route #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions src/route/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,14 @@ impl RouteMessageBuilder<Ipv4Addr> {
.push(RouteAttribute::Gateway(RouteAddress::Inet(addr)));
self
}

/// Sets the IPv6 gateway (via) address.
pub fn via(mut self, addr: Ipv6Addr) -> Self {
self.message
.attributes
.push(RouteAttribute::Via(RouteVia::Inet6(addr)));
self
}
}

impl Default for RouteMessageBuilder<Ipv4Addr> {
Expand Down Expand Up @@ -403,25 +411,15 @@ impl RouteMessageBuilder<IpAddr> {
mut self,
addr: IpAddr,
) -> Result<Self, InvalidRouteMessage> {
self.set_address_family_from_ip_addr(addr);
match self.message.header.address_family {
AddressFamily::Inet => {
if addr.is_ipv6() {
return Err(InvalidRouteMessage::Gateway(addr));
};
}
AddressFamily::Inet6 => {
if addr.is_ipv4() {
return Err(InvalidRouteMessage::Gateway(addr));
};
}
af => {
return Err(InvalidRouteMessage::AddressFamily(af));
use AddressFamily::*;
let attr = match (self.message.header.address_family, addr) {
(Inet, addr @ IpAddr::V4(_)) | (Inet6, addr @ IpAddr::V6(_)) => {
RouteAttribute::Gateway(addr.into())
}
}
self.message
.attributes
.push(RouteAttribute::Gateway(addr.into()));
(Inet, IpAddr::V6(v6)) => RouteAttribute::Via(RouteVia::Inet6(v6)),
(af, _) => return Err(InvalidRouteMessage::AddressFamily(af)),
};
self.message.attributes.push(attr);
Ok(self)
}

Expand Down