fix: makes an AND relation between addr and label filters

Signed-off-by: Shuoran Liu <[email protected]>
iomesh · May 24, 2023 · d797c91 · d797c91
1 parent 658a11d
commit d797c91
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/addr/get.rs b/src/addr/get.rs
@@ -114,11 +114,13 @@ impl AddressFilterBuilder {
             }
 
             if let Some(address) = self.address {
+                let mut is_match: bool = false;
+
                 for nla in msg.nlas.iter() {
                     if let Unspec(x) | Address(x) | Local(x) | Multicast(x)
                     | Anycast(x) = nla
                     {
-                        let is_match = match address {
+                        is_match = match address {
                             IpAddr::V4(address) => {
                                 x[..] == address.octets()[..]
                             }
@@ -127,22 +129,31 @@ impl AddressFilterBuilder {
                             }
                         };
                         if is_match {
-                            return true;
+                            break;
                         }
                     }
                 }
-                return false;
+
+                if !is_match {
+                    return false;
+                }
             }
 
             if let Some(ref label) = self.label {
+                let mut is_match: bool = false;
+
                 for nla in msg.nlas.iter() {
                     if let Label(l) = nla {
                         if label == l {
-                            return true;
+                            is_match = true;
+                            break;
                         }
                     }
                 }
-                return false;
+
+                if !is_match {
+                    return false;
+                }
             }
 
             true