fix following error in debian jessie:

[vpp.git] / src / vpp / api / custom_dump.c

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 44aaf82..70fd714 100644 (file)
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -726,9 +726,6 @@ static void *vl_api_ip_add_del_route_t_print
   if (mp->is_add == 0)
     s = format (s, "del ");
 
-  if (mp->next_hop_sw_if_index != ~0)
-    s = format (s, "sw_if_index %d ", ntohl (mp->next_hop_sw_if_index));
-
   if (mp->is_ipv6)
     s = format (s, "%U/%d ", format_ip6_address, mp->dst_address,
                mp->dst_address_length);
@@ -753,6 +750,9 @@ static void *vl_api_ip_add_del_route_t_print
        s = format (s, "via %U ", format_ip6_address, mp->next_hop_address);
       else
        s = format (s, "via %U ", format_ip4_address, mp->next_hop_address);
+      if (mp->next_hop_sw_if_index != ~0)
+       s = format (s, "sw_if_index %d ", ntohl (mp->next_hop_sw_if_index));
+
     }
 
   if (mp->next_hop_weight != 1)
@@ -766,7 +766,8 @@ static void *vl_api_ip_add_del_route_t_print
 
   if (mp->next_hop_n_out_labels)
     {
-      for (u8 i = 0; i < mp->next_hop_n_out_labels; i++)
+      u8 i;
+      for (i = 0; i < mp->next_hop_n_out_labels; i++)
        {
          s = format (s, "out-label %d ",
                      ntohl (mp->next_hop_out_label_stack[i].label));
@@ -842,7 +843,8 @@ static void *vl_api_mpls_route_add_del_t_print
 
   if (mp->mr_next_hop_n_out_labels)
     {
-      for (u8 i = 0; i < mp->mr_next_hop_n_out_labels; i++)
+      u8 i;
+      for (i = 0; i < mp->mr_next_hop_n_out_labels; i++)
        {
          s = format (s, "out-label %d ",
                      ntohl (mp->mr_next_hop_out_label_stack[i].label));
@@ -959,7 +961,8 @@ static void *vl_api_sr_mpls_policy_add_t_print
 
   if (mp->n_segments)
     {
-      for (int i = 0; i < mp->n_segments; i++)
+      int i;
+      for (i = 0; i < mp->n_segments; i++)
        s = format (s, "next %d ", ntohl (mp->segments[i]));
     }