X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.c;h=3cb6b948d2b650ebfd12991a5a2ef0adb56135a2;hb=282872127;hp=38bda8cb6f4bee5aa5733311f0c1c887304a926f;hpb=0b26bd78cfe62897d2926f64b4acc42f961975e7;p=vpp.git diff --git a/src/vnet/buffer.c b/src/vnet/buffer.c index 38bda8cb6f4..3cb6b948d2b 100644 --- a/src/vnet/buffer.c +++ b/src/vnet/buffer.c @@ -24,10 +24,10 @@ format_vnet_buffer (u8 * s, va_list * args) u32 indent = format_get_indent (s); u8 *a = 0; -#define _(bit, name, v) \ +#define _(bit,name,ss,v) \ if (v && (b->flags & VNET_BUFFER_F_##name)) \ - a = format (a, "%s ", v); - foreach_vnet_buffer_field + a = format (a, "%s ", ss); + foreach_vnet_buffer_flag #undef _ if (b->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID) a = format (a, "l2-hdr-offset %d ", vnet_buffer (b)->l2_hdr_offset); @@ -38,7 +38,14 @@ format_vnet_buffer (u8 * s, va_list * args) if (b->flags & VNET_BUFFER_F_L4_HDR_OFFSET_VALID) a = format (a, "l4-hdr-offset %d ", vnet_buffer (b)->l4_hdr_offset); - s = format (s, "%U", format_vlib_buffer, b); + if (b->flags & VNET_BUFFER_F_QOS_DATA_VALID) + a = format (a, "qos %d.%d ", + vnet_buffer2 (b)->qos.bits, vnet_buffer2 (b)->qos.source); + + if (b->flags & VNET_BUFFER_F_LOOP_COUNTER_VALID) + a = format (a, "loop-counter %d ", vnet_buffer2 (b)->loop_counter); + + s = format (s, "%U", format_vlib_buffer_no_chain, b); if (a) s = format (s, "\n%U%v", format_white_space, indent, a); vec_free (a);