gbp: refactor policy nodes

[vpp.git] / src / plugins / gbp / gbp_policy.c

diff --git a/src/plugins/gbp/gbp_policy.c b/src/plugins/gbp/gbp_policy.c
index fbdf394..21e4bdb 100644 (file)
--- a/src/plugins/gbp/gbp_policy.c
+++ b/src/plugins/gbp/gbp_policy.c
@@ -14,31 +14,54 @@
  */
 
 #include <plugins/gbp/gbp.h>
-#include <plugins/gbp/gbp_policy_dpo.h>
+#include <plugins/gbp/gbp_policy.h>
+#include <vnet/vxlan-gbp/vxlan_gbp_packet.h>
 
 gbp_policy_main_t gbp_policy_main;
 
+/* packet trace format function */
+u8 *
+format_gbp_policy_trace (u8 * s, va_list * args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  gbp_policy_trace_t *t = va_arg (*args, gbp_policy_trace_t *);
+
+  s =
+    format (s, "scope:%d sclass:%d, dclass:%d, allowed:%d flags:%U", t->scope,
+           t->sclass, t->dclass, t->allowed, format_vxlan_gbp_header_gpflags,
+           t->flags);
+
+  return s;
+}
+
 static clib_error_t *
 gbp_policy_init (vlib_main_t * vm)
 {
   gbp_policy_main_t *gpm = &gbp_policy_main;
   clib_error_t *error = 0;
 
-  vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "gbp-policy-port");
-
   /* Initialize the feature next-node indexes */
+  vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "gbp-policy-port");
   feat_bitmap_init_next_nodes (vm,
                               node->index,
                               L2OUTPUT_N_FEAT,
                               l2output_get_feat_names (),
-                              gpm->l2_output_feat_next[1]);
+                              gpm->l2_output_feat_next[GBP_POLICY_PORT]);
 
   node = vlib_get_node_by_name (vm, (u8 *) "gbp-policy-mac");
   feat_bitmap_init_next_nodes (vm,
                               node->index,
                               L2OUTPUT_N_FEAT,
                               l2output_get_feat_names (),
-                              gpm->l2_output_feat_next[0]);
+                              gpm->l2_output_feat_next[GBP_POLICY_MAC]);
+
+  node = vlib_get_node_by_name (vm, (u8 *) "gbp-policy-lpm");
+  feat_bitmap_init_next_nodes (vm,
+                              node->index,
+                              L2OUTPUT_N_FEAT,
+                              l2output_get_feat_names (),
+                              gpm->l2_output_feat_next[GBP_POLICY_LPM]);
 
   return error;
 }