diff options
| author | ae <ae@FreeBSD.org> | 2014-11-20 18:49:11 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2014-11-20 18:49:11 +0000 |
| commit | b634635a73c9af335c794449b95fa6c02663e42a (patch) | |
| tree | 06147572ea2d690b79a67d3d15b531d01d0db0fa /sys/netipsec/xform_ipip.c | |
| parent | 84d8d047ba855b0e24f1009141363b9d5e1dcf29 (diff) | |
| download | FreeBSD-src-b634635a73c9af335c794449b95fa6c02663e42a.zip FreeBSD-src-b634635a73c9af335c794449b95fa6c02663e42a.tar.gz | |
MFC r274434:
Fix ips_out_nosa errors accounting.
MFC r274454:
ipsec6_process_packet is called before ip6_output fixes ip6_plen.
Update ip6_plen before bpf processing to be able see correct value.
MFC r274455:
We don't return sp pointer, thus NULL assignment isn't needed.
And reference to sp will be freed at the end.
MFC r274465:
Remove redundant ip6_plen initialization.
MFC r274466:
Strip IP header only when we act in tunnel mode.
MFC r274467:
Count statistics for the specific address family.
Sponsored by: Yandex LLC
Diffstat (limited to 'sys/netipsec/xform_ipip.c')
| -rw-r--r-- | sys/netipsec/xform_ipip.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c index 01a6af8..bae8655 100644 --- a/sys/netipsec/xform_ipip.c +++ b/sys/netipsec/xform_ipip.c @@ -486,12 +486,9 @@ ipip_output( ip6o->ip6_flow = 0; ip6o->ip6_vfc &= ~IPV6_VERSION_MASK; ip6o->ip6_vfc |= IPV6_VERSION; - ip6o->ip6_plen = htons(m->m_pkthdr.len); ip6o->ip6_hlim = IPV6_DEFHLIM; ip6o->ip6_dst = saidx->dst.sin6.sin6_addr; ip6o->ip6_src = saidx->src.sin6.sin6_addr; - - /* Fix payload length */ ip6o->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6)); switch (tp) { |
