ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: refactor calc_checksums

Browse Source 
Merge two mildly incompatible static inlines, and rename the results
vnet_calc_checksums_inline (...).

The resulting inline has three additional parameters: int is_ip4, int
is_ip6, and int with_gso. All calls manage to pass one or more as
compile-time constants, which causes a certain amount of code to
disappear in each instantiation.

Type: refactor
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I1a2a0e353b9a7bca20bc81318e8c915617261e1a
This commit is contained in:
Dave Barach
2020-04-12 08:31:39 -04:00
committed by Dave Barach
parent 69eeadc03f
commit 1bd2c019eb
5 changed files with 64 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/vnet/interface_output.h
View File

@ -41,24 +41,37 @@
#define __INTERFACE_INLINES_H__
#include <vnet/vnet.h>
#include <vnet/gso/gso.h>
static_always_inline void
calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
vnet_calc_checksums_inline (vlib_main_t * vm, vlib_buffer_t * b,
int is_ip4, int is_ip6, int with_gso)
{
ip4_header_t *ip4;
ip6_header_t *ip6;
tcp_header_t *th;
udp_header_t *uh;
int is_ip4 = (b->flags & VNET_BUFFER_F_IS_IP4) != 0;
int is_ip6 = (b->flags & VNET_BUFFER_F_IS_IP6) != 0;
ASSERT (!(is_ip4 && is_ip6));
ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
if (with_gso)
{
gso_header_offset_t gho;
gho = vnet_gso_header_offset_parser (b, is_ip6);
ip4 = (ip4_header_t *)
(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
ip6 = (ip6_header_t *)
(vlib_buffer_get_current (b) + gho.l3_hdr_offset);
th = (tcp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
uh = (udp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
}
else
{
ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
}
if (is_ip4)
{