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.74 retrieving revision 1.104 diff -u -p -r1.74 -r1.104 --- src/sys/netinet/udp_usrreq.c 2000/12/04 11:24:20 1.74 +++ src/sys/netinet/udp_usrreq.c 2003/08/07 16:33:20 1.104 @@ -1,9 +1,9 @@ -/* $NetBSD: udp_usrreq.c,v 1.74 2000/12/04 11:24:20 itojun Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.104 2003/08/07 16:33:20 agc Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -15,7 +15,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -41,11 +41,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -64,8 +60,14 @@ * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 */ +#include +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.104 2003/08/07 16:33:20 agc Exp $"); + +#include "opt_inet.h" #include "opt_ipsec.h" +#include "opt_inet_csum.h" #include "opt_ipkdb.h" +#include "opt_mbuftrace.h" #include #include @@ -78,8 +80,6 @@ #include #include #include - -#include #include #include @@ -103,11 +103,14 @@ #include #endif -#ifdef PULLDOWN_TEST #ifndef INET6 /* always need ip6.h for IP6_EXTHDR_GET */ #include #endif + +#include "faith.h" +#if defined(NFAITH) && NFAITH > 0 +#include #endif #include @@ -131,6 +134,9 @@ int udpcksum = 1; int udpcksum = 0; /* XXX */ #endif +struct inpcbtable udbtable; +struct udpstat udpstat; + #ifdef INET static void udp4_sendup __P((struct mbuf *, int, struct sockaddr *, struct socket *)); @@ -140,8 +146,6 @@ static int udp4_realinput __P((struct so #ifdef INET6 static void udp6_sendup __P((struct mbuf *, int, struct sockaddr *, struct socket *)); -static int in6_mcmatch __P((struct in6pcb *, struct in6_addr *, - struct ifnet *)); static int udp6_realinput __P((int, struct sockaddr_in6 *, struct sockaddr_in6 *, struct mbuf *, int)); #endif @@ -154,6 +158,32 @@ static void udp_notify __P((struct inpcb #endif int udbhashsize = UDBHASHSIZE; +#ifdef MBUFTRACE +struct mowner udp_mowner = { "udp" }; +struct mowner udp_rx_mowner = { "udp", "rx" }; +struct mowner udp_tx_mowner = { "udp", "tx" }; +#endif + +#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,9 +191,19 @@ 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 */ + + MOWNER_ATTACH(&udp_tx_mowner); + MOWNER_ATTACH(&udp_rx_mowner); + MOWNER_ATTACH(&udp_mowner); } -#ifndef UDP6 #ifdef INET void #if __STDC__ @@ -178,55 +218,29 @@ udp_input(m, va_alist) struct sockaddr_in src, dst; struct ip *ip; struct udphdr *uh; - int iphlen, proto; + int iphlen; int len; int n; + u_int16_t ip_len; va_start(ap, m); iphlen = va_arg(ap, int); - proto = va_arg(ap, int); + (void)va_arg(ap, int); /* ignore value, advance ap */ va_end(ap); + MCLAIM(m, &udp_rx_mowner); udpstat.udps_ipackets++; -#ifndef PULLDOWN_TEST - /* - * Strip IP options, if any; should skip this, - * make available to user, and use on returned packets, - * but we don't yet have a way to check the checksum - * with options still present. - */ - if (iphlen > sizeof (struct ip)) { - ip_stripoptions(m, (struct mbuf *)0); - iphlen = sizeof(struct ip); - } -#else - /* - * we may enable the above code if we save and pass IPv4 options - * to the userland. - */ -#endif - /* * Get IP and UDP header together in first mbuf. */ ip = mtod(m, struct ip *); -#ifndef PULLDOWN_TEST - if (m->m_len < iphlen + sizeof(struct udphdr)) { - if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) { - udpstat.udps_hdrops++; - return; - } - ip = mtod(m, struct ip *); - } - uh = (struct udphdr *)((caddr_t)ip + iphlen); -#else IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr)); if (uh == NULL) { udpstat.udps_hdrops++; return; } -#endif + KASSERT(UDP_HDR_ALIGNED_P(uh)); /* destination port of 0 is illegal, based on RFC768. */ if (uh->uh_dport == 0) @@ -236,23 +250,44 @@ udp_input(m, va_alist) * Make mbuf data length reflect UDP length. * If not enough data to reflect UDP length, drop. */ + ip_len = ntohs(ip->ip_len); len = ntohs((u_int16_t)uh->uh_ulen); - if (ip->ip_len != iphlen + len) { - if (ip->ip_len < iphlen + len || len < sizeof(struct udphdr)) { + if (ip_len != iphlen + len) { + if (ip_len < iphlen + len || len < sizeof(struct udphdr)) { udpstat.udps_badlen++; goto bad; } - m_adj(m, iphlen + len - ip->ip_len); + m_adj(m, iphlen + len - ip_len); } /* * 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_rx & 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 +351,11 @@ udp_input(m, va_alist) bad: if (m) m_freem(m); + return; + +badcsum: + m_freem(m); + udpstat.udps_badsum++; } #endif @@ -332,34 +372,26 @@ udp6_input(mp, offp, proto) struct udphdr *uh; u_int32_t plen, ulen; + 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 - uh = (struct udphdr *)((caddr_t)ip6 + off); -#else IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr)); if (uh == NULL) { ip6stat.ip6s_tooshort++; return IPPROTO_DONE; } -#endif + KASSERT(UDP_HDR_ALIGNED_P(uh)); ulen = ntohs((u_short)uh->uh_ulen); /* * RFC2675 section 4: jumbograms will have 0 in the UDP header field, @@ -439,9 +471,6 @@ udp4_sendup(m, off, src, so) struct mbuf *opts = NULL; struct mbuf *n; struct inpcb *inp = NULL; -#ifdef INET6 - struct in6pcb *in6p = NULL; -#endif if (!so) return; @@ -451,7 +480,6 @@ udp4_sendup(m, off, src, so) break; #ifdef INET6 case AF_INET6: - in6p = sotoin6pcb(so); break; #endif default: @@ -479,6 +507,7 @@ udp4_sendup(m, off, src, so) m_freem(n); if (opts) m_freem(opts); + udpstat.udps_fullsock++; } else sorwakeup(so); } @@ -556,7 +585,6 @@ udp4_realinput(src, dst, m, off) if (IN_MULTICAST(dst4->s_addr) || in_broadcast(*dst4, m->m_pkthdr.rcvif)) { - struct inpcb *last; /* * Deliver a multicast or broadcast datagram to *all* sockets * for which the local and remote addresses and ports match @@ -574,15 +602,13 @@ udp4_realinput(src, dst, m, off) */ /* - * KAME note: usually we drop udpiphdr from mbuf here. + * KAME note: traditionally we dropped udpiphdr from mbuf here. * we need udpiphdr for IPsec processing so we do that later. */ /* * Locate pcb(s) for datagram. */ - for (inp = udbtable.inpt_queue.cqh_first; - inp != (struct inpcb *)&udbtable.inpt_queue; - inp = inp->inp_queue.cqe_next) { + CIRCLEQ_FOREACH(inp, &udbtable.inpt_queue, inp_queue) { if (inp->inp_lport != *dport) continue; if (!in_nullhost(inp->inp_laddr)) { @@ -595,7 +621,6 @@ udp4_realinput(src, dst, m, off) continue; } - last = inp; udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket); rcvcnt++; @@ -612,18 +637,6 @@ udp4_realinput(src, dst, m, off) (SO_REUSEPORT|SO_REUSEADDR)) == 0) break; } - -#if 0 - if (last == NULL) { - /* - * No matching pcb found; discard datagram. - * (No need to send an ICMP Port Unreachable - * for a broadcast or multicast datgram.) - */ - udpstat.udps_noportbcast++; - goto bad; - } -#endif } else { /* * Locate pcb for datagram. @@ -632,32 +645,8 @@ udp4_realinput(src, dst, m, off) if (inp == 0) { ++udpstat.udps_pcbhashmiss; inp = in_pcblookup_bind(&udbtable, *dst4, *dport); - if (inp == 0) { -#if 0 - struct mbuf *n; - - if (m->m_flags & (M_BCAST | M_MCAST)) { - udpstat.udps_noportbcast++; - goto bad; - } - udpstat.udps_noport++; -#ifdef IPKDB - if (checkipkdb(src4, *sport, *dport, m, off, - m->m_pkthdr.len - off)) { - /* - * It was a debugger connect packet, - * just drop it now - */ - goto bad; - } -#endif - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { - icmp_error(n, ICMP_UNREACH, - ICMP_UNREACH_PORT, 0, 0); - } -#endif + if (inp == 0) return rcvcnt; - } } udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket); @@ -671,29 +660,6 @@ bad: #ifdef INET6 static int -in6_mcmatch(in6p, ia6, ifp) - struct in6pcb *in6p; - struct in6_addr *ia6; - struct ifnet *ifp; -{ - struct ip6_moptions *im6o = in6p->in6p_moptions; - struct in6_multi_mship *imm; - - if (im6o == NULL) - return 0; - - for (imm = im6o->im6o_memberships.lh_first; imm != NULL; - imm = imm->i6mm_chain.le_next) { - if ((ifp == NULL || - imm->i6mm_maddr->in6m_ifp == ifp) && - IN6_ARE_ADDR_EQUAL(&imm->i6mm_maddr->in6m_addr, - ia6)) - return 1; - } - return 0; -} - -static int udp6_realinput(af, src, dst, m, off) int af; /* af on packet */ struct sockaddr_in6 *src; @@ -701,10 +667,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 *dst4; + struct in6_addr src6, dst6; + const struct in_addr *dst4; struct in6pcb *in6p; rcvcnt = 0; @@ -715,15 +681,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; - dst4 = (struct in_addr *)&dst->sin6_addr.s6_addr32[12]; - - if (IN6_IS_ADDR_MULTICAST(dst6) - || (af == AF_INET && IN_MULTICAST(dst4->s_addr))) { - struct in6pcb *last; + 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_addr[12]; + + if (IN6_IS_ADDR_MULTICAST(&dst6) || + (af == AF_INET && IN_MULTICAST(dst4->s_addr))) { /* * Deliver a multicast or broadcast datagram to *all* sockets * for which the local and remote addresses and ports match @@ -741,7 +706,7 @@ udp6_realinput(af, src, dst, m, off) */ /* - * KAME note: usually we drop udpiphdr from mbuf here. + * KAME note: traditionally we dropped udpiphdr from mbuf here. * we need udpiphdr for IPsec processing so we do that later. */ /* @@ -749,34 +714,26 @@ 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)) continue; - } -#ifndef INET6_BINDV6ONLY - else { - if (IN6_IS_ADDR_V4MAPPED(dst6) - && (in6p->in6p_flags & IN6P_BINDV6ONLY)) + } else { + if (IN6_IS_ADDR_V4MAPPED(&dst6) && + (in6p->in6p_flags & IN6P_IPV6_V6ONLY)) 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)) + } else { + if (IN6_IS_ADDR_V4MAPPED(&src6) && + (in6p->in6p_flags & IN6P_IPV6_V6ONLY)) continue; } -#endif - last = in6p; udp6_sendup(m, off, (struct sockaddr *)src, in6p->in6p_socket); rcvcnt++; @@ -793,64 +750,17 @@ udp6_realinput(af, src, dst, m, off) (SO_REUSEPORT|SO_REUSEADDR)) == 0) break; } - -#if 0 - if (last == NULL) { - /* - * No matching pcb found; discard datagram. - * (No need to send an ICMP Port Unreachable - * for a broadcast or multicast datgram.) - */ - switch (af) { - case AF_INET: - udpstat.udps_noportbcast++; - break; - case AF_INET6: - udp6stat.udp6s_noportmcast++; - break; - } - goto bad; - } -#endif } else { /* * 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); - if (in6p == 0) { -#if 0 - struct mbuf *n; - n = m_copy(m, 0, M_COPYALL); - switch (af) { - case AF_INET: - if (m->m_flags & (M_BCAST | M_MCAST)) { - udpstat.udps_noportbcast++; - goto bad; - } - udpstat.udps_noport++; - if (n != NULL) - icmp_error(n, ICMP_UNREACH, - ICMP_UNREACH_PORT, 0, 0); - break; - case AF_INET6: - if (m->m_flags & M_MCAST) { - udp6stat.udp6s_noportmcast++; - goto bad; - } - udp6stat.udp6s_noport++; - if (n != NULL) - icmp6_error(n, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_NOPORT, 0); - break; - } -#endif - + in6p = in6_pcblookup_bind(&udb6, &dst6, dport, 0); + if (in6p == 0) return rcvcnt; - } } udp6_sendup(m, off, (struct sockaddr *)src, in6p->in6p_socket); @@ -862,283 +772,6 @@ bad: } #endif -#else /*UDP6*/ - -void -#if __STDC__ -udp_input(struct mbuf *m, ...) -#else -udp_input(m, va_alist) - struct mbuf *m; - va_dcl -#endif -{ - int proto; - struct ip *ip; - struct udphdr *uh; - struct inpcb *inp; - struct mbuf *opts = 0; - int len; - struct ip save_ip; - int iphlen; - va_list ap; - struct sockaddr_in udpsrc; - struct sockaddr *sa; - - va_start(ap, m); - iphlen = va_arg(ap, int); - proto = va_arg(ap, int); - va_end(ap); - - udpstat.udps_ipackets++; - - /* - * Strip IP options, if any; should skip this, - * make available to user, and use on returned packets, - * but we don't yet have a way to check the checksum - * with options still present. - */ - if (iphlen > sizeof (struct ip)) { - ip_stripoptions(m, (struct mbuf *)0); - iphlen = sizeof(struct ip); - } - - /* - * Get IP and UDP header together in first mbuf. - */ - ip = mtod(m, struct ip *); - if (m->m_len < iphlen + sizeof(struct udphdr)) { - if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) { - udpstat.udps_hdrops++; - return; - } - ip = mtod(m, struct ip *); - } - uh = (struct udphdr *)((caddr_t)ip + iphlen); - - /* destination port of 0 is illegal, based on RFC768. */ - if (uh->uh_dport == 0) - goto bad; - - /* - * Make mbuf data length reflect UDP length. - * If not enough data to reflect UDP length, drop. - */ - len = ntohs((u_int16_t)uh->uh_ulen); - if (ip->ip_len != iphlen + len) { - if (ip->ip_len < iphlen + len || len < sizeof(struct udphdr)) { - udpstat.udps_badlen++; - goto bad; - } - m_adj(m, iphlen + len - ip->ip_len); - } - /* - * Save a copy of the IP header in case we want restore it - * for sending an ICMP error message in response. - */ - save_ip = *ip; - - /* - * 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; - } - } - - /* - * Construct sockaddr format source address. - */ - udpsrc.sin_family = AF_INET; - udpsrc.sin_len = sizeof(struct sockaddr_in); - udpsrc.sin_addr = ip->ip_src; - udpsrc.sin_port = uh->uh_sport; - bzero((caddr_t)udpsrc.sin_zero, sizeof(udpsrc.sin_zero)); - - if (IN_MULTICAST(ip->ip_dst.s_addr) || - in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) { - struct inpcb *last; - /* - * Deliver a multicast or broadcast datagram to *all* sockets - * for which the local and remote addresses and ports match - * those of the incoming datagram. This allows more than - * one process to receive multi/broadcasts on the same port. - * (This really ought to be done for unicast datagrams as - * well, but that would cause problems with existing - * applications that open both address-specific sockets and - * a wildcard socket listening to the same port -- they would - * end up receiving duplicates of every unicast datagram. - * Those applications open the multiple sockets to overcome an - * inadequacy of the UDP socket interface, but for backwards - * compatibility we avoid the problem here rather than - * fixing the interface. Maybe 4.5BSD will remedy this?) - */ - - iphlen += sizeof(struct udphdr); - /* - * KAME note: usually we drop udpiphdr from mbuf here. - * we need udpiphdr for IPsec processing so we do that later. - */ - /* - * Locate pcb(s) for datagram. - * (Algorithm copied from raw_intr().) - */ - last = NULL; - for (inp = udbtable.inpt_queue.cqh_first; - inp != (struct inpcb *)&udbtable.inpt_queue; - inp = inp->inp_queue.cqe_next) { - if (inp->inp_lport != uh->uh_dport) - continue; - if (!in_nullhost(inp->inp_laddr)) { - if (!in_hosteq(inp->inp_laddr, ip->ip_dst)) - continue; - } - if (!in_nullhost(inp->inp_faddr)) { - if (!in_hosteq(inp->inp_faddr, ip->ip_src) || - inp->inp_fport != uh->uh_sport) - continue; - } - - if (last != NULL) { - struct mbuf *n; - -#ifdef IPSEC - /* check AH/ESP integrity. */ - if (last != NULL && ipsec4_in_reject(m, last)) { - ipsecstat.in_polvio++; - /* do not inject data to pcb */ - } else -#endif /*IPSEC*/ - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { - if (last->inp_flags & INP_CONTROLOPTS - || last->inp_socket->so_options & - SO_TIMESTAMP) { - ip_savecontrol(last, &opts, - ip, n); - } - m_adj(n, iphlen); - sa = (struct sockaddr *)&udpsrc; - if (sbappendaddr( - &last->inp_socket->so_rcv, - sa, n, opts) == 0) { - m_freem(n); - if (opts) - m_freem(opts); - } else - sorwakeup(last->inp_socket); - opts = 0; - } - } - last = inp; - /* - * Don't look for additional matches if this one does - * not have either the SO_REUSEPORT or SO_REUSEADDR - * socket options set. This heuristic avoids searching - * through all pcbs in the common case of a non-shared - * port. It * assumes that an application will never - * clear these options after setting them. - */ - if ((last->inp_socket->so_options & - (SO_REUSEPORT|SO_REUSEADDR)) == 0) - break; - } - - if (last == NULL) { - /* - * No matching pcb found; discard datagram. - * (No need to send an ICMP Port Unreachable - * for a broadcast or multicast datgram.) - */ - udpstat.udps_noportbcast++; - goto bad; - } -#ifdef IPSEC - /* check AH/ESP integrity. */ - if (last != NULL && ipsec4_in_reject(m, last)) { - ipsecstat.in_polvio++; - goto bad; - } -#endif /*IPSEC*/ - if (last->inp_flags & INP_CONTROLOPTS || - last->inp_socket->so_options & SO_TIMESTAMP) - ip_savecontrol(last, &opts, ip, m); - m->m_len -= iphlen; - m->m_pkthdr.len -= iphlen; - m->m_data += iphlen; - sa = (struct sockaddr *)&udpsrc; - if (sbappendaddr(&last->inp_socket->so_rcv, sa, m, opts) == 0) { - udpstat.udps_fullsock++; - goto bad; - } - sorwakeup(last->inp_socket); - return; - } - /* - * Locate pcb for datagram. - */ - inp = in_pcblookup_connect(&udbtable, ip->ip_src, uh->uh_sport, - ip->ip_dst, uh->uh_dport); - if (inp == 0) { - ++udpstat.udps_pcbhashmiss; - inp = in_pcblookup_bind(&udbtable, ip->ip_dst, uh->uh_dport); - if (inp == 0) { - if (m->m_flags & (M_BCAST | M_MCAST)) { - udpstat.udps_noportbcast++; - goto bad; - } - udpstat.udps_noport++; - *ip = save_ip; -#ifdef IPKDB - if (checkipkdb(&ip->ip_src, - uh->uh_sport, - uh->uh_dport, - m, - iphlen + sizeof(struct udphdr), - len - sizeof(struct udphdr))) - /* It was a debugger connect packet, just drop it now */ - goto bad; -#endif - icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0); - return; - } - } -#ifdef IPSEC - if (inp != NULL && ipsec4_in_reject(m, inp)) { - ipsecstat.in_polvio++; - goto bad; - } -#endif /*IPSEC*/ - - /* - * Stuff source address and datagram in user buffer. - */ - if (inp->inp_flags & INP_CONTROLOPTS || - inp->inp_socket->so_options & SO_TIMESTAMP) - ip_savecontrol(inp, &opts, ip, m); - iphlen += sizeof(struct udphdr); - m->m_len -= iphlen; - m->m_pkthdr.len -= iphlen; - m->m_data += iphlen; - sa = (struct sockaddr *)&udpsrc; - if (sbappendaddr(&inp->inp_socket->so_rcv, sa, m, opts) == 0) { - udpstat.udps_fullsock++; - goto bad; - } - sorwakeup(inp->inp_socket); - return; -bad: - m_freem(m); - if (opts) - m_freem(opts); -} -#endif /*UDP6*/ - #ifdef INET /* * Notify a udp user of an asynchronous error; @@ -1205,6 +838,7 @@ udp_output(m, va_alist) int error = 0; va_list ap; + MCLAIM(m, &udp_tx_mowner); va_start(ap, m); inp = va_arg(ap, struct inpcb *); va_end(ap); @@ -1223,7 +857,7 @@ udp_output(m, va_alist) * Compute the packet length of the IP header, and * punt if the length looks bogus. */ - if ((len + sizeof(struct udpiphdr)) > IP_MAXPACKET) { + if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) { error = EMSGSIZE; goto release; } @@ -1233,30 +867,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; - } - ((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len; + /* + * 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 = htons(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 +931,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); @@ -1316,6 +959,11 @@ udp_usrreq(so, req, m, nam, control, p) error = EISCONN; break; } +#ifdef MBUFTRACE + so->so_mowner = &udp_mowner; + so->so_rcv.sb_mowner = &udp_rx_mowner; + so->so_snd.sb_mowner = &udp_tx_mowner; +#endif if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { error = soreserve(so, udp_sendspace, udp_recvspace); if (error) @@ -1326,13 +974,6 @@ udp_usrreq(so, req, m, nam, control, p) break; inp = sotoinpcb(so); inp->inp_ip.ip_ttl = ip_defttl; -#ifdef IPSEC - error = ipsec_init_policy(so, &inp->inp_sp); - if (error != 0) { - in_pcbdetach(inp); - break; - } -#endif /*IPSEC*/ break; case PRU_DETACH: @@ -1363,6 +1004,11 @@ udp_usrreq(so, req, m, nam, control, p) so->so_state &= ~SS_ISCONNECTED; /* XXX */ in_pcbdisconnect(inp); inp->inp_laddr = zeroin_addr; /* XXX */ + if (inp->inp_ia != NULL) { + LIST_REMOVE(inp, inp_ialink); + IFAFREE(&inp->inp_ia->ia_ifa); + inp->inp_ia = NULL; + } in_pcbstate(inp, INP_BOUND); /* XXX */ break; @@ -1391,11 +1037,8 @@ udp_usrreq(so, req, m, nam, control, p) goto die; } error = in_pcbconnect(inp, nam); - if (error) { - die: - m_freem(m); - break; - } + if (error) + goto die; } else { if ((so->so_state & SS_ISCONNECTED) == 0) { error = ENOTCONN; @@ -1403,11 +1046,20 @@ udp_usrreq(so, req, m, nam, control, p) } } error = udp_output(m, inp); + m = NULL; if (nam) { in_pcbdisconnect(inp); inp->inp_laddr = laddr; /* XXX */ in_pcbstate(inp, INP_BOUND); /* XXX */ } + die: + if (inp->inp_ia != NULL && in_nullhost(inp->inp_laddr)) { + LIST_REMOVE(inp, inp_ialink); + IFAFREE(&inp->inp_ia->ia_ifa); + inp->inp_ia = NULL; + } + if (m) + m_freem(m); } break; @@ -1468,7 +1120,7 @@ udp_sysctl(name, namelen, oldp, oldlenp, return (sysctl_int(oldp, oldlenp, newp, newlen, &udp_sendspace)); case UDPCTL_RECVSPACE: - return (sysctl_int(oldp, oldlenp, newp, newlen, + return (sysctl_int(oldp, oldlenp, newp, newlen, &udp_recvspace)); default: return (ENOPROTOOPT);