misc: remove GNU Indent directives

[vpp.git] / src / vnet / dpo / dpo.c

diff --git a/src/vnet/dpo/dpo.c b/src/vnet/dpo/dpo.c
index 19e3714..fc789ae 100644 (file)
--- a/src/vnet/dpo/dpo.c
+++ b/src/vnet/dpo/dpo.c
@@ -16,13 +16,15 @@
  * @brief
  * A Data-Path Object is an object that represents actions that are
  * applied to packets are they are switched through VPP.
- * 
+ *
  * The DPO is a base class that is specialised by other objects to provide
- * concreate actions
+ * concrete actions
  *
  * The VLIB graph nodes are graph of types, the DPO graph is a graph of instances.
  */
 
+// clang-format off
+
 #include <vnet/dpo/dpo.h>
 #include <vnet/ip/lookup.h>
 #include <vnet/ip/format.h>
@@ -43,6 +45,7 @@
 #include <vnet/dpo/dvr_dpo.h>
 #include <vnet/dpo/l3_proxy_dpo.h>
 #include <vnet/dpo/ip6_ll_dpo.h>
+#include <vnet/dpo/pw_cw.h>
 
 /**
  * Array of char* names for the DPO types and protos
@@ -78,7 +81,7 @@ static const char* const * const ** dpo_nodes;
  * the third dimension in dpo_nodes is lost, hence, the edge index from each
  * node MUST be the same.
  * Including both the child and parent protocol is required to support the
- * case where it changes as the grapth is traversed, most notablly when an
+ * case where it changes as the graph is traversed, most notably when an
  * MPLS label is popped.
  *
  * Note that this array is child type specific, not child instance specific.
@@ -86,7 +89,7 @@ static const char* const * const ** dpo_nodes;
 static u32 ****dpo_edges;
 
 /**
- * @brief The DPO type value that can be assigend to the next dynamic
+ * @brief The DPO type value that can be assigned to the next dynamic
  *        type registration.
  */
 static dpo_type_t dpo_dynamic = DPO_LAST;
@@ -261,16 +264,18 @@ void
 dpo_copy (dpo_id_t *dst,
          const dpo_id_t *src)
 {
-    dpo_id_t tmp = *dst;
+    dpo_id_t tmp = {
+        .as_u64 = dst->as_u64
+    };
 
     /*
      * the destination is written in a single u64 write - hence atomically w.r.t
      * any packets inflight.
      */
-    *((u64*)dst) = *(u64*)src; 
+    dst->as_u64 = src->as_u64;
 
     dpo_lock(dst);
-    dpo_unlock(&tmp);    
+    dpo_unlock(&tmp);
 }
 
 int
@@ -278,6 +283,9 @@ dpo_is_adj (const dpo_id_t *dpo)
 {
     return ((dpo->dpoi_type == DPO_ADJACENCY) ||
            (dpo->dpoi_type == DPO_ADJACENCY_INCOMPLETE) ||
+            (dpo->dpoi_type == DPO_ADJACENCY_GLEAN) ||
+            (dpo->dpoi_type == DPO_ADJACENCY_MCAST) ||
+            (dpo->dpoi_type == DPO_ADJACENCY_MCAST_MIDCHAIN) ||
            (dpo->dpoi_type == DPO_ADJACENCY_MIDCHAIN) ||
            (dpo->dpoi_type == DPO_ADJACENCY_GLEAN));
 }
@@ -389,6 +397,18 @@ dpo_get_urpf(const dpo_id_t *dpo)
     return (~0);
 }
 
+u16
+dpo_get_mtu(const dpo_id_t *dpo)
+{
+    if (dpo_id_is_valid(dpo) &&
+        (NULL != dpo_vfts[dpo->dpoi_type].dv_get_mtu))
+    {
+        return (dpo_vfts[dpo->dpoi_type].dv_get_mtu(dpo));
+    }
+
+    return (0xffff);
+}
+
 static u32
 dpo_get_next_node (dpo_type_t child_type,
                    dpo_proto_t child_proto,
@@ -408,7 +428,7 @@ dpo_get_next_node (dpo_type_t child_type,
         parent_proto, ~0);
 
     /*
-     * if the edge index has not yet been created for this node to node transistion
+     * if the edge index has not yet been created for this node to node transition
      */
     if (~0 == dpo_edges[child_type][child_proto][parent_type][parent_proto])
     {
@@ -494,7 +514,7 @@ dpo_stack_i (u32 edge,
     dpo_copy(&tmp, parent);
 
     /*
-     * get the edge index for the parent to child VLIB graph transisition
+     * get the edge index for the parent to child VLIB graph transition
      */
     tmp.dpoi_next_node = edge;
 
@@ -565,6 +585,9 @@ dpo_stack_from_node (u32 child_node_index,
         }
     }
     dpo_stack_i(edge, dpo, parent);
+
+    /* should free this local vector to avoid memory leak */
+    vec_free(parent_indices);
 }
 
 static clib_error_t *
@@ -585,11 +608,15 @@ dpo_module_init (vlib_main_t * vm)
     mpls_disp_dpo_module_init();
     dvr_dpo_module_init();
     l3_proxy_dpo_module_init();
+    pw_cw_dpo_module_init();
 
     return (NULL);
 }
 
-VLIB_INIT_FUNCTION(dpo_module_init);
+VLIB_INIT_FUNCTION(dpo_module_init) =
+{
+    .runs_before = VLIB_INITS ("ip_main_init"),
+};
 
 static clib_error_t *
 dpo_memory_show (vlib_main_t * vm,
@@ -611,7 +638,6 @@ dpo_memory_show (vlib_main_t * vm,
     return (NULL);
 }
 
-/* *INDENT-OFF* */
 /*?
  * The '<em>sh dpo memory </em>' command displays the memory usage for each
  * data-plane object type.
@@ -633,4 +659,5 @@ VLIB_CLI_COMMAND (show_fib_memory, static) = {
     .function = dpo_memory_show,
     .short_help = "show dpo memory",
 };
-/* *INDENT-ON* */
+
+// clang-format on