Skip to content

Commit

Permalink
vrrp: deal with non-existent IP address
Browse files Browse the repository at this point in the history 
When the IP address did not exist in the parent
interface before, we still went ahead and
attempted to create the networks (which failed).

New modifications, there is a check of whenever
we have an IP address and an ifindex id
we want to add macvlan network information before
trying out any network related activity attached
to it.

The verification is also done during deletion of
an interface Address, where during deletion
 if the parent, if interface is left with no IP
 address, we will automatically remove all the
 network information of all instances attached to
 the Iterface.

Signed-off-by: Paul Wekesa <[email protected]>
  • Loading branch information
@Paul-weqe
Paul-weqe committed Oct 17, 2024
1 parent 33c9165 commit f6ebe26
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 31 deletions.
98 changes: 81 additions & 17 deletions holo-vrrp/src/interface.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use holo_utils::task::Task;
use holo_utils::{Receiver, Sender, UnboundedSender};
use ipnetwork::{IpNetwork, Ipv4Network};
use tokio::sync::mpsc;
use tracing::{debug, debug_span, error_span};
use tracing::{debug, debug_span, error, error_span};

use crate::error::{Error, IoError};
use crate::instance::{Instance, State};
Expand Down Expand Up @@ -117,6 +117,18 @@ pub struct ProtocolInputChannelsRx {
// ===== impl Interface =====

impl Interface {
// lets us know if the interface is ready to create a new VRRP
// instance's network elements.
pub(crate) fn is_ready(&self) -> bool {
if !self.system.ifindex.is_some() {
return false;
}
if self.system.addresses.is_empty() {
return false;
}
true
}

pub(crate) fn start_instance(&mut self, vrid: u8) {
// `mvlan-vrrp{primary-interface-ifindex}{vrid}`
let name = format!("mvlan-vrrp-{}", vrid);
Expand Down Expand Up @@ -195,17 +207,6 @@ impl Interface {
}
}

// in order to update the details being sent in subsequent
// requests, we will update the timer to have the updated timers with the relevant
// information.
pub(crate) fn reset_timer(&mut self, vrid: u8) {
tasks::set_timer(
self,
vrid,
self.tx.protocol_input.master_down_timer_tx.clone(),
);
}

pub(crate) fn delete_instance_virtual_address(
&mut self,
vrid: u8,
Expand All @@ -229,6 +230,13 @@ impl Interface {
}

pub(crate) fn send_vrrp_advert(&self, vrid: u8) {
if !self.is_ready() {
error_span!("send-vrrp").in_scope(|| {
error!(%vrid, "unable to send vrrp advert. Parent interface has no IP address");
});
return;
}

// check for the exists instance...
if let Some(instance) = self.instances.get(&vrid)

Expand All @@ -249,23 +257,79 @@ impl Interface {
if let Some(net) = &instance.mac_vlan.net {
let _ = net.net_tx_packetp.send(msg);
}
} else {
error_span!("send-vrrp").in_scope(|| {
tracing::error!(%vrid, "unable to send vrrp advertisement");
});
}
}

// in order to update the details being sent in subsequent
// requests, we will update the timer to have the updated timers with the relevant
// information.
pub(crate) fn reset_timer(&mut self, vrid: u8) {
// we need to make sure the parent interface
// (self) has a valid IP address before setting any timers
// that require us to be part of a multicast
if self.is_ready() {
tasks::set_timer(
self,
vrid,
self.tx.protocol_input.master_down_timer_tx.clone(),
);
}
}

// creates the MvlanInterfaceNet for the instance of said
// vrid. Must be done here to get some interface specifics.
pub(crate) fn macvlan_create(&mut self, vrid: u8) {
// should always be called after vrification of self.is_ready()
pub(crate) fn net_create(&mut self, vrid: u8) {
let net = MvlanInterfaceNet::new(self, vrid)
.expect("Failed to intialize VRRP tasks");

if let Some(instance) = self.instances.get_mut(&vrid) {
instance.mac_vlan.net = Some(net);
}
}

// removes the Macvlan interface's network from the instance
// where vrid==vrid
pub(crate) fn net_remove(&mut self, vrid: u8) {
if let Some(instance) = self.instances.get_mut(&vrid) {
instance.mac_vlan.net = None;
}
}

// reloads the networks that are in the instance(s) of this Interface
// 'reloads' means we reset the network to their correct state depending on what
// we get from self.is_ready(). This should be called when we have an IP address
// modification (addition / deletion) on either an instance's MacVlan or the
// parent interface.
//
// if `vrid` is None, we will reload all the instances and not a specific vrid.
pub(crate) fn net_reload(&mut self, vrid: Option<u8>) {
let mut vrids: Vec<u8> = vec![];

// collects the vrids. if vrid is None, we collect all the
// vrids
if let Some(vrid) = vrid {
vrids.push(vrid)
} else {
for (vrid, _instance) in &self.instances {
vrids.push(*vrid);
}
}

if self.is_ready() {
// (re-)create all the relevant networks.
for vrid in vrids {
self.net_create(vrid);
self.reset_timer(vrid);
}
} else {
// remove the networks. Will automatically remove the
// timers as they are part of the MacVlanInterface's net
for vrid in vrids {
self.net_remove(vrid);
}
}
}
}

#[async_trait]
Expand Down
36 changes: 22 additions & 14 deletions holo-vrrp/src/southbound/rx.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,22 @@ pub(crate) fn process_iface_update(
}

if let Some(vrid) = target_vrid {
iface.macvlan_create(vrid);
iface.net_reload(Some(vrid));
}
}

pub(crate) fn process_addr_del(iface: &mut Interface, msg: AddressMsg) {
if msg.ifname != iface.name {
return;
if msg.ifname == iface.name {
// remove the address from the addresses of parent interfaces
if let IpNetwork::V4(addr) = msg.addr {
iface.system.addresses.remove(&addr);
iface.net_reload(None);
}
}

// remove the address from the addresses of parent interfaces
if let IpNetwork::V4(addr) = msg.addr {
iface.system.addresses.remove(&addr);
}
let mut target_vrid: Option<u8> = None;

for (vrid, instance) in iface.instances.iter_mut() {
'outer: for (vrid, instance) in iface.instances.iter_mut() {
let name = format!("mvlan-vrrp-{}", vrid);
let mvlan_iface = &mut instance.mac_vlan;

Expand All @@ -73,15 +74,22 @@ pub(crate) fn process_addr_del(iface: &mut Interface, msg: AddressMsg) {
if mvlan_iface.name == name {
if let IpNetwork::V4(addr) = msg.addr {
mvlan_iface.system.addresses.remove(&addr);
target_vrid = Some(*vrid);
break 'outer;
}
}
}

if let Some(vrid) = target_vrid {
iface.net_reload(Some(vrid));
}
}

pub(crate) fn process_addr_add(iface: &mut Interface, msg: AddressMsg) {
if msg.ifname == iface.name {
if let IpNetwork::V4(addr) = msg.addr {
iface.system.addresses.insert(addr);
iface.net_reload(None);
}
}

Expand All @@ -90,21 +98,21 @@ pub(crate) fn process_addr_add(iface: &mut Interface, msg: AddressMsg) {
let mut target_vrid: Option<u8> = None;

// if the interface being updated is one of the macvlans
for (vrid, instance) in iface.instances.iter_mut() {
'outer: for (vrid, instance) in iface.instances.iter_mut() {
let name = format!("mvlan-vrrp-{}", vrid);
let mvlan_iface = &mut instance.mac_vlan;
if mvlan_iface.system.addresses.is_empty() {
target_vrid = Some(*vrid);
}
if mvlan_iface.name == name {
if let IpNetwork::V4(addr) = msg.addr {
mvlan_iface.system.addresses.insert(addr);
target_vrid = Some(*vrid);
break 'outer;
}
}
}

// if the address added was for an instance's macvlan interface
// we reload that sole instance's network configs.
if let Some(vrid) = target_vrid {
iface.macvlan_create(vrid);
iface.reset_timer(vrid);
iface.net_reload(Some(vrid));
}
}

0 comments on commit f6ebe26

Please sign in to comment.