X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbuffer.c;h=545018a79e9109f9658f7a1e7a4f7e50e6e10a79;hb=ae80aba3b070ad12ad4e2d587b6cdf47f0abe6e1;hp=de1c73597e37a0880e050e3160e69a311cc70276;hpb=ce9e0b4d48705d693f4e03093e3f506bdecaf141;p=vpp.git diff --git a/src/vnet/buffer.c b/src/vnet/buffer.c index de1c73597e3..545018a79e9 100644 --- a/src/vnet/buffer.c +++ b/src/vnet/buffer.c @@ -16,6 +16,18 @@ #include #include +u8 * +format_vnet_buffer_offload (u8 *s, va_list *args) +{ + vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *); + +#define _(bit, name, ss, v) \ + if (v && (vnet_buffer (b)->oflags & VNET_BUFFER_OFFLOAD_F_##name)) \ + s = format (s, "%s ", ss); + foreach_vnet_buffer_offload_flag +#undef _ + return s; +} u8 * format_vnet_buffer (u8 * s, va_list * args) @@ -24,12 +36,15 @@ 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); + a = format (a, "%s ", ss); foreach_vnet_buffer_flag #undef _ - if (b->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID) + if (b->flags & VNET_BUFFER_F_OFFLOAD) a = + format (a, "%U ", format_vnet_buffer_offload, b); + + if (b->flags & VNET_BUFFER_F_L2_HDR_OFFSET_VALID) a = format (a, "l2-hdr-offset %d ", vnet_buffer (b)->l2_hdr_offset); if (b->flags & VNET_BUFFER_F_L3_HDR_OFFSET_VALID) @@ -38,6 +53,9 @@ 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); + if (b->flags & VNET_BUFFER_F_GSO) + a = format (a, "gso gso-size %d", vnet_buffer2 (b)->gso_size); + 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); @@ -45,7 +63,7 @@ format_vnet_buffer (u8 * s, va_list * args) 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, b); + 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);