ospfv3: update interpretation of configured instance ID values

In the last draft of the OSPF YANG module, the "instance-id" leaf had a `"range "0 .. 31"` constraint, implying it was a relative instance ID, and the actual instance ID had to be calculated based on RFC5838's address-family instance ID ranges. In the RFC update, the range was removed, so let's now interpret the configured instance IDs as absolute values. Signed-off-by: Renato Westphal <[email protected]>
holo-routing · May 6, 2023 · 504e1ed · 504e1ed
1 parent 974cb20
commit 504e1ed
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 36 deletions.
diff --git a/holo-ospf/src/events.rs b/holo-ospf/src/events.rs
@@ -169,7 +169,7 @@ where
     }
 
     // OSPFv3: check for Instance ID mismatch.
-    V::validate_packet_instance_id(instance.state.af, iface, packet.hdr())?;
+    V::validate_packet_instance_id(iface, packet.hdr())?;
 
     // Log received packet.
     Debug::<V>::PacketRx(iface, &src, &dst, &packet).log();

diff --git a/holo-ospf/src/interface.rs b/holo-ospf/src/interface.rs
@@ -206,7 +206,6 @@ pub trait InterfaceVersion<V: Version> {
 
     // Validate the Instance ID of the received packet (OSPFv3 only).
     fn validate_packet_instance_id(
-        af: AddressFamily,
         iface: &Interface<V>,
         packet_hdr: &V::PacketHdr,
     ) -> Result<(), Error<V>>;

diff --git a/holo-ospf/src/ospfv2/interface.rs b/holo-ospf/src/ospfv2/interface.rs
@@ -97,7 +97,6 @@ impl InterfaceVersion<Self> for Ospfv2 {
     }
 
     fn validate_packet_instance_id(
-        _af: AddressFamily,
         _iface: &Interface<Self>,
         _packet_hdr: &ospfv2::packet::PacketHdr,
     ) -> Result<(), Error<Self>> {

diff --git a/holo-ospf/src/ospfv2/packet/mod.rs b/holo-ospf/src/ospfv2/packet/mod.rs
@@ -344,7 +344,6 @@ impl PacketHdrVersion<Ospfv2> for PacketHdr {
         pkt_type: PacketType,
         router_id: Ipv4Addr,
         area_id: Ipv4Addr,
-        _af: AddressFamily,
         _instance_id: Option<u8>,
     ) -> Self {
         PacketHdr {

diff --git a/holo-ospf/src/ospfv3/interface.rs b/holo-ospf/src/ospfv3/interface.rs
@@ -55,10 +55,7 @@ impl InterfaceVersion<Self> for Ospfv3 {
             pkt_type: PacketType::Hello,
             router_id: instance.state.router_id,
             area_id: area.area_id,
-            instance_id: PacketHdr::instance_id(
-                instance.state.af,
-                iface.config.instance_id,
-            ),
+            instance_id: iface.config.instance_id.unwrap_or(0),
         };
 
         Packet::Hello(Hello {
@@ -96,13 +93,10 @@ impl InterfaceVersion<Self> for Ospfv3 {
     }
 
     fn validate_packet_instance_id(
-        af: AddressFamily,
         iface: &Interface<Self>,
         packet_hdr: &ospfv3::packet::PacketHdr,
     ) -> Result<(), Error<Self>> {
-        let iface_instance_id =
-            PacketHdr::instance_id(af, iface.config.instance_id);
-
+        let iface_instance_id = iface.config.instance_id.unwrap_or(0);
         if packet_hdr.instance_id != iface_instance_id {
             return Err(Error::InstanceIdMismatch(
                 packet_hdr.instance_id,

diff --git a/holo-ospf/src/ospfv3/packet/mod.rs b/holo-ospf/src/ospfv3/packet/mod.rs
@@ -242,20 +242,6 @@ impl OptionsVersion<Ospfv3> for Options {
 impl PacketHdr {
     pub const VERSION: u8 = 3;
     pub const CHECKSUM_OFFSET: i32 = 12;
-
-    // Calculate the effective interface Instance ID based on the configured
-    // address family and the Instance ID ranges specified by RFC 5838.
-    pub(crate) fn instance_id(
-        af: AddressFamily,
-        instance_id: Option<u8>,
-    ) -> u8 {
-        let base_instance_id = match af {
-            AddressFamily::Ipv4 => 64,
-            AddressFamily::Ipv6 => 0,
-        };
-
-        base_instance_id + instance_id.unwrap_or(0)
-    }
 }
 
 impl PacketHdrVersion<Ospfv3> for PacketHdr {
@@ -350,14 +336,13 @@ impl PacketHdrVersion<Ospfv3> for PacketHdr {
         pkt_type: PacketType,
         router_id: Ipv4Addr,
         area_id: Ipv4Addr,
-        af: AddressFamily,
         instance_id: Option<u8>,
     ) -> Self {
         PacketHdr {
             pkt_type,
             router_id,
             area_id,
-            instance_id: Self::instance_id(af, instance_id),
+            instance_id: instance_id.unwrap_or(0),
         }
     }
 }

diff --git a/holo-ospf/src/output.rs b/holo-ospf/src/output.rs
@@ -66,7 +66,6 @@ pub(crate) fn send_dbdesc<V>(
         PacketType::DbDesc,
         instance.state.router_id,
         area.area_id,
-        instance.state.af,
         iface.config.instance_id,
     );
     let packet = V::PacketDbDesc::generate(
@@ -137,7 +136,6 @@ pub(crate) fn send_lsreq<V>(
         PacketType::LsRequest,
         instance.state.router_id,
         area.area_id,
-        instance.state.af,
         iface.config.instance_id,
     );
     let entries = nbr.lists.ls_request_pending.keys().copied().collect();
@@ -168,7 +166,6 @@ pub(crate) fn rxmt_lsreq<V>(
         PacketType::LsRequest,
         instance.state.router_id,
         area.area_id,
-        instance.state.af,
         iface.config.instance_id,
     );
     let entries = nbr.lists.ls_request_pending.keys().copied().collect();
@@ -239,7 +236,6 @@ pub(crate) fn send_lsupd<V>(
             PacketType::LsUpdate,
             instance.state.router_id,
             area.area_id,
-            instance.state.af,
             iface.config.instance_id,
         );
         let packet = V::PacketLsUpdate::generate(pkt_hdr, lsas);
@@ -297,7 +293,6 @@ pub(crate) fn rxmt_lsupd<V>(
         PacketType::LsUpdate,
         instance.state.router_id,
         area.area_id,
-        instance.state.af,
         iface.config.instance_id,
     );
     let packet = V::PacketLsUpdate::generate(pkt_hdr, lsas);
@@ -327,7 +322,6 @@ pub(crate) fn send_lsack_direct<V>(
         PacketType::LsAck,
         instance.state.router_id,
         area.area_id,
-        instance.state.af,
         iface.config.instance_id,
     );
     let lsa_hdrs = vec![*lsa_hdr];
@@ -373,7 +367,6 @@ pub(crate) fn send_lsack_delayed<V>(
             PacketType::LsAck,
             instance.state.router_id,
             area.area_id,
-            instance.state.af,
             iface.config.instance_id,
         );
         let packet = V::PacketLsAck::generate(pkt_hdr, lsa_hdrs);

diff --git a/holo-ospf/src/packet/mod.rs b/holo-ospf/src/packet/mod.rs
@@ -105,7 +105,6 @@ where
         pkt_type: PacketType,
         router_id: Ipv4Addr,
         area_id: Ipv4Addr,
-        af: AddressFamily,
         instance_id: Option<u8>,
     ) -> Self;
 }