diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2014-07-11 15:25:45 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2014-07-11 15:25:45 +0000 |
| commit | a206e7d5fc5db8a1f980872c314ae735bdc6a3da (patch) | |
| tree | 0b3617be999e34b9f968f9a4418c99521a53a487 /sys/netinet/ip_output.c | |
| parent | 9d46ce95080686dc2b8b3591d9033d8352593e6e (diff) | |
in_proto_cksum_out: zero the icmp cksum before going on so that we do not
require the caller to do so. lteo needs that for divert soon, and is in line
with tcp/udp and the general approach that the rest of the stack should not
need to do anything regarding the cksums but setting the "needs it" flag.
ok lteo
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index a5429eacfa8..cbec4e7f983 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.263 2014/04/21 12:22:26 henning Exp $ */ +/* $OpenBSD: ip_output.c,v 1.264 2014/07/11 15:25:44 henning Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -2075,18 +2075,23 @@ void in_proto_cksum_out(struct mbuf *m, struct ifnet *ifp) { /* 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)) { + 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, offset; + u_int16_t csum = 0, offset; ip = mtod(m, struct ip *); offset = ip->ip_hl << 2; - csum = in_cksum_phdr(ip->ip_src.s_addr, ip->ip_dst.s_addr, - htonl(ntohs(ip->ip_len) - offset + ip->ip_p)); + if (m->m_pkthdr.csum_flags & (M_TCP_CSUM_OUT|M_UDP_CSUM_OUT)) + csum = in_cksum_phdr(ip->ip_src.s_addr, + ip->ip_dst.s_addr, htonl(ntohs(ip->ip_len) - + offset + ip->ip_p)); if (ip->ip_p == IPPROTO_TCP) offset += offsetof(struct tcphdr, th_sum); else if (ip->ip_p == IPPROTO_UDP) offset += offsetof(struct udphdr, uh_sum); + else if (ip->ip_p == IPPROTO_ICMP) + offset += offsetof(struct icmp, icmp_cksum); if ((offset + sizeof(u_int16_t)) > m->m_len) m_copyback(m, offset, sizeof(csum), &csum, M_NOWAIT); else |