From: Neale Ranns <nranns@cisco.com>
Date: Tue, 11 Apr 2017 15:56:53 +0000 (-0700)
Subject: MPLS Mcast coverity fixes
X-Git-Tag: v17.07-rc1~333
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9f171f5e20d4f30316626987a3dc66c9730e6d73;hp=f060930e7f71bde107dc8f07c8693e2b3df99c46;p=vpp.git

MPLS Mcast coverity fixes

Change-Id: Ic07ec5d4c2560a414d5f4f7eb37e10faf591664a
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c
index 6c1bd6bd65d..cd7d927879a 100644
--- a/src/vnet/fib/fib_path.c
+++ b/src/vnet/fib/fib_path.c
@@ -778,7 +778,7 @@ fib_path_to_chain_type (const fib_path_t *path)
         }
         else
         {
-            return (FIB_FORW_CHAIN_TYPE_MPLS_EOS);
+            return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
         }
     }
     return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 90a88b1cc0c..98bfd4d1713 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -2253,7 +2253,7 @@ ip6_mcast_midchain (vlib_main_t * vm,
   if (adj_are_counters_enabled ())
     return ip6_rewrite_inline (vm, node, frame, 1, 1, 1);
   else
-    return ip6_rewrite_inline (vm, node, frame, 1, 1, 1);
+    return ip6_rewrite_inline (vm, node, frame, 0, 1, 1);
 }
 
 /* *INDENT-OFF* */
diff --git a/src/vnet/mpls/mpls_tunnel.h b/src/vnet/mpls/mpls_tunnel.h
index 0b55d0dbe3d..ec0729a0f91 100644
--- a/src/vnet/mpls/mpls_tunnel.h
+++ b/src/vnet/mpls/mpls_tunnel.h
@@ -34,7 +34,7 @@ typedef enum mpls_tunnel_attribute_t_
 }
 #define FOR_EACH_MPLS_TUNNEL_ATTRIBUTE(_item)		\
     for (_item = MPLS_TUNNEL_ATTRIBUTE_FIRST;		\
-	 _item < MPLS_TUNNEL_ATTRIBUTE_LAST;		\
+	 _item <= MPLS_TUNNEL_ATTRIBUTE_LAST;		\
 	 _item++)
 
 typedef enum mpls_tunnel_flag_t_ {