Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.66.4.4 retrieving revision 1.75.2.1 diff -u -p -r1.66.4.4 -r1.75.2.1 --- src/sys/netinet/udp_usrreq.c 2001/04/06 00:26:54 1.66.4.4 +++ src/sys/netinet/udp_usrreq.c 2001/06/21 20:08:46 1.75.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.66.4.4 2001/04/06 00:26:54 he Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.75.2.1 2001/06/21 20:08:46 nathanw Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -64,7 +64,9 @@ * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 */ +#include "opt_inet.h" #include "opt_ipsec.h" +#include "opt_inet_csum.h" #include "opt_ipkdb.h" #include @@ -79,7 +81,7 @@ #include #include -#include +#include #include #include @@ -110,12 +112,16 @@ #endif #endif +#include "faith.h" +#if defined(NFAITH) && NFAITH > 0 +#include +#endif + #include #ifdef IPSEC #include #include -#include #endif /*IPSEC*/ #ifdef IPKDB @@ -132,10 +138,12 @@ int udpcksum = 1; int udpcksum = 0; /* XXX */ #endif +#ifdef INET static void udp4_sendup __P((struct mbuf *, int, struct sockaddr *, struct socket *)); static int udp4_realinput __P((struct sockaddr_in *, struct sockaddr_in *, struct mbuf *, int)); +#endif #ifdef INET6 static void udp6_sendup __P((struct mbuf *, int, struct sockaddr *, struct socket *)); @@ -144,21 +152,53 @@ static int in6_mcmatch __P((struct in6pc static int udp6_realinput __P((int, struct sockaddr_in6 *, struct sockaddr_in6 *, struct mbuf *, int)); #endif +#ifdef INET static void udp_notify __P((struct inpcb *, int)); +#endif #ifndef UDBHASHSIZE #define UDBHASHSIZE 128 #endif int udbhashsize = UDBHASHSIZE; +#ifdef UDP_CSUM_COUNTERS +#include + +struct evcnt udp_hwcsum_bad = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, + NULL, "udp", "hwcsum bad"); +struct evcnt udp_hwcsum_ok = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, + NULL, "udp", "hwcsum ok"); +struct evcnt udp_hwcsum_data = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, + NULL, "udp", "hwcsum data"); +struct evcnt udp_swcsum = EVCNT_INITIALIZER(EVCNT_TYPE_MISC, + NULL, "udp", "swcsum"); + +#define UDP_CSUM_COUNTER_INCR(ev) (ev)->ev_count++ + +#else + +#define UDP_CSUM_COUNTER_INCR(ev) /* nothing */ + +#endif /* UDP_CSUM_COUNTERS */ + void udp_init() { +#ifdef INET in_pcbinit(&udbtable, udbhashsize, udbhashsize); +#endif + +#ifdef UDP_CSUM_COUNTERS + evcnt_attach_static(&udp_hwcsum_bad); + evcnt_attach_static(&udp_hwcsum_ok); + evcnt_attach_static(&udp_hwcsum_data); + evcnt_attach_static(&udp_swcsum); +#endif /* UDP_CSUM_COUNTERS */ } #ifndef UDP6 +#ifdef INET void #if __STDC__ udp_input(struct mbuf *m, ...) @@ -243,10 +283,30 @@ udp_input(m, va_alist) * Checksum extended UDP header and data. */ if (uh->uh_sum) { - if (in4_cksum(m, IPPROTO_UDP, iphlen, len) != 0) { - udpstat.udps_badsum++; - m_freem(m); - return; + switch (m->m_pkthdr.csum_flags & + ((m->m_pkthdr.rcvif->if_csum_flags & M_CSUM_UDPv4) | + M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) { + case M_CSUM_UDPv4|M_CSUM_TCP_UDP_BAD: + UDP_CSUM_COUNTER_INCR(&udp_hwcsum_bad); + goto badcsum; + + case M_CSUM_UDPv4|M_CSUM_DATA: + UDP_CSUM_COUNTER_INCR(&udp_hwcsum_data); + if ((m->m_pkthdr.csum_data ^ 0xffff) != 0) + goto badcsum; + break; + + case M_CSUM_UDPv4: + /* Checksum was okay. */ + UDP_CSUM_COUNTER_INCR(&udp_hwcsum_ok); + break; + + default: + /* Need to compute it ourselves. */ + UDP_CSUM_COUNTER_INCR(&udp_swcsum); + if (in4_cksum(m, IPPROTO_UDP, iphlen, len) != 0) + goto badcsum; + break; } } @@ -310,7 +370,13 @@ udp_input(m, va_alist) bad: if (m) m_freem(m); + return; + +badcsum: + m_freem(m); + udpstat.udps_badsum++; } +#endif #ifdef INET6 int @@ -325,23 +391,21 @@ udp6_input(mp, offp, proto) struct udphdr *uh; u_int32_t plen, ulen; +#ifndef PULLDOWN_TEST + IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE); +#endif + ip6 = mtod(m, struct ip6_hdr *); + #if defined(NFAITH) && 0 < NFAITH - if (m->m_pkthdr.rcvif) { - if (m->m_pkthdr.rcvif->if_type == IFT_FAITH) { - /* send icmp6 host unreach? */ - m_freem(m); - return IPPROTO_DONE; - } + if (faithprefix(&ip6->ip6_dst)) { + /* send icmp6 host unreach? */ + m_freem(m); + return IPPROTO_DONE; } #endif udp6stat.udp6s_ipackets++; -#ifndef PULLDOWN_TEST - IP6_EXTHDR_CHECK(m, off, sizeof(struct udphdr), IPPROTO_DONE); -#endif - - ip6 = mtod(m, struct ip6_hdr *); /* check for jumbogram is done in ip6_input. we can trust pkthdr.len */ plen = m->m_pkthdr.len - off; #ifndef PULLDOWN_TEST @@ -354,6 +418,10 @@ udp6_input(mp, offp, proto) } #endif ulen = ntohs((u_short)uh->uh_ulen); + /* + * RFC2675 section 4: jumbograms will have 0 in the UDP header field, + * iff payload length > 0xffff. + */ if (ulen == 0 && plen > 0xffff) ulen = plen; @@ -390,28 +458,14 @@ udp6_input(mp, offp, proto) bzero(&src, sizeof(src)); src.sin6_family = AF_INET6; src.sin6_len = sizeof(struct sockaddr_in6); - bcopy(&ip6->ip6_src, &src.sin6_addr, sizeof(src.sin6_addr)); - if (IN6_IS_SCOPE_LINKLOCAL(&src.sin6_addr)) - src.sin6_addr.s6_addr16[1] = 0; - if (m->m_pkthdr.rcvif) { - if (IN6_IS_SCOPE_LINKLOCAL(&src.sin6_addr)) - src.sin6_scope_id = m->m_pkthdr.rcvif->if_index; - else - src.sin6_scope_id = 0; - } + /* KAME hack: recover scopeid */ + (void)in6_recoverscope(&src, &ip6->ip6_src, m->m_pkthdr.rcvif); src.sin6_port = uh->uh_sport; bzero(&dst, sizeof(dst)); dst.sin6_family = AF_INET6; dst.sin6_len = sizeof(struct sockaddr_in6); - bcopy(&ip6->ip6_dst, &dst.sin6_addr, sizeof(dst.sin6_addr)); - if (IN6_IS_SCOPE_LINKLOCAL(&dst.sin6_addr)) - dst.sin6_addr.s6_addr16[1] = 0; - if (m->m_pkthdr.rcvif) { - if (IN6_IS_SCOPE_LINKLOCAL(&dst.sin6_addr)) - dst.sin6_scope_id = m->m_pkthdr.rcvif->if_index; - else - dst.sin6_scope_id = 0; - } + /* KAME hack: recover scopeid */ + (void)in6_recoverscope(&dst, &ip6->ip6_dst, m->m_pkthdr.rcvif); dst.sin6_port = uh->uh_dport; if (udp6_realinput(AF_INET6, &src, &dst, m, off) == 0) { @@ -431,6 +485,7 @@ bad: } #endif +#ifdef INET static void udp4_sendup(m, off, src, so) struct mbuf *m; @@ -485,6 +540,7 @@ udp4_sendup(m, off, src, so) sorwakeup(so); } } +#endif #ifdef INET6 static void @@ -531,6 +587,7 @@ udp6_sendup(m, off, src, so) } #endif +#ifdef INET static int udp4_realinput(src, dst, m, off) struct sockaddr_in *src; @@ -575,7 +632,7 @@ udp4_realinput(src, dst, m, off) /* * KAME note: usually we drop udpiphdr from mbuf here. - * we need udpiphdr for iPsec processing so we do that later. + * we need udpiphdr for IPsec processing so we do that later. */ /* * Locate pcb(s) for datagram. @@ -667,6 +724,7 @@ udp4_realinput(src, dst, m, off) bad: return rcvcnt; } +#endif #ifdef INET6 static int @@ -741,7 +799,7 @@ udp6_realinput(af, src, dst, m, off) /* * KAME note: usually we drop udpiphdr from mbuf here. - * we need udpiphdr for iPsec processing so we do that later. + * we need udpiphdr for IPsec processing so we do that later. */ /* * Locate pcb(s) for datagram. @@ -941,13 +999,33 @@ udp_input(m, va_alist) * Checksum extended UDP header and data. */ if (uh->uh_sum) { - bzero(((struct ipovly *)ip)->ih_x1, - sizeof ((struct ipovly *)ip)->ih_x1); - ((struct ipovly *)ip)->ih_len = uh->uh_ulen; - if (in_cksum(m, len + sizeof (struct ip)) != 0) { - udpstat.udps_badsum++; - m_freem(m); - return; + switch (m->m_pkthdr.csum_flags & + ((m->m_pkthdr.rcvif->if_csum_flags & M_CSUM_UDPv4) | + M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) { + case M_CSUM_UDPv4|M_CSUM_TCP_UDP_BAD: + UDP_CSUM_COUNTER_INCR(&udp_hwcsum_bad); + goto badcsum; + + case M_CSUM_UDPv4|M_CSUM_DATA: + UDP_CSUM_COUNTER_INCR(&udp_hwcsum_data); + if ((m->m_pkthdr.csum_data ^ 0xffff) != 0) + goto badcsum; + break; + + case M_CSUM_UDPv4: + /* Checksum was okay. */ + UDP_CSUM_COUNTER_INCR(&udp_hwcsum_ok); + break; + + default: + /* Need to compute it ourselves. */ + UDP_CSUM_COUNTER_INCR(&udp_swcsum); + bzero(((struct ipovly *)ip)->ih_x1, + sizeof ((struct ipovly *)ip)->ih_x1); + ((struct ipovly *)ip)->ih_len = uh->uh_ulen; + if (in_cksum(m, len + sizeof (struct ip)) != 0) + goto badcsum; + break; } } @@ -982,7 +1060,7 @@ udp_input(m, va_alist) iphlen += sizeof(struct udphdr); /* * KAME note: usually we drop udpiphdr from mbuf here. - * we need udpiphdr for iPsec processing so we do that later. + * we need udpiphdr for IPsec processing so we do that later. */ /* * Locate pcb(s) for datagram. @@ -1135,9 +1213,15 @@ bad: m_freem(m); if (opts) m_freem(opts); + return; + +badcsum: + udpstat.udps_badsum++; + m_freem(m); } #endif /*UDP6*/ +#ifdef INET /* * Notify a udp user of an asynchronous error; * just wake up so that he can collect error status. @@ -1231,23 +1315,28 @@ udp_output(m, va_alist) * and addresses and length put into network format. */ ui = mtod(m, struct udpiphdr *); - bzero(ui->ui_x1, sizeof ui->ui_x1); ui->ui_pr = IPPROTO_UDP; - ui->ui_len = htons((u_int16_t)len + sizeof (struct udphdr)); ui->ui_src = inp->inp_laddr; ui->ui_dst = inp->inp_faddr; ui->ui_sport = inp->inp_lport; ui->ui_dport = inp->inp_fport; - ui->ui_ulen = ui->ui_len; + ui->ui_ulen = htons((u_int16_t)len + sizeof(struct udphdr)); /* - * Stuff checksum and output datagram. + * Set up checksum and output datagram. */ - ui->ui_sum = 0; if (udpcksum) { - if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0) - ui->ui_sum = 0xffff; - } + /* + * XXX Cache pseudo-header checksum part for + * XXX "connected" UDP sockets. + */ + ui->ui_sum = in_cksum_phdr(ui->ui_src.s_addr, + ui->ui_dst.s_addr, htons((u_int16_t)len + + sizeof(struct udphdr) + IPPROTO_UDP)); + m->m_pkthdr.csum_flags = M_CSUM_UDPv4; + m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); + } else + ui->ui_sum = 0; ((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len; ((struct ip *)ui)->ip_ttl = inp->inp_ip.ip_ttl; /* XXX */ ((struct ip *)ui)->ip_tos = inp->inp_ip.ip_tos; /* XXX */ @@ -1476,3 +1565,4 @@ udp_sysctl(name, namelen, oldp, oldlenp, } /* NOTREACHED */ } +#endif