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.52.2.1 retrieving revision 1.80 diff -u -p -r1.52.2.1 -r1.80 --- src/sys/netinet/udp_usrreq.c 2000/11/20 18:10:38 1.52.2.1 +++ src/sys/netinet/udp_usrreq.c 2001/07/03 08:06:20 1.80 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.52.2.1 2000/11/20 18:10:38 bouyer Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.80 2001/07/03 08:06:20 itojun 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 @@ -110,6 +112,11 @@ #endif #endif +#include "faith.h" +#if defined(NFAITH) && NFAITH > 0 +#include +#endif + #include #ifdef IPSEC @@ -154,6 +161,26 @@ static void udp_notify __P((struct inpcb #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() { @@ -161,6 +188,13 @@ 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 @@ -249,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; } } @@ -316,6 +370,11 @@ udp_input(m, va_alist) bad: if (m) m_freem(m); + return; + +badcsum: + m_freem(m); + udpstat.udps_badsum++; } #endif @@ -332,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 @@ -554,7 +611,7 @@ udp4_realinput(src, dst, m, off) dst4 = &dst->sin_addr; dport = &dst->sin_port; - if (IN_MULTICAST(src4->s_addr) || + if (IN_MULTICAST(dst4->s_addr) || in_broadcast(*dst4, m->m_pkthdr.rcvif)) { struct inpcb *last; /* @@ -701,10 +758,10 @@ udp6_realinput(af, src, dst, m, off) struct mbuf *m; int off; /* offset of udphdr */ { - u_int16_t *sport, *dport; + u_int16_t sport, dport; int rcvcnt; - struct in6_addr *src6, *dst6; - struct in_addr *src4; + struct in6_addr src6, dst6; + const struct in_addr *dst4; struct in6pcb *in6p; rcvcnt = 0; @@ -715,14 +772,14 @@ udp6_realinput(af, src, dst, m, off) if (src->sin6_family != AF_INET6 || dst->sin6_family != AF_INET6) goto bad; - src6 = &src->sin6_addr; - sport = &src->sin6_port; - dst6 = &dst->sin6_addr; - dport = &dst->sin6_port; - src4 = (struct in_addr *)&src->sin6_addr.s6_addr32[12]; + in6_embedscope(&src6, src, NULL, NULL); + sport = src->sin6_port; + in6_embedscope(&dst6, dst, NULL, NULL); + dport = dst->sin6_port; + dst4 = (struct in_addr *)&dst->sin6_addr.s6_addr32[12]; - if (IN6_IS_ADDR_MULTICAST(dst6) - || (af == AF_INET && IN_MULTICAST(src4->s_addr))) { + if (IN6_IS_ADDR_MULTICAST(&dst6) || + (af == AF_INET && IN_MULTICAST(dst4->s_addr))) { struct in6pcb *last; /* * Deliver a multicast or broadcast datagram to *all* sockets @@ -749,29 +806,29 @@ udp6_realinput(af, src, dst, m, off) */ for (in6p = udb6.in6p_next; in6p != &udb6; in6p = in6p->in6p_next) { - if (in6p->in6p_lport != *dport) + if (in6p->in6p_lport != dport) continue; if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_laddr)) { - if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, dst6) - && !in6_mcmatch(in6p, dst6, m->m_pkthdr.rcvif)) + if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_laddr, &dst6) && + !in6_mcmatch(in6p, &dst6, m->m_pkthdr.rcvif)) continue; } #ifndef INET6_BINDV6ONLY else { - if (IN6_IS_ADDR_V4MAPPED(dst6) - && (in6p->in6p_flags & IN6P_BINDV6ONLY)) + if (IN6_IS_ADDR_V4MAPPED(&dst6) && + (in6p->in6p_flags & IN6P_BINDV6ONLY)) continue; } #endif if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) { - if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr, src6) - || in6p->in6p_fport != *sport) + if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr, + &src6) || in6p->in6p_fport != sport) continue; } #ifndef INET6_BINDV6ONLY else { - if (IN6_IS_ADDR_V4MAPPED(src6) - && (in6p->in6p_flags & IN6P_BINDV6ONLY)) + if (IN6_IS_ADDR_V4MAPPED(&src6) && + (in6p->in6p_flags & IN6P_BINDV6ONLY)) continue; } #endif @@ -816,11 +873,11 @@ udp6_realinput(af, src, dst, m, off) /* * Locate pcb for datagram. */ - in6p = in6_pcblookup_connect(&udb6, src6, *sport, - dst6, *dport, 0); + in6p = in6_pcblookup_connect(&udb6, &src6, sport, + &dst6, dport, 0); if (in6p == 0) { ++udpstat.udps_pcbhashmiss; - in6p = in6_pcblookup_bind(&udb6, dst6, *dport, 0); + in6p = in6_pcblookup_bind(&udb6, &dst6, dport, 0); if (in6p == 0) { #if 0 struct mbuf *n; @@ -942,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; } } @@ -1136,6 +1213,11 @@ bad: m_freem(m); if (opts) m_freem(opts); + return; + +badcsum: + udpstat.udps_badsum++; + m_freem(m); } #endif /*UDP6*/ @@ -1233,30 +1315,38 @@ 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 */ udpstat.udps_opackets++; #ifdef IPSEC - ipsec_setsocket(m, inp->inp_socket); + if (ipsec_setsocket(m, inp->inp_socket) != 0) { + error = ENOBUFS; + goto release; + } #endif /*IPSEC*/ return (ip_output(m, inp->inp_options, &inp->inp_route, @@ -1289,6 +1379,7 @@ udp_usrreq(so, req, m, nam, control, p) (struct ifnet *)control, p)); if (req == PRU_PURGEIF) { + in_pcbpurgeif0(&udbtable, (struct ifnet *)control); in_purgeif((struct ifnet *)control); in_pcbpurgeif(&udbtable, (struct ifnet *)control); return (0);