From: Filip Varga <fivarga@cisco.com>
Date: Tue, 11 Jun 2019 08:45:21 +0000 (+0200)
Subject: NAT: interface fib fix (VPP-1691)
X-Git-Tag: v19.04.2~21
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=c299470d5ef437ceaed3d010a2d39f7f52e6776c;p=vpp.git

NAT: interface fib fix (VPP-1691)

Change-Id: I2d1e2addb2e440c23c255ac7709169f7909cb0be
Signed-off-by: Filip Varga <fivarga@cisco.com>
---

diff --git a/src/plugins/nat/nat.c b/src/plugins/nat/nat.c
index deed87ece6b..eff81f87daf 100755
--- a/src/plugins/nat/nat.c
+++ b/src/plugins/nat/nat.c
@@ -2168,6 +2168,7 @@ snat_update_outside_fib (u32 sw_if_index, u32 new_fib_index,
   nat_outside_fib_t *outside_fib;
   snat_interface_t *i;
   u8 is_add = 1;
+  u8 match = 0;
 
   if (new_fib_index == old_fib_index)
     return;
@@ -2175,14 +2176,21 @@ snat_update_outside_fib (u32 sw_if_index, u32 new_fib_index,
   if (!vec_len (sm->outside_fibs))
     return;
 
-  pool_foreach (i, sm->interfaces, (
-				     {
-				     if (i->sw_if_index == sw_if_index)
-				     {
-				     if (!(nat_interface_is_outside (i)))
-				     return;}
-				     }
-		));
+  /* *INDENT-OFF* */
+  pool_foreach (i, sm->interfaces,
+    ({
+      if (i->sw_if_index == sw_if_index)
+        {
+          if (!(nat_interface_is_outside (i)))
+	    return;
+          match = 1;
+        }
+    }));
+  /* *INDENT-ON* */
+
+  if (!match)
+    return;
+
   vec_foreach (outside_fib, sm->outside_fibs)
   {
     if (outside_fib->fib_index == old_fib_index)