refactor cont.

holo-rip/src/ripng/network.rs

@@ -89,7 +89,7 @@ impl NetworkVersion for Ripng {
     ) -> std::io::Result<()> {
         #[cfg(not(feature = "testing"))]
         {
-            socket.set_multicast_if_v6(ifindex)
+            socket.set_multicast_ifindex_v6(ifindex)
         }
         #[cfg(feature = "testing")]
         {

holo-rip/src/ripv2/network.rs

@@ -81,7 +81,7 @@ impl NetworkVersion for Ripv2 {
     ) -> std::io::Result<()> {
         #[cfg(not(feature = "testing"))]
         {
-            socket.set_multicast_if_v4(ifindex)
+            socket.set_multicast_ifindex_v4(ifindex)
         }
         #[cfg(feature = "testing")]
         {

holo-utils/src/socket.rs

@@ -98,6 +98,23 @@ pub trait SocketExt: Sized + AsRawFd {
         )
     }
 
+    // Sets the value of the IP_MULTICAST_IF option for this socket.
+    fn set_multicast_ifindex_v4(&self, ifindex: u32) -> Result<()> {
+        let optval = ip_mreqn {
+            imr_multiaddr: libc::in_addr { s_addr: 0 },
+            imr_address: libc::in_addr { s_addr: 0 },
+            imr_ifindex: ifindex as i32,
+        };
+
+        setsockopt(
+            self,
+            libc::IPPROTO_IP,
+            libc::IP_MULTICAST_IF,
+            &optval as *const _ as *const c_void,
+            std::mem::size_of::<ip_mreqn>() as libc::socklen_t,
+        )
+    }
+
     // Sets the value of the IPV6_TCLASS option for this socket.
     fn set_ipv6_tclass(&self, dscp: u8) -> Result<()> {
         let optval = dscp as c_int;
@@ -137,6 +154,19 @@ pub trait SocketExt: Sized + AsRawFd {
         )
     }
 
+    // Sets the value of the IPV6_MULTICAST_IF option for this socket.
+    fn set_multicast_ifindex_v6(&self, ifindex: u32) -> Result<()> {
+        let optval = ifindex as i32;
+
+        setsockopt(
+            self,
+            libc::IPPROTO_IPV6,
+            libc::IPV6_MULTICAST_IF,
+            &optval as *const _ as *const c_void,
+            std::mem::size_of::<i32>() as libc::socklen_t,
+        )
+    }
+
     // Executes an operation of the PACKET_ADD_MEMBERSHIP type.
     fn join_packet_multicast(&self, addr: [u8; 6], ifindex: u32) -> Result<()> {
         let mut optval = packet_mreq {
@@ -242,36 +272,6 @@ pub trait UdpSocketExt: SocketExt {
         )
     }
 
-    // Sets the value of the IP_MULTICAST_IF option for this socket.
-    fn set_multicast_if_v4(&self, ifindex: u32) -> Result<()> {
-        let optval = ip_mreqn {
-            imr_multiaddr: libc::in_addr { s_addr: 0 },
-            imr_address: libc::in_addr { s_addr: 0 },
-            imr_ifindex: ifindex as i32,
-        };
-
-        setsockopt(
-            self,
-            libc::IPPROTO_IP,
-            libc::IP_MULTICAST_IF,
-            &optval as *const _ as *const c_void,
-            std::mem::size_of::<ip_mreqn>() as libc::socklen_t,
-        )
-    }
-
-    // Sets the value of the IPV6_MULTICAST_IF option for this socket.
-    fn set_multicast_if_v6(&self, ifindex: u32) -> Result<()> {
-        let optval = ifindex as i32;
-
-        setsockopt(
-            self,
-            libc::IPPROTO_IPV6,
-            libc::IPV6_MULTICAST_IF,
-            &optval as *const _ as *const c_void,
-            std::mem::size_of::<i32>() as libc::socklen_t,
-        )
-    }
-
     // Sets the value of the IPV6_MULTICAST_HOPS option for this socket.
     fn set_ipv6_multicast_hopcount(&self, hopcount: u8) -> Result<()> {
         let optval = hopcount as c_int;

holo-vrrp/src/consts.rs

@@ -27,10 +27,6 @@ pub const VRRP_MULTICAST_ADDRESS: Ipv4Addr = Ipv4Addr::new(224, 0, 0, 18);
 // number of virtual IP addresses that can be on a VRRP header.
 pub const VRRP_IP_COUNT_MAX: usize = 20;
 
-// ==== ARP ====
-
-pub const ARP_PROTOCOL_NUMBER: u16 = 0x0806;
-
 // ==== IP ====
 
 pub const IP_HDR_MIN: usize = 20;

holo-vrrp/src/debug.rs

@@ -20,7 +20,7 @@ pub enum Debug<'a> {
     // Instances
     InstanceCreate(u8),
     InstanceDelete(u8),
-    InstanceStateChange(u8, fsm::State, fsm::State),
+    InstanceStateChange(u8, fsm::Event, fsm::State, fsm::State),
     // Network
     PacketRx(&'a Ipv4Addr, &'a VrrpHdr),
     PacketTx(&'a VrrpHdr),
@@ -37,9 +37,9 @@ impl Debug<'_> {
                 // Parent span(s): vrrp
                 debug!(%vrid, "{}", self);
             }
-            Debug::InstanceStateChange(vrid, old_state, new_state) => {
+            Debug::InstanceStateChange(vrid, event, old_state, new_state) => {
                 // Parent span(s): vrrp
-                debug!(%vrid, ?old_state, ?new_state, "{}", self);
+                debug!(%vrid, ?event, ?old_state, ?new_state, "{}", self);
             }
             Debug::PacketRx(src, packet) => {
                 // Parent span(s): vrrp

holo-vrrp/src/error.rs

@@ -10,16 +10,14 @@
 use std::fmt::Debug;
 use std::net::{IpAddr, Ipv4Addr};
 
-use tracing::warn;
+use tracing::{error, warn};
 
 use crate::packet::DecodeError;
 
 // VRRP errors.
 #[derive(Debug)]
 pub enum Error {
-    // I/O errors
-    IoError(IoError),
-    // Packet input
+    InstanceStartError(u8, IoError),
     GlobalError(Ipv4Addr, GlobalError),
     VirtualRouterError(Ipv4Addr, VirtualRouterError),
 }
@@ -57,8 +55,8 @@ pub enum VirtualRouterError {
 impl Error {
     pub(crate) fn log(&self) {
         match self {
-            Error::IoError(error) => {
-                error.log();
+            Error::InstanceStartError(vrid, error) => {
+                error!(%vrid, error = %with_source(error), "{}", self);
             }
             Error::GlobalError(source, error) => {
                 warn!(?source, %error, "{}", self);
@@ -73,7 +71,9 @@ impl Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Error::IoError(error) => std::fmt::Display::fmt(error, f),
+            Error::InstanceStartError(..) => {
+                write!(f, "failed to start VRRP instance")
+            }
             Error::GlobalError(_, error) => std::fmt::Display::fmt(error, f),
             Error::VirtualRouterError(_, error) => {
                 std::fmt::Display::fmt(error, f)
@@ -85,19 +85,13 @@ impl std::fmt::Display for Error {
 impl std::error::Error for Error {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self {
-            Error::IoError(error) => Some(error),
+            Error::InstanceStartError(_, error) => Some(error),
             Error::GlobalError(_, error) => Some(error),
             Error::VirtualRouterError(_, error) => Some(error),
         }
     }
 }
 
-impl From<IoError> for Error {
-    fn from(error: IoError) -> Error {
-        Error::IoError(error)
-    }
-}
-
 impl From<(Ipv4Addr, DecodeError)> for Error {
     fn from((src, error): (Ipv4Addr, DecodeError)) -> Error {
         match error {

holo-vrrp/src/events.rs

@@ -116,6 +116,7 @@ pub(crate) fn process_vrrp_packet(
                 instance.change_state(
                     &interface,
                     fsm::State::Backup,
+                    fsm::Event::HigherPriorityBackup,
                     MasterReason::NotMaster,
                 );
             }
@@ -141,12 +142,12 @@ pub(crate) fn handle_master_down_timer(
     };
 
     // RFC 3768: Section 6.4.2 ("If the Master_Down_timer fires")
-    instance.state.last_event = fsm::Event::MasterTimeout;
     instance.send_vrrp_advertisement(src_ip);
     instance.send_gratuitous_arp();
     instance.change_state(
         &interface,
         fsm::State::Master,
+        fsm::Event::MasterTimeout,
         MasterReason::NoResponse,
     );