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.187 retrieving revision 1.196 diff -u -p -r1.187 -r1.196 --- src/sys/netinet/ip_input.c 2003/11/26 21:15:47 1.187 +++ src/sys/netinet/ip_input.c 2004/01/15 05:13:17 1.196 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.187 2003/11/26 21:15:47 itojun Exp $ */ +/* $NetBSD: ip_input.c,v 1.196 2004/01/15 05:13:17 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.187 2003/11/26 21:15:47 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.196 2004/01/15 05:13:17 itojun Exp $"); #include "opt_inet.h" #include "opt_gateway.h" @@ -236,10 +236,48 @@ uint16_t ip_id; 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)); @@ -339,6 +377,16 @@ 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. */ @@ -363,9 +411,15 @@ 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); + + for (i = 0; i < IPREASS_NHASH; i++) + LIST_INIT(&ipq[i]); + ip_id = time.tv_sec & 0xfffff; + 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); @@ -437,6 +491,7 @@ 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; @@ -561,7 +616,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 @@ -795,6 +850,26 @@ 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); @@ -823,12 +898,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: @@ -869,7 +949,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; @@ -966,9 +1046,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; @@ -986,6 +1067,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. */ @@ -1005,7 +1100,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; @@ -1014,6 +1110,8 @@ ip_reass(ipqe, fp) fp->ipq_dst = ipqe->ipqe_ip->ip_dst; p = NULL; goto insert; + } else { + fp->ipq_nfrags++; } /* @@ -1064,6 +1162,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: @@ -1109,6 +1209,7 @@ insert: pool_put(&ipqent_pool, q); m_cat(m, t); } + ip_nfrags -= fp->ipq_nfrags; /* * Create header for new ip packet by @@ -1134,6 +1235,9 @@ insert: return (m); dropfrag: + if (fp != 0) + fp->ipq_nfrags--; + ip_nfrags--; ipstat.ips_fragdropped++; m_freem(m); pool_put(&ipqent_pool, ipqe); @@ -1149,21 +1253,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 i, nfrags, median; + struct ipq *fp, *nfp; + u_int dropfraction, keepfraction; + + 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. @@ -1171,27 +1349,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 @@ -1214,10 +1414,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(); } @@ -1318,7 +1519,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) { @@ -1917,167 +2118,184 @@ 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 (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); + 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)); - - 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)); - - case IPCTL_RANDOMID: - return (sysctl_int(oldp, oldlenp, newp, newlen, - &ip_do_randomid)); +SYSCTL_SETUP(sysctl_net_inet_ip_setup, "sysctl net.inet.ip subtree setup") +{ + extern int subnetsarelocal, hostzeroisbroadcast; - default: - return (EOPNOTSUPP); - } - /* NOTREACHED */ + sysctl_createv(SYSCTL_PERMANENT, + CTLTYPE_NODE, "net", NULL, + NULL, 0, NULL, 0, + CTL_NET, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT, + CTLTYPE_NODE, "inet", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT, + CTLTYPE_NODE, "ip", NULL, + NULL, 0, NULL, 0, + CTL_NET, PF_INET, IPPROTO_IP, CTL_EOL); + + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "forwarding", NULL, + NULL, 0, &ipforwarding, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_FORWARDING, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "redirect", NULL, + NULL, 0, &ipsendredirects, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_SENDREDIRECTS, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT /* |SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_READONLY1, + CTLTYPE_INT, "forwsrcrt", NULL, + NULL, 0, &ip_forwsrcrt, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_FORWSRCRT, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "directed-broadcast", NULL, + NULL, 0, &ip_directedbcast, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_DIRECTEDBCAST, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "allowsrcrt", NULL, + NULL, 0, &ip_allowsrcrt, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_ALLOWSRCRT, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "subnetsarelocal", NULL, + NULL, 0, &subnetsarelocal, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_SUBNETSARELOCAL, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "mtudisc", NULL, + NULL, 0, &ip_mtudisc, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_MTUDISC, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "hostzerobroadcast", NULL, + NULL, 0, &hostzeroisbroadcast, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_HOSTZEROBROADCAST, CTL_EOL); +#if NGIF > 0 + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_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(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "checkinterface", NULL, + NULL, 0, &ip_checkinterface, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_CHECKINTERFACE, CTL_EOL); + sysctl_createv(SYSCTL_PERMANENT|SYSCTL_READWRITE, + CTLTYPE_INT, "random_id", NULL, + NULL, 0, &ip_do_randomid, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_RANDOMID, CTL_EOL); }