vcl: add read/write udp support

[vpp.git] / src / vnet / fib / fib_test.c

diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
index 56e885c..112709e 100644 (file)
--- a/src/vnet/fib/fib_test.c
+++ b/src/vnet/fib/fib_test.c
@@ -526,11 +526,11 @@ fib_test_validate_lb_v (const load_balance_t *lb,
            }
            break;
        case FT_LB_ADJ:
-           FIB_TEST_I(((DPO_ADJACENCY == dpo->dpoi_type) ||
-                       (DPO_ADJACENCY_INCOMPLETE == dpo->dpoi_type)),
-                      "bucket %d stacks on %U",
-                      bucket,
-                      format_dpo_type, dpo->dpoi_type);
+           res = FIB_TEST_I(((DPO_ADJACENCY == dpo->dpoi_type) ||
+                              (DPO_ADJACENCY_INCOMPLETE == dpo->dpoi_type)),
+                             "bucket %d stacks on %U",
+                             bucket,
+                             format_dpo_type, dpo->dpoi_type);
            FIB_TEST_LB((exp->adj.adj == dpo->dpoi_index),
                        "bucket %d stacks on adj %d",
                        bucket,
@@ -540,7 +540,7 @@ fib_test_validate_lb_v (const load_balance_t *lb,
         {
             const mpls_disp_dpo_t *mdd;
 
-            FIB_TEST_I((DPO_MPLS_DISPOSITION_PIPE == dpo->dpoi_type),
+            res = FIB_TEST_I((DPO_MPLS_DISPOSITION_PIPE == dpo->dpoi_type),
                       "bucket %d stacks on %U",
                       bucket,
                       format_dpo_type, dpo->dpoi_type);
@@ -549,11 +549,11 @@ fib_test_validate_lb_v (const load_balance_t *lb,
 
             dpo = &mdd->mdd_dpo;
 
-           FIB_TEST_I(((DPO_ADJACENCY == dpo->dpoi_type) ||
-                       (DPO_ADJACENCY_INCOMPLETE == dpo->dpoi_type)),
-                      "bucket %d stacks on %U",
-                      bucket,
-                      format_dpo_type, dpo->dpoi_type);
+           res = FIB_TEST_I(((DPO_ADJACENCY == dpo->dpoi_type) ||
+                              (DPO_ADJACENCY_INCOMPLETE == dpo->dpoi_type)),
+                            "bucket %d stacks on %U",
+                             bucket,
+                             format_dpo_type, dpo->dpoi_type);
            FIB_TEST_LB((exp->adj.adj == dpo->dpoi_index),
                        "bucket %d stacks on adj %d",
                        bucket,
@@ -561,30 +561,30 @@ fib_test_validate_lb_v (const load_balance_t *lb,
            break;
         }
        case FT_LB_INTF:
-           FIB_TEST_I((DPO_INTERFACE_RX == dpo->dpoi_type),
-                      "bucket %d stacks on %U",
-                      bucket,
-                      format_dpo_type, dpo->dpoi_type);
+           res = FIB_TEST_I((DPO_INTERFACE_RX == dpo->dpoi_type),
+                             "bucket %d stacks on %U",
+                             bucket,
+                             format_dpo_type, dpo->dpoi_type);
            FIB_TEST_LB((exp->adj.adj == dpo->dpoi_index),
                        "bucket %d stacks on adj %d",
                        bucket,
                        exp->adj.adj);
            break;
        case FT_LB_L2:
-           FIB_TEST_I((DPO_DVR == dpo->dpoi_type),
-                      "bucket %d stacks on %U",
-                      bucket,
-                      format_dpo_type, dpo->dpoi_type);
+           res = FIB_TEST_I((DPO_DVR == dpo->dpoi_type),
+                             "bucket %d stacks on %U",
+                             bucket,
+                             format_dpo_type, dpo->dpoi_type);
            FIB_TEST_LB((exp->adj.adj == dpo->dpoi_index),
                        "bucket %d stacks on adj %d",
                        bucket,
                        exp->adj.adj);
            break;
        case FT_LB_O_LB:
-           FIB_TEST_I((DPO_LOAD_BALANCE == dpo->dpoi_type),
-                       "bucket %d stacks on %U",
-                       bucket,
-                       format_dpo_type, dpo->dpoi_type);
+           res = FIB_TEST_I((DPO_LOAD_BALANCE == dpo->dpoi_type),
+                             "bucket %d stacks on %U",
+                             bucket,
+                             format_dpo_type, dpo->dpoi_type);
             FIB_TEST_LB((exp->lb.lb == dpo->dpoi_index),
                         "bucket %d stacks on lb %d not %d",
                         bucket,
@@ -665,7 +665,7 @@ fib_test_validate_entry (fib_node_index_t fei,
                          ...)
 {
     dpo_id_t dpo = DPO_INVALID;
-    fib_prefix_t pfx;
+    const fib_prefix_t *pfx;
     index_t fw_lbi;
     u32 fib_index;
     va_list ap;
@@ -674,7 +674,7 @@ fib_test_validate_entry (fib_node_index_t fei,
     va_start(ap, n_buckets);
 
     res = 0;
-    fib_entry_get_prefix(fei, &pfx);
+    pfx = fib_entry_get_prefix(fei);
     fib_index = fib_entry_get_fib_index(fei);
     fib_entry_contribute_forwarding(fei, fct, &dpo);
 
@@ -691,7 +691,7 @@ fib_test_validate_entry (fib_node_index_t fei,
 
         FIB_TEST_LB((DPO_LOAD_BALANCE == dpo.dpoi_type),
                     "%U Entry links to %U",
-                    format_fib_prefix, &pfx,
+                    format_fib_prefix, pfx,
                     format_dpo_type, dpo.dpoi_type);
 
         lb = load_balance_get(dpo.dpoi_index);
@@ -703,13 +703,13 @@ fib_test_validate_entry (fib_node_index_t fei,
          */
         if (fct == fib_entry_get_default_chain_type(fib_entry_get(fei)))
         {
-            switch (pfx.fp_proto)
+            switch (pfx->fp_proto)
             {
             case FIB_PROTOCOL_IP4:
-                fw_lbi = ip4_fib_forwarding_lookup(fib_index, &pfx.fp_addr.ip4);
+                fw_lbi = ip4_fib_forwarding_lookup(fib_index, &pfx->fp_addr.ip4);
                 break;
             case FIB_PROTOCOL_IP6:
-                fw_lbi = ip6_fib_table_fwding_lookup(&ip6_main, fib_index, &pfx.fp_addr.ip6);
+                fw_lbi = ip6_fib_table_fwding_lookup(&ip6_main, fib_index, &pfx->fp_addr.ip6);
                 break;
             case FIB_PROTOCOL_MPLS:
                 {
@@ -717,8 +717,8 @@ fib_test_validate_entry (fib_node_index_t fei,
                         .label_exp_s_ttl = 0,
                     };
 
-                    vnet_mpls_uc_set_label(&hdr.label_exp_s_ttl, pfx.fp_label);
-                    vnet_mpls_uc_set_s(&hdr.label_exp_s_ttl, pfx.fp_eos);
+                    vnet_mpls_uc_set_label(&hdr.label_exp_s_ttl, pfx->fp_label);
+                    vnet_mpls_uc_set_s(&hdr.label_exp_s_ttl, pfx->fp_eos);
                     hdr.label_exp_s_ttl = clib_host_to_net_u32(hdr.label_exp_s_ttl);
 
                     fw_lbi = mpls_fib_table_forwarding_lookup(fib_index, &hdr);
@@ -851,9 +851,6 @@ fib_test_v4 (void)
     /*
      * if the IGMP plugin is loaded this adds two more entries to the v4 MFIB
      */
-    if (vlib_get_plugin_symbol("igmp_plugin.so", "igmp_listen"))
-        PNBR += 2;
-
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNBR == fib_path_list_pool_size()), "path list pool size is %d",
              fib_path_list_pool_size());
@@ -4375,9 +4372,6 @@ fib_test_v6 (void)
     /*
      * if the IGMP plugin is loaded this adds two more entries to the v4 MFIB
      */
-    if (vlib_get_plugin_symbol("igmp_plugin.so", "igmp_listen"))
-        PNPS += 2;
-
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB is empty");
     FIB_TEST((PNPS == fib_path_list_pool_size()), "path list pool size is %d",
              fib_path_list_pool_size());
@@ -8204,7 +8198,7 @@ fib_test_bfd (void)
     /*
      * whilst the BFD session is not signalled, the adj is up
      */
-    FIB_TEST(adj_is_up(ai_10_10_10_1), "Adj state up on uninit session");
+    FIB_TEST(!adj_is_up(ai_10_10_10_1), "Adj state down on uninit session");
 
     /*
      * bring the BFD session up
@@ -8220,7 +8214,6 @@ fib_test_bfd (void)
     adj_bfd_notify(BFD_LISTEN_EVENT_UPDATE, &bfd_10_10_10_1);
     FIB_TEST(!adj_is_up(ai_10_10_10_1), "Adj state down on DOWN session");
 
-
     /*
      * add an attached next hop FIB entry via the down adj
      */