Fix "Old Style VLA" build warnings

[vpp.git] / src / vat / api_format.c

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index b87ec93..8be83ba 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -11460,6 +11460,7 @@ api_classify_add_del_table (vat_main_t * vam)
   mp->miss_next_index = ntohl (miss_next_index);
   mp->current_data_flag = ntohl (current_data_flag);
   mp->current_data_offset = ntohl (current_data_offset);
+  mp->mask_len = ntohl (vec_len (mask));
   clib_memcpy (mp->mask, mask, vec_len (mask));
 
   vec_free (mask);
@@ -12011,6 +12012,7 @@ api_classify_add_del_session (vat_main_t * vam)
   mp->advance = ntohl (advance);
   mp->action = action;
   mp->metadata = ntohl (metadata);
+  mp->match_len = ntohl (vec_len (match));
   clib_memcpy (mp->match, match, vec_len (match));
   vec_free (match);
 
@@ -15128,8 +15130,7 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam)
        if (unformat
            (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
        {
-         if (crypto_alg < IPSEC_CRYPTO_ALG_NONE ||
-             crypto_alg >= IPSEC_CRYPTO_N_ALG)
+         if (crypto_alg >= IPSEC_CRYPTO_N_ALG)
            {
              clib_warning ("unsupported crypto-alg: '%U'",
                            format_ipsec_crypto_alg, crypto_alg);
@@ -15142,8 +15143,7 @@ api_ipsec_sad_add_del_entry (vat_main_t * vam)
        if (unformat
            (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
        {
-         if (integ_alg < IPSEC_INTEG_ALG_NONE ||
-             integ_alg >= IPSEC_INTEG_N_ALG)
+         if (integ_alg >= IPSEC_INTEG_N_ALG)
            {
              clib_warning ("unsupported integ-alg: '%U'",
                            format_ipsec_integ_alg, integ_alg);
@@ -15300,8 +15300,7 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam)
        if (unformat
            (i, "crypto_alg %U", unformat_ipsec_crypto_alg, &crypto_alg))
        {
-         if (crypto_alg < IPSEC_CRYPTO_ALG_NONE ||
-             crypto_alg >= IPSEC_CRYPTO_N_ALG)
+         if (crypto_alg >= IPSEC_CRYPTO_N_ALG)
            {
              errmsg ("unsupported crypto-alg: '%U'\n",
                      format_ipsec_crypto_alg, crypto_alg);
@@ -15312,8 +15311,7 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam)
        if (unformat
            (i, "integ_alg %U", unformat_ipsec_integ_alg, &integ_alg))
        {
-         if (integ_alg < IPSEC_INTEG_ALG_NONE ||
-             integ_alg >= IPSEC_INTEG_N_ALG)
+         if (integ_alg >= IPSEC_INTEG_N_ALG)
            {
              errmsg ("unsupported integ-alg: '%U'\n",
                      format_ipsec_integ_alg, integ_alg);
@@ -20148,17 +20146,19 @@ vl_api_ip_fib_details_t_handler (vl_api_ip_fib_details_t * mp)
       if (fp->afi == IP46_TYPE_IP6)
        print (vam->ofp,
               "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-              "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+              "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U, "
+              "next_hop_table %d",
               ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
               fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-              format_ip6_address, fp->next_hop);
+              format_ip6_address, fp->next_hop, ntohl (fp->table_id));
       else if (fp->afi == IP46_TYPE_IP4)
        print (vam->ofp,
               "  weight %d, sw_if_index %d, is_local %d, is_drop %d, "
-              "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U",
+              "is_unreach %d, is_prohitbit %d, afi %d, next_hop %U, "
+              "next_hop_table %d",
               ntohl (fp->weight), ntohl (fp->sw_if_index), fp->is_local,
               fp->is_drop, fp->is_unreach, fp->is_prohibit, fp->afi,
-              format_ip4_address, fp->next_hop);
+              format_ip4_address, fp->next_hop, ntohl (fp->table_id));
       fp++;
     }
 }