diff options
| author |   naddy <naddy@openbsd.org> | 2015-11-03 21:11:48 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2015-11-03 21:11:48 +0000 |
| commit | b2b8628d4b5837662f40632ea8ea52e357e42c2e (patch) | |
| tree | ac83f636da5ccabafd8b284ea0ff8a6e5802e3ca /sys/netinet/ip_output.c | |
| parent | If pledge(2) fails use perror instead of log_it(RealUser, ...) since (diff) | |
| download | wireguard-openbsd-b2b8628d4b5837662f40632ea8ea52e357e42c2e.tar.xz wireguard-openbsd-b2b8628d4b5837662f40632ea8ea52e357e42c2e.zip | |
Disable TCP/UDP TX hardware checksumming if an IPv4 packet contains
IP options or if an IPv6 packet contains header extensions.
Required by cnmac(4) and a sensible precautionary measure in general.
ok visa@, mikeb@
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 3130e91fd77..7f50c60f638 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.304 2015/10/24 12:33:16 mpi Exp $ */ +/* $OpenBSD: ip_output.c,v 1.305 2015/11/03 21:11:48 naddy Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -1753,13 +1753,13 @@ in_delayed_cksum(struct mbuf *m) void in_proto_cksum_out(struct mbuf *m, struct ifnet *ifp) { + struct ip *ip = mtod(m, struct ip *); + /* some hw and in_delayed_cksum need the pseudo header cksum */ if (m->m_pkthdr.csum_flags & (M_TCP_CSUM_OUT|M_UDP_CSUM_OUT|M_ICMP_CSUM_OUT)) { - struct ip *ip; u_int16_t csum = 0, offset; - ip = mtod(m, struct ip *); offset = ip->ip_hl << 2; if (m->m_pkthdr.csum_flags & (M_TCP_CSUM_OUT|M_UDP_CSUM_OUT)) csum = in_cksum_phdr(ip->ip_src.s_addr, @@ -1779,14 +1779,14 @@ in_proto_cksum_out(struct mbuf *m, struct ifnet *ifp) if (m->m_pkthdr.csum_flags & M_TCP_CSUM_OUT) { if (!ifp || !(ifp->if_capabilities & IFCAP_CSUM_TCPv4) || - ifp->if_bridgeport != NULL) { + ip->ip_hl != 5 || ifp->if_bridgeport != NULL) { tcpstat.tcps_outswcsum++; in_delayed_cksum(m); m->m_pkthdr.csum_flags &= ~M_TCP_CSUM_OUT; /* Clear */ } } else if (m->m_pkthdr.csum_flags & M_UDP_CSUM_OUT) { if (!ifp || !(ifp->if_capabilities & IFCAP_CSUM_UDPv4) || - ifp->if_bridgeport != NULL) { + ip->ip_hl != 5 || ifp->if_bridgeport != NULL) { udpstat.udps_outswcsum++; in_delayed_cksum(m); m->m_pkthdr.csum_flags &= ~M_UDP_CSUM_OUT; /* Clear */ |