commit a0a908f1dfb679c384ab34ee3c1a2a63ba2448df
author Neale Ranns <nranns@cisco.com> Tue Aug 01 11:40:03 2017 -0700
committer Florin Coras <florin.coras@gmail.com> Tue Aug 01 21:50:15 2017 +0000
tree 4fe1128725998ecde799c6ec063094ae7791d163
parent 42e6b097e02b80779213aa5c14a5202ecd5913e5

FIB path weight incorrect in dump (VPP-922)

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

src/vnet/mpls/mpls.api

diff --git a/src/vnet/mpls/mpls.api b/src/vnet/mpls/mpls.api
index 61d7fe6..67f1045 100644
--- a/src/vnet/mpls/mpls.api
+++ b/src/vnet/mpls/mpls.api
@@ -112,7 +112,8 @@
 typeonly manual_print manual_endian define fib_path2
 {
   u32 sw_if_index;
-  u32 weight;
+  u8 weight;
+  u8 preference;
   u8 is_local;
   u8 is_drop;
   u8 is_unreach;

src/vnet/mpls/mpls_api.c

diff --git a/src/vnet/mpls/mpls_api.c b/src/vnet/mpls/mpls_api.c
index 22fb7d4..92fb24a 100644
--- a/src/vnet/mpls/mpls_api.c
+++ b/src/vnet/mpls/mpls_api.c
@@ -334,7 +334,8 @@
   {
     memset (fp, 0, sizeof (*fp));
 
-    fp->weight = htonl (api_rpath->rpath.frp_weight);
+    fp->weight = api_rpath->rpath.frp_weight;
+    fp->preference = api_rpath->rpath.frp_preference;
     fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
     copy_fib_next_hop (api_rpath, fp);
     fp++;
@@ -393,7 +394,8 @@
   vec_foreach (api_rpath, api_rpaths)
   {
     memset (fp, 0, sizeof (*fp));
-    fp->weight = htonl (api_rpath->rpath.frp_weight);
+    fp->weight = api_rpath->rpath.frp_weight;
+    fp->preference = api_rpath->rpath.frp_preference;
     fp->sw_if_index = htonl (api_rpath->rpath.frp_sw_if_index);
     copy_fib_next_hop (api_rpath, fp);
     fp++;