Fix "show adj nbr" displaying IP4 address for IP6 neighbors

[vpp.git] / vnet / vnet / l2 / l2_classify.h

diff --git a/vnet/vnet/l2/l2_classify.h b/vnet/vnet/l2/l2_classify.h
index 55c2fc8..184187f 100644 (file)
--- a/vnet/vnet/l2/l2_classify.h
+++ b/vnet/vnet/l2/l2_classify.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#ifndef __included_vnet_l2_classify_h__
-#define __included_vnet_l2_classify_h__
+#ifndef __included_vnet_l2_input_classify_h__
+#define __included_vnet_l2_input_classify_h__
 
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
@@ -26,6 +26,7 @@
 #include <vnet/ip/ip6_packet.h>
 #include <vlib/cli.h>
 #include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
 #include <vnet/l2/feat_bitmap.h>
 #include <vppinfra/error.h>
 #include <vppinfra/hash.h>
@@ -33,44 +34,83 @@
 
 #include <vnet/classify/vnet_classify.h>
 
-typedef enum {
-  L2_CLASSIFY_NEXT_DROP,
-  L2_CLASSIFY_NEXT_ETHERNET_INPUT,
-  L2_CLASSIFY_NEXT_IP4_INPUT,
-  L2_CLASSIFY_NEXT_IP6_INPUT,
-  L2_CLASSIFY_NEXT_LI,
-  L2_CLASSIFY_N_NEXT,
-} l2_classify_next_t;
-
-typedef enum {
-  L2_CLASSIFY_TABLE_IP4,
-  L2_CLASSIFY_TABLE_IP6,
-  L2_CLASSIFY_TABLE_OTHER,
-  L2_CLASSIFY_N_TABLES,
-} l2_classify_table_id_t;
-
-typedef struct {
-
-  // Next nodes for each feature
+typedef enum
+{
+  L2_INPUT_CLASSIFY_NEXT_DROP,
+  L2_INPUT_CLASSIFY_NEXT_ETHERNET_INPUT,
+  L2_INPUT_CLASSIFY_NEXT_IP4_INPUT,
+  L2_INPUT_CLASSIFY_NEXT_IP6_INPUT,
+  L2_INPUT_CLASSIFY_NEXT_LI,
+  L2_INPUT_CLASSIFY_N_NEXT,
+} l2_input_classify_next_t;
+
+typedef enum
+{
+  L2_INPUT_CLASSIFY_TABLE_IP4,
+  L2_INPUT_CLASSIFY_TABLE_IP6,
+  L2_INPUT_CLASSIFY_TABLE_OTHER,
+  L2_INPUT_CLASSIFY_N_TABLES,
+} l2_input_classify_table_id_t;
+
+typedef enum
+{
+  L2_OUTPUT_CLASSIFY_NEXT_DROP,
+  L2_OUTPUT_CLASSIFY_N_NEXT,
+} l2_output_classify_next_t;
+
+typedef enum
+{
+  L2_OUTPUT_CLASSIFY_TABLE_IP4,
+  L2_OUTPUT_CLASSIFY_TABLE_IP6,
+  L2_OUTPUT_CLASSIFY_TABLE_OTHER,
+  L2_OUTPUT_CLASSIFY_N_TABLES,
+} l2_output_classify_table_id_t;
+
+typedef struct _l2_classify_main
+{
+  /* Next nodes for each feature */
   u32 feat_next_node_index[32];
 
   /* Per-address-family classifier table vectors */
-  u32 * classify_table_index_by_sw_if_index [L2_CLASSIFY_N_TABLES]; 
+  u32 *classify_table_index_by_sw_if_index[L2_INPUT_CLASSIFY_N_TABLES];
+
+  /* Next nodes for features and output interfaces */
+  l2_output_next_nodes_st next_nodes;
 
   /* convenience variables */
-  vlib_main_t * vlib_main;
-  vnet_main_t * vnet_main;
-  vnet_classify_main_t * vnet_classify_main;
-} l2_classify_main_t;
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+  vnet_classify_main_t *vnet_classify_main;
+} l2_input_classify_main_t;
+
+typedef struct _l2_classify_main l2_output_classify_main_t;
 
-l2_classify_main_t l2_classify_main;
+extern l2_input_classify_main_t l2_input_classify_main;
+extern vlib_node_registration_t l2_input_classify_node;
 
-vlib_node_registration_t l2_classify_node;
+extern l2_output_classify_main_t l2_output_classify_main;
+extern vlib_node_registration_t l2_output_classify_node;
 
-void vnet_l2_classify_enable_disable (u32 sw_if_index,
-                                      int enable_disable);
+void vnet_l2_input_classify_enable_disable (u32 sw_if_index,
+                                           int enable_disable);
 
-int vnet_l2_classify_set_tables (u32 sw_if_index, u32 ip4_table_index, 
-                                 u32 ip6_table_index, u32 other_table_index);
+int vnet_l2_input_classify_set_tables (u32 sw_if_index, u32 ip4_table_index,
+                                      u32 ip6_table_index,
+                                      u32 other_table_index);
 
-#endif /* __included_vnet_l2_classify_h__ */
+void vnet_l2_output_classify_enable_disable (u32 sw_if_index,
+                                            int enable_disable);
+
+int vnet_l2_output_classify_set_tables (u32 sw_if_index, u32 ip4_table_index,
+                                       u32 ip6_table_index,
+                                       u32 other_table_index);
+
+#endif /* __included_vnet_l2_input_classify_h__ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */