Make Reliability negotiation stricter

eclipse-zenoh · Sep 5, 2024 · 69a38eb · 69a38eb
1 parent 34871cc
commit 69a38eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/commons/zenoh-protocol/src/core/mod.rs b/commons/zenoh-protocol/src/core/mod.rs
@@ -408,14 +408,6 @@ pub enum Reliability {
 impl Reliability {
     pub const DEFAULT: Self = Self::BestEffort;
 
-    /// Returns `true` is `self` implies `other`.
-    pub fn implies(self, other: Self) -> bool {
-        !matches!(
-            (self, other),
-            (Reliability::Reliable, Reliability::BestEffort)
-        )
-    }
-
     #[cfg(feature = "test")]
     pub fn rand() -> Self {
         use rand::Rng;

diff --git a/io/zenoh-transport/src/unicast/establishment/ext/qos.rs b/io/zenoh-transport/src/unicast/establishment/ext/qos.rs
@@ -314,11 +314,11 @@ impl<'a> OpenFsm for &'a QoSFsm<'a> {
         let reliability = match (self_reliability, other_reliability) {
             (None, reliability) | (reliability, None) => reliability,
             (Some(self_reliability), Some(other_reliability)) => {
-                if other_reliability.implies(self_reliability) {
+                if self_reliability == other_reliability {
                     Some(self_reliability)
                 } else {
                     return Err(zerror!(
-                        "The Reliability received in InitAck cannot be substituted with my Reliability"
+                        "The Reliability received in InitAck doesn't match my Reliability"
                     )
                     .into());
                 }
@@ -398,11 +398,11 @@ impl<'a> AcceptFsm for &'a QoSFsm<'a> {
         let reliability = match (self_reliability, other_reliability) {
             (None, reliability) | (reliability, None) => reliability,
             (Some(self_reliability), Some(other_reliability)) => {
-                if self_reliability.implies(other_reliability) {
+                if self_reliability == other_reliability {
                     Some(other_reliability)
                 } else {
                     return Err(zerror!(
-                        "The Reliability received in InitSyn cannot be substituted for my Reliability"
+                        "The Reliability received in InitSyn doesn't match my Reliability"
                     )
                     .into());
                 }