Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: IPSec protection for multi-point tunnel interfaces
[vpp.git]
/
src
/
vnet
/
lisp-cp
/
packets.c
diff --git
a/src/vnet/lisp-cp/packets.c
b/src/vnet/lisp-cp/packets.c
index
a3d6f1c
..
bbc3ad6
100644
(file)
--- a/
src/vnet/lisp-cp/packets.c
+++ b/
src/vnet/lisp-cp/packets.c
@@
-85,7
+85,7
@@
udp_ip6_checksum (ip6_header_t * ip6, udp_header_t * up, u32 len)
} phu;
/* pseudo-header */
} phu;
/* pseudo-header */
- memset (&phu, 0, sizeof (phu));
+
clib_
memset (&phu, 0, sizeof (phu));
phu.ph.ph_src = ip6->src_address;
phu.ph.ph_dst = ip6->dst_address;
phu.ph.ph_len = clib_host_to_net_u32 (len);
phu.ph.ph_src = ip6->src_address;
phu.ph.ph_dst = ip6->dst_address;
phu.ph.ph_len = clib_host_to_net_u32 (len);
@@
-115,11
+115,11
@@
udp_checksum (udp_header_t * uh, u32 udp_len, void *ih, u8 version)
{
switch (version)
{
{
switch (version)
{
- case IP4:
+ case
AF_
IP4:
return (udp_ip4_checksum (uh, udp_len,
((ip4_header_t *) ih)->src_address.as_u8,
((ip4_header_t *) ih)->dst_address.as_u8));
return (udp_ip4_checksum (uh, udp_len,
((ip4_header_t *) ih)->src_address.as_u8,
((ip4_header_t *) ih)->dst_address.as_u8));
- case IP6:
+ case
AF_
IP6:
return (udp_ip6_checksum (ih, uh, udp_len));
default:
return ~0;
return (udp_ip6_checksum (ih, uh, udp_len));
default:
return ~0;
@@
-143,7
+143,7
@@
pkt_push_udp (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp)
void *
pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
void *
pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
- ip_address_t * dst, u32 proto)
+ ip_address_t * dst, u32 proto
, u8 csum_offload
)
{
if (ip_addr_version (src) != ip_addr_version (dst))
{
{
if (ip_addr_version (src) != ip_addr_version (dst))
{
@@
-154,11
+154,11
@@
pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
switch (ip_addr_version (src))
{
switch (ip_addr_version (src))
{
- case IP4:
+ case
AF_
IP4:
return vlib_buffer_push_ip4 (vm, b, &ip_addr_v4 (src),
return vlib_buffer_push_ip4 (vm, b, &ip_addr_v4 (src),
- &ip_addr_v4 (dst), proto);
+ &ip_addr_v4 (dst), proto
, csum_offload
);
break;
break;
- case IP6:
+ case
AF_
IP6:
return vlib_buffer_push_ip6 (vm, b, &ip_addr_v6 (src),
&ip_addr_v6 (dst), proto);
break;
return vlib_buffer_push_ip6 (vm, b, &ip_addr_v6 (src),
&ip_addr_v6 (dst), proto);
break;
@@
-167,11
+167,9
@@
pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
return 0;
}
return 0;
}
-#define UDP_CHECKSUM_OFFLOAD 1
-
void *
pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
void *
pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
- ip_address_t * sip, ip_address_t * dip)
+ ip_address_t * sip, ip_address_t * dip
, u8 csum_offload
)
{
u16 udpsum;
udp_header_t *uh;
{
u16 udpsum;
udp_header_t *uh;
@@
-179,10
+177,9
@@
pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
uh = pkt_push_udp (vm, b, sp, dp);
uh = pkt_push_udp (vm, b, sp, dp);
- ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP);
-
- if (UDP_CHECKSUM_OFFLOAD)
+ if (csum_offload)
{
{
+ ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP, 1);
b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
vnet_buffer (b)->l3_hdr_offset = (u8 *) ih - b->data;
vnet_buffer (b)->l4_hdr_offset = (u8 *) uh - b->data;
b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
vnet_buffer (b)->l3_hdr_offset = (u8 *) ih - b->data;
vnet_buffer (b)->l4_hdr_offset = (u8 *) uh - b->data;
@@
-190,6
+187,7
@@
pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
}
else
{
}
else
{
+ ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP, 0);
udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih,
ip_addr_version (sip));
if (udpsum == (u16) ~ 0)
udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih,
ip_addr_version (sip));
if (udpsum == (u16) ~ 0)
@@
-197,6
+195,8
@@
pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
clib_warning ("Failed UDP checksum! Discarding");
return 0;
}
clib_warning ("Failed UDP checksum! Discarding");
return 0;
}
+ /* clear flags used for csum since we're not offloading */
+ b->flags &= ~(VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_IS_IP6);
uh->checksum = udpsum;
}
return ih;
uh->checksum = udpsum;
}
return ih;
@@
-208,9
+208,9
@@
pkt_push_ecm_hdr (vlib_buffer_t * b)
ecm_hdr_t *h;
h = vlib_buffer_push_uninit (b, sizeof (h[0]));
ecm_hdr_t *h;
h = vlib_buffer_push_uninit (b, sizeof (h[0]));
- memset (h, 0, sizeof (h[0]));
+
clib_
memset (h, 0, sizeof (h[0]));
h->type = LISP_ENCAP_CONTROL_TYPE;
h->type = LISP_ENCAP_CONTROL_TYPE;
- memset (h->reserved2, 0, sizeof (h->reserved2));
+
clib_
memset (h->reserved2, 0, sizeof (h->reserved2));
return h;
}
return h;
}