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.169.2.7 retrieving revision 1.182 diff -u -p -r1.169.2.7 -r1.182 --- src/sys/netinet/ip_input.c 2005/04/01 14:31:50 1.169.2.7 +++ src/sys/netinet/ip_input.c 2003/11/12 15:00:05 1.182 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.169.2.7 2005/04/01 14:31:50 skrll Exp $ */ +/* $NetBSD: ip_input.c,v 1.182 2003/11/12 15:00:05 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -98,9 +98,8 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.169.2.7 2005/04/01 14:31:50 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.182 2003/11/12 15:00:05 itojun Exp $"); -#include "opt_inet.h" #include "opt_gateway.h" #include "opt_pfil_hooks.h" #include "opt_ipsec.h" @@ -198,10 +197,6 @@ int ip_mtudisc_timeout = IPMTUDISCTIMEOU #ifdef DIAGNOSTIC int ipprintfs = 0; #endif - -int ip_do_randomid = 0; -int ip_do_loopback_cksum = 0; - /* * XXX - Setting ip_checkinterface mostly implements the receive side of * the Strong ES model described in RFC 1122, but since the routing table @@ -220,70 +215,32 @@ 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_ifaddrhead; +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; -uint16_t ip_id; #ifdef PFIL_HOOKS struct pfil_head inet_pfil_hook; #endif -/* - * 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(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]; +struct ipqhead ipq; int ipq_locked; -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(u_int ticks); -static void ip_reass_drophalf(void); +int ip_nfragpackets = 0; +int ip_maxfragpackets = 200; - -static __inline int ipq_lock_try(void); -static __inline void ipq_unlock(void); +static __inline int ipq_lock_try __P((void)); +static __inline void ipq_unlock __P((void)); static __inline int -ipq_lock_try(void) +ipq_lock_try() { int s; @@ -302,7 +259,7 @@ ipq_lock_try(void) } static __inline void -ipq_unlock(void) +ipq_unlock() { int s; @@ -333,8 +290,8 @@ do { \ #define IPQ_UNLOCK() ipq_unlock() -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); +struct pool inmulti_pool; +struct pool ipqent_pool; #ifdef INET_CSUM_COUNTERS #include @@ -348,10 +305,6 @@ 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 */ @@ -373,7 +326,7 @@ static struct ip_srcrt { struct in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)]; } ip_srcrt; -static void save_rte(u_char *, struct in_addr); +static void save_rte __P((u_char *, struct in_addr)); #ifdef MBUFTRACE struct mowner ip_rx_mowner = { "internet", "rx" }; @@ -381,25 +334,20 @@ struct mowner ip_tx_mowner = { "internet #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. */ void -ip_init(void) +ip_init() { - const struct protosw *pr; + struct protosw *pr; int i; + 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); + pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); if (pr == 0) panic("ip_init"); @@ -410,15 +358,8 @@ ip_init(void) if (pr->pr_domain->dom_family == PF_INET && pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) ip_protox[pr->pr_protocol] = pr - inetsw; - - for (i = 0; i < IPREASS_NHASH; i++) - LIST_INIT(&ipq[i]); - - ip_id = time.tv_sec & 0xfffff; - + LIST_INIT(&ipq); ipintrq.ifq_maxlen = ipqmaxlen; - ip_nmbclusters_changed(); - TAILQ_INIT(&in_ifaddrhead); in_ifaddrhashtbl = hashinit(IN_IFADDR_HASH_SIZE, HASH_LIST, M_IFADDR, M_WAITOK, &in_ifaddrhash); @@ -439,6 +380,12 @@ ip_init(void) "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); @@ -452,7 +399,7 @@ struct route ipforward_rt; * IP software interrupt routine */ void -ipintr(void) +ipintr() { int s; struct mbuf *m; @@ -484,7 +431,6 @@ ip_input(struct mbuf *m) int downmatch; int checkif; int srcrt = 0; - u_int hash; #ifdef FAST_IPSEC struct m_tag *mtag; struct tdb_ident *tdbi; @@ -573,16 +519,10 @@ ip_input(struct mbuf *m) break; default: - /* - * Must compute it ourselves. Maybe skip checksum on - * loopback interfaces. - */ - if (__predict_true(!(m->m_pkthdr.rcvif->if_flags & - IFF_LOOPBACK) || ip_do_loopback_cksum)) { - INET_CSUM_COUNTER_INCR(&ip_swcsum); - if (in_cksum(m, hlen) != 0) - goto badcsum; - } + /* Must compute it ourselves. */ + INET_CSUM_COUNTER_INCR(&ip_swcsum); + if (in_cksum(m, hlen) != 0) + goto bad; break; } @@ -615,7 +555,7 @@ ip_input(struct mbuf *m) m_adj(m, len - m->m_pkthdr.len); } -#if defined(IPSEC) +#ifdef IPSEC /* ipflow (IP fast forwarding) is not compatible with IPsec. */ m->m_flags &= ~M_CANFASTFWD; #else @@ -640,8 +580,6 @@ ip_input(struct mbuf *m) */ #ifdef IPSEC if (!ipsec_getnhist(m)) -#elif defined(FAST_IPSEC) - if (!ipsec_indone(m)) #else if (1) #endif @@ -656,20 +594,6 @@ ip_input(struct mbuf *m) return; ip = mtod(m, struct ip *); hlen = ip->ip_hl << 2; - /* - * XXX The setting of "srcrt" here is to prevent ip_forward() - * from generating ICMP redirects for packets that have - * been redirected by a hook back out on to the same LAN that - * they came from and is not an indication that the packet - * is being inffluenced by source routing options. This - * allows things like - * "rdr tlp0 0/0 port 80 -> 1.1.1.200 3128 tcp" - * where tlp0 is both on the 1.1.1.0/24 network and is the - * default route for hosts on 1.1.1.0/24. Of course this - * also requires a "map tlp0 ..." to complete the story. - * One might argue whether or not this kind of network config. - * should be supported in this manner... - */ srcrt = (odst.s_addr != ip->ip_dst.s_addr); } #endif /* PFIL_HOOKS */ @@ -733,7 +657,7 @@ ip_input(struct mbuf *m) if (ia != NULL) goto ours; if (m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) { - IFADDR_FOREACH(ifa, m->m_pkthdr.rcvif) { + TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrlist, ifa_list) { if (ifa->ifa_addr->sa_family != AF_INET) continue; ia = ifatoia(ifa); @@ -759,6 +683,14 @@ ip_input(struct mbuf *m) #ifdef MROUTING extern struct socket *ip_mrouter; + if (M_READONLY(m)) { + if ((m = m_pullup(m, hlen)) == 0) { + ipstat.ips_toosmall++; + return; + } + ip = mtod(m, struct ip *); + } + if (ip_mrouter) { /* * If we are acting as a multicast router, all @@ -836,7 +768,7 @@ ip_input(struct mbuf *m) sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); } else { sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, - IP_FORWARDING, &error); + IP_FORWARDING, &error); } if (sp == NULL) { /* NB: can happen if error */ splx(s); @@ -855,26 +787,6 @@ ip_input(struct mbuf *m) 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); @@ -890,23 +802,25 @@ ours: * but it's not worth the time; just let them time out.) */ if (ip->ip_off & ~htons(IP_DF|IP_RF)) { + if (M_READONLY(m)) { + if ((m = m_pullup(m, hlen)) == NULL) { + ipstat.ips_toosmall++; + goto bad; + } + ip = mtod(m, struct ip *); + } /* * Look for queue of fragments * of this datagram. */ IPQ_LOCK(); - 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)) { + LIST_FOREACH(fp, &ipq, 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: @@ -947,7 +861,7 @@ found: ipqe->ipqe_mff = mff; ipqe->ipqe_m = m; ipqe->ipqe_ip = ip; - m = ip_reass(ipqe, fp, &ipq[hash]); + m = ip_reass(ipqe, fp); if (m == 0) { IPQ_UNLOCK(); return; @@ -986,7 +900,7 @@ found: * 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) { @@ -994,7 +908,7 @@ found: sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); } else { sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, - IP_FORWARDING, &error); + IP_FORWARDING, &error); } if (sp != NULL) { /* @@ -1044,7 +958,9 @@ badcsum: * is given as fp; otherwise have to make a chain. */ struct mbuf * -ip_reass(struct ipqent *ipqe, struct ipq *fp, struct ipqhead *ipqhead) +ip_reass(ipqe, fp) + struct ipqent *ipqe; + struct ipq *fp; { struct mbuf *m = ipqe->ipqe_m; struct ipqent *nq, *p, *q; @@ -1062,20 +978,6 @@ ip_reass(struct ipqent *ipqe, struct ipq 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. */ @@ -1095,8 +997,7 @@ ip_reass(struct ipqent *ipqe, struct ipq M_FTABLE, M_NOWAIT); if (fp == NULL) goto dropfrag; - LIST_INSERT_HEAD(ipqhead, fp, ipq_q); - fp->ipq_nfrags = 1; + LIST_INSERT_HEAD(&ipq, fp, ipq_q); fp->ipq_ttl = IPFRAGTTL; fp->ipq_p = ipqe->ipqe_ip->ip_p; fp->ipq_id = ipqe->ipqe_ip->ip_id; @@ -1105,8 +1006,6 @@ ip_reass(struct ipqent *ipqe, struct ipq fp->ipq_dst = ipqe->ipqe_ip->ip_dst; p = NULL; goto insert; - } else { - fp->ipq_nfrags++; } /* @@ -1157,8 +1056,6 @@ ip_reass(struct ipqent *ipqe, struct ipq m_freem(q->ipqe_m); TAILQ_REMOVE(&fp->ipq_fragq, q, ipqe_q); pool_put(&ipqent_pool, q); - fp->ipq_nfrags--; - ip_nfrags--; } insert: @@ -1204,7 +1101,6 @@ insert: pool_put(&ipqent_pool, q); m_cat(m, t); } - ip_nfrags -= fp->ipq_nfrags; /* * Create header for new ip packet by @@ -1226,14 +1122,10 @@ insert: for (t = m; t; t = t->m_next) plen += t->m_len; m->m_pkthdr.len = plen; - m->m_pkthdr.csum_flags = 0; } return (m); dropfrag: - if (fp != 0) - fp->ipq_nfrags--; - ip_nfrags--; ipstat.ips_fragdropped++; m_freem(m); pool_put(&ipqent_pool, ipqe); @@ -1245,148 +1137,53 @@ dropfrag: * associated datagrams. */ void -ip_freef(struct ipq *fp) +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. */ void -ip_slowtimo(void) +ip_slowtimo() { - static u_int dropscanidx = 0; - u_int i; - u_int median_ttl; + struct ipq *fp, *nfp; int s = splsoftnet(); IPQ_LOCK(); - - /* 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); - + 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); + } + } /* - * If we are over the maximum number of fragmented packets + * If we are over the maximum number of fragments * (due to the limit being lowered), drain off - * enough to get down to the new limit. Start draining - * from the reassembly hashqueue most recently drained. + * enough to get down to the new limit. */ if (ip_maxfragpackets < 0) ; else { - 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; + while (ip_nfragpackets > ip_maxfragpackets && LIST_FIRST(&ipq)) + ip_freef(LIST_FIRST(&ipq)); } IPQ_UNLOCK(); #ifdef GATEWAY @@ -1399,7 +1196,7 @@ ip_slowtimo(void) * Drain off all datagram fragments. */ void -ip_drain(void) +ip_drain() { /* @@ -1409,11 +1206,10 @@ ip_drain(void) if (ipq_lock_try() == 0) return; - /* - * Drop half the total fragments now. If more mbufs are needed, - * we will be called again soon. - */ - ip_reass_drophalf(); + while (LIST_FIRST(&ipq) != NULL) { + ipstat.ips_fragdropped++; + ip_freef(LIST_FIRST(&ipq)); + } IPQ_UNLOCK(); } @@ -1426,7 +1222,8 @@ ip_drain(void) * 0 if the packet should be processed further. */ int -ip_dooptions(struct mbuf *m) +ip_dooptions(m) + struct mbuf *m; { struct ip *ip = mtod(m, struct ip *); u_char *cp, *cp0; @@ -1513,7 +1310,7 @@ ip_dooptions(struct mbuf *m) bcopy((caddr_t)(cp + off), (caddr_t)&ipaddr.sin_addr, sizeof(ipaddr.sin_addr)); if (opt == IPOPT_SSRR) - ia = ifatoia(ifa_ifwithladdr(sintosa(&ipaddr))); + ia = ifatoia(ifa_ifwithaddr(sintosa(&ipaddr))); else ia = ip_rtaddr(ipaddr.sin_addr); if (ia == 0) { @@ -1655,7 +1452,8 @@ bad: * return internet address info of interface to be used to get there. */ struct in_ifaddr * -ip_rtaddr(struct in_addr dst) +ip_rtaddr(dst) + struct in_addr dst; { struct sockaddr_in *sin; @@ -1682,7 +1480,9 @@ ip_rtaddr(struct in_addr dst) * to be picked up later by ip_srcroute if the receiver is interested. */ void -save_rte(u_char *option, struct in_addr dst) +save_rte(option, dst) + u_char *option; + struct in_addr dst; { unsigned olen; @@ -1704,7 +1504,7 @@ save_rte(u_char *option, struct in_addr * The first hop is placed before the options, will be removed later. */ struct mbuf * -ip_srcroute(void) +ip_srcroute() { struct in_addr *p, *q; struct mbuf *m; @@ -1776,7 +1576,9 @@ ip_srcroute(void) * XXX should be deleted; last arg currently ignored. */ void -ip_stripoptions(struct mbuf *m, struct mbuf *mopt) +ip_stripoptions(m, mopt) + struct mbuf *m; + struct mbuf *mopt; { int i; struct ip *ip = mtod(m, struct ip *); @@ -1818,7 +1620,9 @@ const int inetctlerrmap[PRC_NCMDS] = { * via a source route. */ void -ip_forward(struct mbuf *m, int srcrt) +ip_forward(m, srcrt) + struct mbuf *m; + int srcrt; { struct ip *ip = mtod(m, struct ip *); struct sockaddr_in *sin; @@ -2046,8 +1850,11 @@ ip_forward(struct mbuf *m, int srcrt) } void -ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip, - struct mbuf *m) +ip_savecontrol(inp, mp, ip, m) + struct inpcb *inp; + struct mbuf **mp; + struct ip *ip; + struct mbuf *m; { if (inp->inp_socket->so_options & SO_TIMESTAMP) { @@ -2102,244 +1909,163 @@ ip_savecontrol(struct inpcb *inp, struct } } -/* - * 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) +int +ip_sysctl(name, namelen, oldp, oldlenp, newp, newlen) + int *name; + u_int namelen; + void *oldp; + size_t *oldlenp; + void *newp; + size_t newlen; { - int error, tmp; - struct sysctlnode node; - - 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); + extern int subnetsarelocal, hostzeroisbroadcast; - ip_mtudisc_timeout = tmp; - rt_timer_queue_change(ip_mtudisc_timeout_q, ip_mtudisc_timeout); - - return (0); -} + int error, old; + /* All sysctl names (except ifq.*) at this level are terminal. */ + if ((namelen != 1) && !(namelen == 2 && name[0] == IPCTL_IFQ)) + 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 (error == 0 && ip_mtudisc == 0) + rt_timer_queue_remove_all(ip_mtudisc_timeout_q, TRUE); + 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 (error == 0) + rt_timer_queue_change(ip_mtudisc_timeout_q, + ip_mtudisc_timeout); + return (error); #ifdef GATEWAY -/* - * 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; + case IPCTL_MAXFLOWS: + { + int s; - s = sysctl_lookup(SYSCTLFN_CALL(rnode)); - if (s) - return (s); - - s = splsoftnet(); - ipflow_reap(0); - splx(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 - return (0); -} -#endif /* GATEWAY */ +#if NGRE > 0 + case IPCTL_GRE_TTL: + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_gre_ttl)); +#endif +#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 -SYSCTL_SETUP(sysctl_net_inet_ip_setup, "sysctl net.inet.ip subtree setup") -{ - extern int subnetsarelocal, hostzeroisbroadcast; + case IPCTL_MAXFRAGPACKETS: + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_maxfragpackets)); + + case IPCTL_CHECKINTERFACE: + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_checkinterface)); + + case IPCTL_IFQ: + return (sysctl_ifq(name + 1, namelen - 1, oldp, oldlenp, + newp, newlen, &ipintrq)); - 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", - SYSCTL_DESCR("PF_INET related settings"), - NULL, 0, NULL, 0, - CTL_NET, PF_INET, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, - CTLTYPE_NODE, "ip", - SYSCTL_DESCR("IPv4 related settings"), - 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", - SYSCTL_DESCR("Enable forwarding of INET datagrams"), - 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", - SYSCTL_DESCR("Enable sending of ICMP redirect messages"), - 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", - SYSCTL_DESCR("Default TTL for an INET datagram"), - 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", - SYSCTL_DESCR("Default MTA for an INET route"), - 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", - SYSCTL_DESCR("Enable forwarding of source-routed " - "datagrams"), - 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", - SYSCTL_DESCR("Enable forwarding of broadcast datagrams"), - 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", - SYSCTL_DESCR("Accept source-routed datagrams"), - 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", - SYSCTL_DESCR("Whether logical subnets are considered " - "local"), - 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", - SYSCTL_DESCR("Use RFC1191 Path MTU Discovery"), - 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", - SYSCTL_DESCR("Lowest ephemeral port number to assign"), - 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", - SYSCTL_DESCR("Highest ephemeral port number to assign"), - 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", - SYSCTL_DESCR("Lifetime of a Path MTU Discovered route"), - 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", - SYSCTL_DESCR("Number of flows for fast forwarding"), - 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", - SYSCTL_DESCR("All zeroes address is broadcast address"), - 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", - SYSCTL_DESCR("Default TTL for a gif tunnel datagram"), - 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", - SYSCTL_DESCR("Lowest privileged ephemeral port number " - "to assign"), - 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", - SYSCTL_DESCR("Highest privileged ephemeral port number " - "to assign"), - 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", - SYSCTL_DESCR("Maximum number of fragments to retain for " - "possible reassembly"), - 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", - SYSCTL_DESCR("Default TTL for a gre tunnel datagram"), - 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", - SYSCTL_DESCR("Enable receive side of Strong ES model " - "from RFC1122"), - 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", - SYSCTL_DESCR("Assign random ip_id values"), - NULL, 0, &ip_do_randomid, 0, - CTL_NET, PF_INET, IPPROTO_IP, - IPCTL_RANDOMID, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT|CTLFLAG_READWRITE, - CTLTYPE_INT, "do_loopback_cksum", - SYSCTL_DESCR("Perform IP checksum on loopback"), - NULL, 0, &ip_do_loopback_cksum, 0, - CTL_NET, PF_INET, IPPROTO_IP, - IPCTL_LOOPBACKCKSUM, CTL_EOL); + default: + return (EOPNOTSUPP); + } + /* NOTREACHED */ }