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/ip_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.135.2.6 retrieving revision 1.201 diff -u -p -r1.135.2.6 -r1.201 --- src/sys/netinet/ip_input.c 2002/10/10 18:43:59 1.135.2.6 +++ src/sys/netinet/ip_input.c 2004/05/01 02:20:42 1.201 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.135.2.6 2002/10/10 18:43:59 jdolecek Exp $ */ +/* $NetBSD: ip_input.c,v 1.201 2004/05/01 02:20:42 matt Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -78,11 +78,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. * @@ -102,12 +98,14 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.135.2.6 2002/10/10 18:43:59 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.201 2004/05/01 02:20:42 matt Exp $"); +#include "opt_inet.h" #include "opt_gateway.h" #include "opt_pfil_hooks.h" #include "opt_ipsec.h" #include "opt_mrouting.h" +#include "opt_mbuftrace.h" #include "opt_inet_csum.h" #include @@ -150,6 +148,10 @@ __KERNEL_RCSID(0, "$NetBSD: ip_input.c,v #include #include #endif +#ifdef FAST_IPSEC +#include +#include +#endif /* FAST_IPSEC*/ #ifndef IPFORWARDING #ifdef GATEWAY @@ -197,26 +199,84 @@ int ip_mtudisc_timeout = IPMTUDISCTIMEOU int ipprintfs = 0; #endif +int ip_do_randomid = 0; + +/* + * XXX - Setting ip_checkinterface mostly implements the receive side of + * the Strong ES model described in RFC 1122, but since the routing table + * and transmit implementation do not implement the Strong ES model, + * setting this to 1 results in an odd hybrid. + * + * XXX - ip_checkinterface currently must be disabled if you use ipnat + * to translate the destination address to another local interface. + * + * XXX - ip_checkinterface must be disabled if you add IP aliases + * to the loopback interface instead of the interface where the + * packets for those addresses are received. + */ +int ip_checkinterface = 0; + + struct rttimer_queue *ip_mtudisc_timeout_q = NULL; -extern struct domain inetdomain; int ipqmaxlen = IFQ_MAXLEN; u_long in_ifaddrhash; /* size of hash table - 1 */ int in_ifaddrentries; /* total number of addrs */ -struct in_ifaddrhead in_ifaddr; +struct in_ifaddrhead in_ifaddrhead; struct in_ifaddrhashhead *in_ifaddrhashtbl; +u_long in_multihash; /* size of hash table - 1 */ +int in_multientries; /* total number of addrs */ +struct in_multihashhead *in_multihashtbl; struct ifqueue ipintrq; struct ipstat ipstat; -u_int16_t ip_id; +uint16_t ip_id; #ifdef PFIL_HOOKS struct pfil_head inet_pfil_hook; #endif -struct ipqhead ipq; +/* + * Cached copy of nmbclusters. If nbclusters is different, + * recalculate IP parameters derived from nmbclusters. + */ +static int ip_nmbclusters; /* copy of nmbclusters */ +static void ip_nmbclusters_changed __P((void)); /* recalc limits */ + +#define CHECK_NMBCLUSTER_PARAMS() \ +do { \ + if (__predict_false(ip_nmbclusters != nmbclusters)) \ + ip_nmbclusters_changed(); \ +} while (/*CONSTCOND*/0) + +/* IP datagram reassembly queues (hashed) */ +#define IPREASS_NHASH_LOG2 6 +#define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) +#define IPREASS_HMASK (IPREASS_NHASH - 1) +#define IPREASS_HASH(x,y) \ + (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) +struct ipqhead ipq[IPREASS_NHASH]; int ipq_locked; -int ip_nfragpackets = 0; -int ip_maxfragpackets = 200; +static int ip_nfragpackets; /* packets in reass queue */ +static int ip_nfrags; /* total fragments in reass queues */ + +int ip_maxfragpackets = 200; /* limit on packets. XXX sysctl */ +int ip_maxfrags; /* limit on fragments. XXX sysctl */ + + +/* + * Additive-Increase/Multiplicative-Decrease (AIMD) strategy for + * IP reassembly queue buffer managment. + * + * We keep a count of total IP fragments (NB: not fragmented packets!) + * awaiting reassembly (ip_nfrags) and a limit (ip_maxfrags) on fragments. + * If ip_nfrags exceeds ip_maxfrags the limit, we drop half the + * total fragments in reassembly queues.This AIMD policy avoids + * repeatedly deleting single packets under heavy fragmentation load + * (e.g., from lossy NFS peers). + */ +static u_int ip_reass_ttl_decr __P((u_int ticks)); +static void ip_reass_drophalf __P((void)); + static __inline int ipq_lock_try __P((void)); static __inline void ipq_unlock __P((void)); @@ -257,14 +317,14 @@ do { \ printf("%s:%d: ipq already locked\n", __FILE__, __LINE__); \ panic("ipq_lock"); \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #define IPQ_LOCK_CHECK() \ do { \ if (ipq_locked == 0) { \ printf("%s:%d: ipq lock not held\n", __FILE__, __LINE__); \ panic("ipq lock check"); \ } \ -} while (0) +} while (/*CONSTCOND*/ 0) #else #define IPQ_LOCK() (void) ipq_lock_try() #define IPQ_LOCK_CHECK() /* nothing */ @@ -272,7 +332,8 @@ do { \ #define IPQ_UNLOCK() ipq_unlock() -struct pool ipqent_pool; +POOL_INIT(inmulti_pool, sizeof(struct in_multi), 0, 0, 0, "inmltpl", NULL); +POOL_INIT(ipqent_pool, sizeof(struct ipqent), 0, 0, 0, "ipqepl", NULL); #ifdef INET_CSUM_COUNTERS #include @@ -286,6 +347,10 @@ struct evcnt ip_swcsum = EVCNT_INITIALIZ #define INET_CSUM_COUNTER_INCR(ev) (ev)->ev_count++ +EVCNT_ATTACH_STATIC(ip_hwcsum_bad); +EVCNT_ATTACH_STATIC(ip_hwcsum_ok); +EVCNT_ATTACH_STATIC(ip_swcsum); + #else #define INET_CSUM_COUNTER_INCR(ev) /* nothing */ @@ -309,6 +374,21 @@ static struct ip_srcrt { static void save_rte __P((u_char *, struct in_addr)); +#ifdef MBUFTRACE +struct mowner ip_rx_mowner = { "internet", "rx" }; +struct mowner ip_tx_mowner = { "internet", "tx" }; +#endif + +/* + * Compute IP limits derived from the value of nmbclusters. + */ +static void +ip_nmbclusters_changed(void) +{ + ip_maxfrags = nmbclusters / 4; + ip_nmbclusters = nmbclusters; +} + /* * IP initialization: fill in IP protocol switch table. * All protocols not implemented in kernel go to raw IP protocol handler. @@ -316,12 +396,9 @@ static void save_rte __P((u_char *, stru void ip_init() { - struct protosw *pr; + const struct protosw *pr; int i; - pool_init(&ipqent_pool, sizeof(struct ipqent), 0, 0, 0, "ipqepl", - NULL); - pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); if (pr == 0) panic("ip_init"); @@ -332,15 +409,21 @@ ip_init() if (pr->pr_domain->dom_family == PF_INET && pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) ip_protox[pr->pr_protocol] = pr - inetsw; - LIST_INIT(&ipq); - ip_id = time.tv_sec & 0xffff; + + for (i = 0; i < IPREASS_NHASH; i++) + LIST_INIT(&ipq[i]); + + ip_id = time.tv_sec & 0xfffff; + ipintrq.ifq_maxlen = ipqmaxlen; - TAILQ_INIT(&in_ifaddr); + ip_nmbclusters_changed(); + + TAILQ_INIT(&in_ifaddrhead); in_ifaddrhashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IFADDR, M_WAITOK, &in_ifaddrhash); - if (ip_mtudisc != 0) - ip_mtudisc_timeout_q = - rt_timer_queue_create(ip_mtudisc_timeout); + in_multihashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IPMADDR, + M_WAITOK, &in_multihash); + ip_mtudisc_timeout_q = rt_timer_queue_create(ip_mtudisc_timeout); #ifdef GATEWAY ipflow_init(); #endif @@ -355,11 +438,10 @@ ip_init() "error %d\n", i); #endif /* PFIL_HOOKS */ -#ifdef INET_CSUM_COUNTERS - evcnt_attach_static(&ip_hwcsum_bad); - evcnt_attach_static(&ip_hwcsum_ok); - evcnt_attach_static(&ip_swcsum); -#endif /* INET_CSUM_COUNTERS */ +#ifdef MBUFTRACE + MOWNER_ATTACH(&ip_tx_mowner); + MOWNER_ATTACH(&ip_rx_mowner); +#endif /* MBUFTRACE */ } struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; @@ -380,6 +462,7 @@ ipintr() splx(s); if (m == 0) return; + MCLAIM(m, &ip_rx_mowner); ip_input(m); } } @@ -398,26 +481,27 @@ ip_input(struct mbuf *m) struct ipqent *ipqe; int hlen = 0, mff, len; int downmatch; + int checkif; + int srcrt = 0; + u_int hash; +#ifdef FAST_IPSEC + struct m_tag *mtag; + struct tdb_ident *tdbi; + struct secpolicy *sp; + int s, error; +#endif /* FAST_IPSEC */ + MCLAIM(m, &ip_rx_mowner); #ifdef DIAGNOSTIC if ((m->m_flags & M_PKTHDR) == 0) panic("ipintr no HDR"); #endif -#ifdef IPSEC - /* - * should the inner packet be considered authentic? - * see comment in ah4_input(). - */ - if (m) { - m->m_flags &= ~M_AUTHIPHDR; - m->m_flags &= ~M_AUTHIPDGM; - } -#endif + /* * If no IP addresses have been set yet but the interfaces * are receiving, can't do anything with incoming packets yet. */ - if (TAILQ_FIRST(&in_ifaddr) == 0) + if (TAILQ_FIRST(&in_ifaddrhead) == 0) goto bad; ipstat.ips_total++; /* @@ -524,7 +608,7 @@ ip_input(struct mbuf *m) m_adj(m, len - m->m_pkthdr.len); } -#ifdef IPSEC +#if defined(IPSEC) /* ipflow (IP fast forwarding) is not compatible with IPsec. */ m->m_flags &= ~M_CANFASTFWD; #else @@ -549,17 +633,23 @@ ip_input(struct mbuf *m) */ #ifdef IPSEC if (!ipsec_getnhist(m)) +#elif defined(FAST_IPSEC) + if (!ipsec_indone(m)) #else if (1) #endif { + struct in_addr odst; + + odst = ip->ip_dst; if (pfil_run_hooks(&inet_pfil_hook, &m, m->m_pkthdr.rcvif, - PFIL_IN) != 0) - return; + PFIL_IN) != 0) + return; if (m == NULL) return; ip = mtod(m, struct ip *); hlen = ip->ip_hl << 2; + srcrt = (odst.s_addr != ip->ip_dst.s_addr); } #endif /* PFIL_HOOKS */ @@ -582,6 +672,26 @@ ip_input(struct mbuf *m) return; /* + * Enable a consistency check between the destination address + * and the arrival interface for a unicast packet (the RFC 1122 + * strong ES model) if IP forwarding is disabled and the packet + * is not locally generated. + * + * XXX - Checking also should be disabled if the destination + * address is ipnat'ed to a different interface. + * + * XXX - Checking is incompatible with IP aliases added + * to the loopback interface instead of the interface where + * the packets are received. + * + * XXX - We need to add a per ifaddr flag for this so that + * we get finer grain control. + */ + checkif = ip_checkinterface && (ipforwarding == 0) && + (m->m_pkthdr.rcvif != NULL) && + ((m->m_pkthdr.rcvif->if_flags & IFF_LOOPBACK) == 0); + + /* * Check our list of addresses, to see if the packet is for us. * * Traditional 4.4BSD did not consult IFF_UP at all. @@ -591,6 +701,8 @@ ip_input(struct mbuf *m) downmatch = 0; LIST_FOREACH(ia, &IN_IFADDR_HASH(ip->ip_dst.s_addr), ia_hash) { if (in_hosteq(ia->ia_addr.sin_addr, ip->ip_dst)) { + if (checkif && ia->ia_ifp != m->m_pkthdr.rcvif) + continue; if ((ia->ia_ifp->if_flags & IFF_UP) != 0) break; else @@ -703,8 +815,56 @@ ip_input(struct mbuf *m) goto bad; } #endif +#ifdef FAST_IPSEC + mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL); + s = splsoftnet(); + if (mtag != NULL) { + tdbi = (struct tdb_ident *)(mtag + 1); + sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); + } else { + sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, + IP_FORWARDING, &error); + } + if (sp == NULL) { /* NB: can happen if error */ + splx(s); + /*XXX error stat???*/ + DPRINTF(("ip_input: no SP for forwarding\n")); /*XXX*/ + goto bad; + } - ip_forward(m, 0); + /* + * Check security policy against packet attributes. + */ + error = ipsec_in_reject(sp, m); + KEY_FREESP(&sp); + splx(s); + if (error) { + ipstat.ips_cantforward++; + goto bad; + } + + /* + * Peek at the outbound SP for this packet to determine if + * it's a Fast Forward candidate. + */ + mtag = m_tag_find(m, PACKET_TAG_IPSEC_PENDING_TDB, NULL); + if (mtag != NULL) + m->m_flags &= ~M_CANFASTFWD; + else { + s = splsoftnet(); + sp = ipsec4_checkpolicy(m, IPSEC_DIR_OUTBOUND, + (IP_FORWARDING | + (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), + &error, NULL); + if (sp != NULL) { + m->m_flags &= ~M_CANFASTFWD; + KEY_FREESP(&sp); + } + splx(s); + } +#endif /* FAST_IPSEC */ + + ip_forward(m, srcrt); } return; @@ -730,12 +890,17 @@ ours: * of this datagram. */ IPQ_LOCK(); - LIST_FOREACH(fp, &ipq, ipq_q) + hash = IPREASS_HASH(ip->ip_src.s_addr, ip->ip_id); + /* XXX LIST_FOREACH(fp, &ipq[hash], ipq_q) */ + for (fp = LIST_FIRST(&ipq[hash]); fp != NULL; + fp = LIST_NEXT(fp, ipq_q)) { if (ip->ip_id == fp->ipq_id && in_hosteq(ip->ip_src, fp->ipq_src) && in_hosteq(ip->ip_dst, fp->ipq_dst) && ip->ip_p == fp->ipq_p) goto found; + + } fp = 0; found: @@ -776,7 +941,7 @@ found: ipqe->ipqe_mff = mff; ipqe->ipqe_m = m; ipqe->ipqe_ip = ip; - m = ip_reass(ipqe, fp); + m = ip_reass(ipqe, fp, &ipq[hash]); if (m == 0) { IPQ_UNLOCK(); return; @@ -791,7 +956,7 @@ found: IPQ_UNLOCK(); } -#ifdef IPSEC +#if defined(IPSEC) /* * enforce IPsec policy checking if we are seeing last header. * note that we do not visit this with protocols with pcb layer @@ -803,6 +968,45 @@ found: goto bad; } #endif +#if FAST_IPSEC + /* + * enforce IPsec policy checking if we are seeing last header. + * note that we do not visit this with protocols with pcb layer + * code - like udp/tcp/raw ip. + */ + if ((inetsw[ip_protox[ip->ip_p]].pr_flags & PR_LASTHDR) != 0) { + /* + * Check if the packet has already had IPsec processing + * done. If so, then just pass it along. This tag gets + * set during AH, ESP, etc. input handling, before the + * packet is returned to the ip input queue for delivery. + */ + mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL); + s = splsoftnet(); + if (mtag != NULL) { + tdbi = (struct tdb_ident *)(mtag + 1); + sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); + } else { + sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, + IP_FORWARDING, &error); + } + if (sp != NULL) { + /* + * Check security policy against packet attributes. + */ + error = ipsec_in_reject(sp, m); + KEY_FREESP(&sp); + } else { + /* XXX error stat??? */ + error = EINVAL; +DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/ + goto bad; + } + splx(s); + if (error) + goto bad; + } +#endif /* FAST_IPSEC */ /* * Switch out to protocol's input routine. @@ -834,9 +1038,10 @@ badcsum: * is given as fp; otherwise have to make a chain. */ struct mbuf * -ip_reass(ipqe, fp) +ip_reass(ipqe, fp, ipqhead) struct ipqent *ipqe; struct ipq *fp; + struct ipqhead *ipqhead; { struct mbuf *m = ipqe->ipqe_m; struct ipqent *nq, *p, *q; @@ -854,6 +1059,20 @@ ip_reass(ipqe, fp) m->m_data += hlen; m->m_len -= hlen; +#ifdef notyet + /* make sure fragment limit is up-to-date */ + CHECK_NMBCLUSTER_PARAMS(); + + /* If we have too many fragments, drop the older half. */ + if (ip_nfrags >= ip_maxfrags) + ip_reass_drophalf(void); +#endif + + /* + * We are about to add a fragment; increment frag count. + */ + ip_nfrags++; + /* * If first fragment to arrive, create a reassembly queue. */ @@ -873,7 +1092,8 @@ ip_reass(ipqe, fp) M_FTABLE, M_NOWAIT); if (fp == NULL) goto dropfrag; - LIST_INSERT_HEAD(&ipq, fp, ipq_q); + LIST_INSERT_HEAD(ipqhead, fp, ipq_q); + fp->ipq_nfrags = 1; fp->ipq_ttl = IPFRAGTTL; fp->ipq_p = ipqe->ipqe_ip->ip_p; fp->ipq_id = ipqe->ipqe_ip->ip_id; @@ -882,6 +1102,8 @@ ip_reass(ipqe, fp) fp->ipq_dst = ipqe->ipqe_ip->ip_dst; p = NULL; goto insert; + } else { + fp->ipq_nfrags++; } /* @@ -932,6 +1154,8 @@ ip_reass(ipqe, fp) m_freem(q->ipqe_m); TAILQ_REMOVE(&fp->ipq_fragq, q, ipqe_q); pool_put(&ipqent_pool, q); + fp->ipq_nfrags--; + ip_nfrags--; } insert: @@ -977,6 +1201,7 @@ insert: pool_put(&ipqent_pool, q); m_cat(m, t); } + ip_nfrags -= fp->ipq_nfrags; /* * Create header for new ip packet by @@ -1002,6 +1227,9 @@ insert: return (m); dropfrag: + if (fp != 0) + fp->ipq_nfrags--; + ip_nfrags--; ipstat.ips_fragdropped++; m_freem(m); pool_put(&ipqent_pool, ipqe); @@ -1017,21 +1245,95 @@ ip_freef(fp) struct ipq *fp; { struct ipqent *q, *p; + u_int nfrags = 0; IPQ_LOCK_CHECK(); for (q = TAILQ_FIRST(&fp->ipq_fragq); q != NULL; q = p) { p = TAILQ_NEXT(q, ipqe_q); m_freem(q->ipqe_m); + nfrags++; TAILQ_REMOVE(&fp->ipq_fragq, q, ipqe_q); pool_put(&ipqent_pool, q); } + + if (nfrags != fp->ipq_nfrags) + printf("ip_freef: nfrags %d != %d\n", fp->ipq_nfrags, nfrags); + ip_nfrags -= nfrags; LIST_REMOVE(fp, ipq_q); FREE(fp, M_FTABLE); ip_nfragpackets--; } /* + * IP reassembly TTL machinery for multiplicative drop. + */ +static u_int fragttl_histo[(IPFRAGTTL+1)]; + + +/* + * Decrement TTL of all reasembly queue entries by `ticks'. + * Count number of distinct fragments (as opposed to partial, fragmented + * datagrams) in the reassembly queue. While we traverse the entire + * reassembly queue, compute and return the median TTL over all fragments. + */ +static u_int +ip_reass_ttl_decr(u_int ticks) +{ + u_int nfrags, median, dropfraction, keepfraction; + struct ipq *fp, *nfp; + int i; + + nfrags = 0; + memset(fragttl_histo, 0, sizeof fragttl_histo); + + for (i = 0; i < IPREASS_NHASH; i++) { + for (fp = LIST_FIRST(&ipq[i]); fp != NULL; fp = nfp) { + fp->ipq_ttl = ((fp->ipq_ttl <= ticks) ? + 0 : fp->ipq_ttl - ticks); + nfp = LIST_NEXT(fp, ipq_q); + if (fp->ipq_ttl == 0) { + ipstat.ips_fragtimeout++; + ip_freef(fp); + } else { + nfrags += fp->ipq_nfrags; + fragttl_histo[fp->ipq_ttl] += fp->ipq_nfrags; + } + } + } + + KASSERT(ip_nfrags == nfrags); + + /* Find median (or other drop fraction) in histogram. */ + dropfraction = (ip_nfrags / 2); + keepfraction = ip_nfrags - dropfraction; + for (i = IPFRAGTTL, median = 0; i >= 0; i--) { + median += fragttl_histo[i]; + if (median >= keepfraction) + break; + } + + /* Return TTL of median (or other fraction). */ + return (u_int)i; +} + +void +ip_reass_drophalf(void) +{ + + u_int median_ticks; + /* + * Compute median TTL of all fragments, and count frags + * with that TTL or lower (roughly half of all fragments). + */ + median_ticks = ip_reass_ttl_decr(0); + + /* Drop half. */ + median_ticks = ip_reass_ttl_decr(median_ticks); + +} + +/* * IP timer processing; * if a timer expires on a reassembly * queue, discard it. @@ -1039,27 +1341,49 @@ ip_freef(fp) void ip_slowtimo() { - struct ipq *fp, *nfp; + static u_int dropscanidx = 0; + u_int i; + u_int median_ttl; int s = splsoftnet(); IPQ_LOCK(); - for (fp = LIST_FIRST(&ipq); fp != NULL; fp = nfp) { - nfp = LIST_NEXT(fp, ipq_q); - if (--fp->ipq_ttl == 0) { - ipstat.ips_fragtimeout++; - ip_freef(fp); - } - } + + /* Age TTL of all fragments by 1 tick .*/ + median_ttl = ip_reass_ttl_decr(1); + + /* make sure fragment limit is up-to-date */ + CHECK_NMBCLUSTER_PARAMS(); + + /* If we have too many fragments, drop the older half. */ + if (ip_nfrags > ip_maxfrags) + ip_reass_ttl_decr(median_ttl); + /* - * If we are over the maximum number of fragments + * If we are over the maximum number of fragmented packets * (due to the limit being lowered), drain off - * enough to get down to the new limit. + * enough to get down to the new limit. Start draining + * from the reassembly hashqueue most recently drained. */ if (ip_maxfragpackets < 0) ; else { - while (ip_nfragpackets > ip_maxfragpackets && LIST_FIRST(&ipq)) - ip_freef(LIST_FIRST(&ipq)); + int wrapped = 0; + + i = dropscanidx; + while (ip_nfragpackets > ip_maxfragpackets && wrapped == 0) { + while (LIST_FIRST(&ipq[i]) != NULL) + ip_freef(LIST_FIRST(&ipq[i])); + if (++i >= IPREASS_NHASH) { + i = 0; + } + /* + * Dont scan forever even if fragment counters are + * wrong: stop after scanning entire reassembly queue. + */ + if (i == dropscanidx) + wrapped = 1; + } + dropscanidx = i; } IPQ_UNLOCK(); #ifdef GATEWAY @@ -1082,10 +1406,11 @@ ip_drain() if (ipq_lock_try() == 0) return; - while (LIST_FIRST(&ipq) != NULL) { - ipstat.ips_fragdropped++; - ip_freef(LIST_FIRST(&ipq)); - } + /* + * Drop half the total fragments now. If more mbufs are needed, + * we will be called again soon. + */ + ip_reass_drophalf(); IPQ_UNLOCK(); } @@ -1186,7 +1511,7 @@ ip_dooptions(m) bcopy((caddr_t)(cp + off), (caddr_t)&ipaddr.sin_addr, sizeof(ipaddr.sin_addr)); if (opt == IPOPT_SSRR) - ia = ifatoia(ifa_ifwithaddr(sintosa(&ipaddr))); + ia = ifatoia(ifa_ifwithladdr(sintosa(&ipaddr))); else ia = ip_rtaddr(ipaddr.sin_addr); if (ia == 0) { @@ -1391,6 +1716,7 @@ ip_srcroute() if (m == 0) return ((struct mbuf *)0); + MCLAIM(m, &inetdomain.dom_mowner); #define OPTSIZ (sizeof(ip_srcrt.nop) + sizeof(ip_srcrt.srcopt)) /* length is (nhops+1)*sizeof(addr) + sizeof(nop + srcrt header) */ @@ -1506,11 +1832,16 @@ ip_forward(m, srcrt) struct mbuf *mcopy; n_long dest; struct ifnet *destifp; -#ifdef IPSEC +#if defined(IPSEC) || defined(FAST_IPSEC) struct ifnet dummyifp; #endif /* + * We are now in the output path. + */ + MCLAIM(m, &ip_tx_mowner); + + /* * Clear any in-bound checksum flags for this packet. */ m->m_pkthdr.csum_flags = 0; @@ -1594,12 +1925,10 @@ ip_forward(m, srcrt) } } -#ifdef IPSEC - /* Don't lookup socket in forwarding case */ - (void)ipsec_setsocket(m, NULL); -#endif error = ip_output(m, (struct mbuf *)0, &ipforward_rt, - (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), 0); + (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), + (struct ip_moptions *)NULL, (struct socket *)NULL); + if (error) ipstat.ips_cantforward++; else { @@ -1639,7 +1968,7 @@ ip_forward(m, srcrt) case EMSGSIZE: type = ICMP_UNREACH; code = ICMP_UNREACH_NEEDFRAG; -#ifndef IPSEC +#if !defined(IPSEC) && !defined(FAST_IPSEC) if (ipforward_rt.ro_rt) destifp = ipforward_rt.ro_rt->rt_ifp; #else @@ -1656,17 +1985,15 @@ ip_forward(m, srcrt) struct route *ro; sp = ipsec4_getpolicybyaddr(mcopy, - IPSEC_DIR_OUTBOUND, - IP_FORWARDING, - &ipsecerror); + IPSEC_DIR_OUTBOUND, IP_FORWARDING, + &ipsecerror); if (sp == NULL) destifp = ipforward_rt.ro_rt->rt_ifp; else { /* count IPsec header size */ ipsechdr = ipsec4_hdrsiz(mcopy, - IPSEC_DIR_OUTBOUND, - NULL); + IPSEC_DIR_OUTBOUND, NULL); /* * find the correct route for outer IPv4 @@ -1692,7 +2019,11 @@ ip_forward(m, srcrt) } } +#ifdef IPSEC key_freesp(sp); +#else + KEY_FREESP(&sp); +#endif } } #endif /*IPSEC*/ @@ -1779,160 +2110,208 @@ ip_savecontrol(inp, mp, ip, m) } } -int -ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen) - int *name; - u_int namelen; - void *oldp; - size_t *oldlenp; - void *newp; - size_t newlen; +/* + * sysctl helper routine for net.inet.ip.mtudisctimeout. checks the + * range of the new value and tweaks timers if it changes. + */ +static int +sysctl_net_inet_ip_pmtudto(SYSCTLFN_ARGS) { - extern int subnetsarelocal, hostzeroisbroadcast; - - int error, old; + int error, tmp; + struct sysctlnode node; - /* All sysctl names at this level are terminal. */ - if (namelen != 1) - return (ENOTDIR); - - switch (name[0]) { - case IPCTL_FORWARDING: - return (sysctl_int(oldp, oldlenp, newp, newlen, &ipforwarding)); - case IPCTL_SENDREDIRECTS: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ipsendredirects)); - case IPCTL_DEFTTL: - return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_defttl)); -#ifdef notyet - case IPCTL_DEFMTU: - return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_mtu)); -#endif - case IPCTL_FORWSRCRT: - /* Don't allow this to change in a secure environment. */ - if (securelevel > 0) - return (sysctl_rdint(oldp, oldlenp, newp, - ip_forwsrcrt)); - else - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_forwsrcrt)); - case IPCTL_DIRECTEDBCAST: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_directedbcast)); - case IPCTL_ALLOWSRCRT: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_allowsrcrt)); - case IPCTL_SUBNETSARELOCAL: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &subnetsarelocal)); - case IPCTL_MTUDISC: - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip_mtudisc); - if (ip_mtudisc != 0 && ip_mtudisc_timeout_q == NULL) { - ip_mtudisc_timeout_q = - rt_timer_queue_create(ip_mtudisc_timeout); - } else if (ip_mtudisc == 0 && ip_mtudisc_timeout_q != NULL) { - rt_timer_queue_destroy(ip_mtudisc_timeout_q, TRUE); - ip_mtudisc_timeout_q = NULL; - } - return error; - case IPCTL_ANONPORTMIN: - old = anonportmin; - error = sysctl_int(oldp, oldlenp, newp, newlen, &anonportmin); - if (anonportmin >= anonportmax || anonportmin < 0 - || anonportmin > 65535 -#ifndef IPNOPRIVPORTS - || anonportmin < IPPORT_RESERVED -#endif - ) { - anonportmin = old; - return (EINVAL); - } - return (error); - case IPCTL_ANONPORTMAX: - old = anonportmax; - error = sysctl_int(oldp, oldlenp, newp, newlen, &anonportmax); - if (anonportmin >= anonportmax || anonportmax < 0 - || anonportmax > 65535 -#ifndef IPNOPRIVPORTS - || anonportmax < IPPORT_RESERVED -#endif - ) { - anonportmax = old; - return (EINVAL); - } - return (error); - case IPCTL_MTUDISCTIMEOUT: - old = ip_mtudisc_timeout; - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip_mtudisc_timeout); - if (ip_mtudisc_timeout < 0) { - ip_mtudisc_timeout = old; - return (EINVAL); - } - if (ip_mtudisc_timeout_q != NULL) - rt_timer_queue_change(ip_mtudisc_timeout_q, - ip_mtudisc_timeout); + node = *rnode; + tmp = ip_mtudisc_timeout; + node.sysctl_data = &tmp; + error = sysctl_lookup(SYSCTLFN_CALL(&node)); + if (error || newp == NULL) return (error); + if (tmp < 0) + return (EINVAL); + + ip_mtudisc_timeout = tmp; + rt_timer_queue_change(ip_mtudisc_timeout_q, ip_mtudisc_timeout); + + return (0); +} + #ifdef GATEWAY - case IPCTL_MAXFLOWS: - { - int s; +/* + * sysctl helper routine for net.inet.ip.maxflows. apparently if + * maxflows is even looked up, we "reap flows". + */ +static int +sysctl_net_inet_ip_maxflows(SYSCTLFN_ARGS) +{ + int s; - error = sysctl_int(oldp, oldlenp, newp, newlen, - &ip_maxflows); - s = splsoftnet(); - ipflow_reap(0); - splx(s); - return (error); - } -#endif - case IPCTL_HOSTZEROBROADCAST: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &hostzeroisbroadcast)); -#if NGIF > 0 - case IPCTL_GIF_TTL: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_gif_ttl)); -#endif + s = sysctl_lookup(SYSCTLFN_CALL(rnode)); + if (s) + return (s); + + s = splsoftnet(); + ipflow_reap(0); + splx(s); -#if NGRE > 0 - case IPCTL_GRE_TTL: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_gre_ttl)); -#endif + return (0); +} +#endif /* GATEWAY */ -#ifndef IPNOPRIVPORTS - case IPCTL_LOWPORTMIN: - old = lowportmin; - error = sysctl_int(oldp, oldlenp, newp, newlen, &lowportmin); - if (lowportmin >= lowportmax - || lowportmin > IPPORT_RESERVEDMAX - || lowportmin < IPPORT_RESERVEDMIN - ) { - lowportmin = old; - return (EINVAL); - } - return (error); - case IPCTL_LOWPORTMAX: - old = lowportmax; - error = sysctl_int(oldp, oldlenp, newp, newlen, &lowportmax); - if (lowportmin >= lowportmax - || lowportmax > IPPORT_RESERVEDMAX - || lowportmax < IPPORT_RESERVEDMIN - ) { - lowportmax = old; - return (EINVAL); - } - return (error); -#endif - case IPCTL_MAXFRAGPACKETS: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_maxfragpackets)); +SYSCTL_SETUP(sysctl_net_inet_ip_setup, "sysctl net.inet.ip subtree setup") +{ + extern int subnetsarelocal, hostzeroisbroadcast; - default: - return (EOPNOTSUPP); - } - /* NOTREACHED */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "net", NULL, + NULL, 0, NULL, 0, + CTL_NET, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "inet", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "ip", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET, IPPROTO_IP, CTL_EOL); + + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "forwarding", NULL, + NULL, 0, &ipforwarding, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_FORWARDING, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "redirect", NULL, + NULL, 0, &ipsendredirects, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_SENDREDIRECTS, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "ttl", NULL, + NULL, 0, &ip_defttl, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_DEFTTL, CTL_EOL); +#ifdef IPCTL_DEFMTU + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT /* |CTLFLAG_READWRITE? */, + CTLTYPE_INT, "mtu", NULL, + NULL, 0, &ip_mtu, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_DEFMTU, CTL_EOL); +#endif /* IPCTL_DEFMTU */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READONLY1, + CTLTYPE_INT, "forwsrcrt", NULL, + NULL, 0, &ip_forwsrcrt, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_FORWSRCRT, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "directed-broadcast", NULL, + NULL, 0, &ip_directedbcast, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_DIRECTEDBCAST, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "allowsrcrt", NULL, + NULL, 0, &ip_allowsrcrt, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_ALLOWSRCRT, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "subnetsarelocal", NULL, + NULL, 0, &subnetsarelocal, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_SUBNETSARELOCAL, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "mtudisc", NULL, + NULL, 0, &ip_mtudisc, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_MTUDISC, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "anonportmin", NULL, + sysctl_net_inet_ip_ports, 0, &anonportmin, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_ANONPORTMIN, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "anonportmax", NULL, + sysctl_net_inet_ip_ports, 0, &anonportmax, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_ANONPORTMAX, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "mtudisctimeout", NULL, + sysctl_net_inet_ip_pmtudto, 0, &ip_mtudisc_timeout, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_MTUDISCTIMEOUT, CTL_EOL); +#ifdef GATEWAY + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "maxflows", NULL, + sysctl_net_inet_ip_maxflows, 0, &ip_maxflows, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_MAXFLOWS, CTL_EOL); +#endif /* GATEWAY */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "hostzerobroadcast", NULL, + NULL, 0, &hostzeroisbroadcast, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_HOSTZEROBROADCAST, CTL_EOL); +#if NGIF > 0 + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "gifttl", NULL, + NULL, 0, &ip_gif_ttl, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_GIF_TTL, CTL_EOL); +#endif /* NGIF */ +#ifndef IPNOPRIVPORTS + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "lowportmin", NULL, + sysctl_net_inet_ip_ports, 0, &lowportmin, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_LOWPORTMIN, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "lowportmax", NULL, + sysctl_net_inet_ip_ports, 0, &lowportmax, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_LOWPORTMAX, CTL_EOL); +#endif /* IPNOPRIVPORTS */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "maxfragpackets", NULL, + NULL, 0, &ip_maxfragpackets, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_MAXFRAGPACKETS, CTL_EOL); +#if NGRE > 0 + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "grettl", NULL, + NULL, 0, &ip_gre_ttl, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_GRE_TTL, CTL_EOL); +#endif /* NGRE */ + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "checkinterface", NULL, + NULL, 0, &ip_checkinterface, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_CHECKINTERFACE, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "random_id", NULL, + NULL, 0, &ip_do_randomid, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_RANDOMID, CTL_EOL); }