IPSEC-GRE: fixes and API update to common types.

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

diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c
index 98be872..ee332f3 100644 (file)
--- a/src/vnet/interface_format.c
+++ b/src/vnet/interface_format.c
@@ -39,6 +39,8 @@
 
 #include <vnet/vnet.h>
 #include <vppinfra/bitmap.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/l2_output.h>
 
 u8 *
 format_vnet_sw_interface_flags (u8 * s, va_list * args)
@@ -463,6 +465,12 @@ format_vnet_buffer_opaque (u8 * s, va_list * args)
              (u32) (o->l2.bd_age));
   vec_add1 (s, '\n');
 
+  s = format (s,
+             "l2.feature_bitmap_input: %U, L2.feature_bitmap_output: %U",
+             format_l2_input_features, o->l2.feature_bitmap, 0,
+             format_l2_output_features, o->l2.feature_bitmap, 0);
+  vec_add1 (s, '\n');
+
   s = format (s,
              "l2t.next_index: %d, l2t.session_index: %d",
              (u32) (o->l2t.next_index), o->l2t.session_index);
@@ -478,9 +486,7 @@ format_vnet_buffer_opaque (u8 * s, va_list * args)
   s = format (s, "policer.index: %d", o->policer.index);
   vec_add1 (s, '\n');
 
-  s = format (s,
-             "ipsec.flags: 0x%x, ipsec.sad_index: %d",
-             o->ipsec.flags, o->ipsec.sad_index);
+  s = format (s, "ipsec.sad_index: %d", o->ipsec.sad_index);
   vec_add1 (s, '\n');
 
   s = format (s, "map.mtu: %d", (u32) (o->map.mtu));
@@ -570,8 +576,8 @@ format_vnet_buffer_opaque2 (u8 * s, va_list * args)
   s = format (s, "loop_counter: %d", o->loop_counter);
   vec_add1 (s, '\n');
 
-  s = format (s, "gbp.flags: %x, gbp.src_epg: %d",
-             (u32) (o->gbp.flags), (u32) (o->gbp.src_epg));
+  s = format (s, "gbp.flags: %x, gbp.sclass: %d",
+             (u32) (o->gbp.flags), (u32) (o->gbp.sclass));
   vec_add1 (s, '\n');
 
   s = format (s, "pg_replay_timestamp: %llu", (u32) (o->pg_replay_timestamp));