diff options
author | obrien <obrien@FreeBSD.org> | 2001-06-01 09:51:14 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2001-06-01 09:51:14 +0000 |
commit | 538a64fd6b278358acfa4573bfb607fb26100b35 (patch) | |
tree | de07c25560cbb107d4ebe3539548a69d389f7456 /sys/netinet/ip_input.c | |
parent | e737f3aa3b5bba6b224879bce4faaae65ff25d55 (diff) | |
download | FreeBSD-src-538a64fd6b278358acfa4573bfb607fb26100b35.zip FreeBSD-src-538a64fd6b278358acfa4573bfb607fb26100b35.tar.gz |
Back out jesper's 2001/05/31 14:58:11 PDT commit. It does not compile.
Diffstat (limited to 'sys/netinet/ip_input.c')
-rw-r--r-- | sys/netinet/ip_input.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 71ecf06..0963a0a 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -124,12 +124,6 @@ SYSCTL_INT(_net_inet_ip, IPCTL_KEEPFAITH, keepfaith, CTLFLAG_RW, &ip_keepfaith, 0, "Enable packet capture for FAITH IPv4->IPv6 translater daemon"); -static int ip_nfragpackets = 0; -static int ip_maxfragpackets = NMBCLUSTERS/4; -SYSCTL_INT(_net_inet_ip, OID_AUTO, maxfragpackets, CTLFLAG_RW, - &ip_maxfragpackets, 0, - "Maximum number of IPv4 fragment reassembly queue entries"); - /* * XXX - Setting ip_checkinterface mostly implements the receive side of * the Strong ES model described in RFC 1122, but since the routing table @@ -868,15 +862,6 @@ ip_reass(m, head, fp) * If first fragment to arrive, create a reassembly queue. */ if (fp == 0) { - /* - * Enforce upper bound on number of fragmented packets - * for which we attempt reassembly; - * If maxfrag is 0, never accept fragments. - * If maxfrag is -1, accept all fragments without limitation. - */ - if ((ip_maxfragpackets >= 0) && (ip_nfragpackets >= ip_maxfragpackets)) - goto dropfrag; - ip_nfragpackets++; if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL) goto dropfrag; fp = mtod(t, struct ipq *); @@ -1025,7 +1010,6 @@ inserted: TAILQ_REMOVE(head, fp, ipq_list); nipq--; (void) m_free(dtom(fp)); - ip_nfragpackets--; m->m_len += (IP_VHL_HL(ip->ip_vhl) << 2); m->m_data -= (IP_VHL_HL(ip->ip_vhl) << 2); /* some debugging cruft by sklower, below, will go away soon */ @@ -1067,7 +1051,6 @@ ip_freef(fhp, fp) } TAILQ_REMOVE(fhp, fp, ipq_list); (void) m_free(dtom(fp)); - ip_nfragpackets--; nipq--; } @@ -1095,20 +1078,6 @@ ip_slowtimo() } } } - /* - * 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. - */ - for (i = 0; i < IPREASS_NHASH; i++) { - if (ip_maxfragpackets >= 0) { - while (ip_nfragpackets > ip_maxfragpackets && - !TAILQ_EMPTY(&ipq[i])) { - ipstat.ips_fragdropped++; - ip_freef(&ipq[i], TAILQ_FIRST(&ipq[i])); - } - } - } ipflow_slowtimo(); splx(s); } |