Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Prevent hang when attempting to flush state entries for ipv4 when ipv6

Browse Source 
are present or vice versa
* Fix matching of IPv6 state entries when the initial packet is a
  sent to a multicast address.  This includes not updating the address as
  being fixed when a second (or further) such packet is seen before a reply.
* Disable code, for now, that limited how many ICMP packets could match a
  state entry based on the number of real packets seen.
This commit is contained in:
darrenr 2004-10-07 03:57:02 +00:00
parent f01f5b2f9e
commit 8fe036145c
1 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
sys/dist/ipf/netinet/ip_state.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_state.c,v 1.1 2004/10/01 15:26:00 christos Exp $ */
/* $NetBSD: ip_state.c,v 1.2 2004/10/07 03:57:02 darrenr Exp $ */
/*
* Copyright (C) 1995-2003 by Darren Reed.
@ -110,7 +110,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.1 2004/10/01 15:26:00 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.2 2004/10/07 03:57:02 darrenr Exp $");
#else
static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_state.c,v 2.186.2.13 2004/06/13 23:49:34 darrenr Exp";
@ -826,7 +826,7 @@ u_int flags;
/*
* So you can do keep state with neighbour discovery.
*/
flags |= SI_W_DADDR;
is->is_flags |= SI_W_DADDR;
hv -= is->is_daddr;
} else {
hv += is->is_dst.i6[1];
@ -845,9 +845,6 @@ u_int flags;
case IPPROTO_ICMPV6 :
ic = fin->fin_dp;
if ((ic->icmp_type & ICMP6_INFOMSG_MASK) == 0)
return NULL;
switch (ic->icmp_type)
{
case ICMP6_ECHO_REQUEST :
@ -1647,22 +1644,62 @@ u_32_t cmask;
/*
* Only one of the source or destination address can be flaged as a
* wildcard. Fill in the missing address, if set.
* For IPv6, if the address being copied in is multicast, then
* don't reset the wild flag - multicast causes it to be set in the
* first place!
*/
if ((flags & (SI_W_SADDR|SI_W_DADDR))) {
fr_ip_t *fi = &fin->fin_fi;
if ((flags & SI_W_SADDR) != 0) {
if (rev == 0) {
is->is_src = fin->fin_fi.fi_src;
#ifdef USE_INET6
if (is->is_v == 6 &&
IN6_IS_ADDR_MULTICAST(&fi->fi_src.in6))
/*EMPTY*/;
else
#endif
{
is->is_src = fi->fi_src;
is->is_flags &= ~SI_W_SADDR;
}
} else {
is->is_src = fin->fin_fi.fi_dst;
#ifdef USE_INET6
if (is->is_v == 6 &&
IN6_IS_ADDR_MULTICAST(&fi->fi_dst.in6))
/*EMPTY*/;
else
#endif
{
is->is_src = fi->fi_dst;
is->is_flags &= ~SI_W_SADDR;
}
}
} else if ((flags & SI_W_DADDR) != 0) {
if (rev == 0) {
is->is_dst = fin->fin_fi.fi_dst;
#ifdef USE_INET6
if (is->is_v == 6 &&
IN6_IS_ADDR_MULTICAST(&fi->fi_dst.in6))
/*EMPTY*/;
else
#endif
{
is->is_dst = fi->fi_dst;
is->is_flags &= ~SI_W_DADDR;
}
} else {
is->is_dst = fin->fin_fi.fi_src;
#ifdef USE_INET6
if (is->is_v == 6 &&
IN6_IS_ADDR_MULTICAST(&fi->fi_src.in6))
/*EMPTY*/;
else
#endif
{
is->is_dst = fi->fi_src;
is->is_flags &= ~SI_W_DADDR;
}
}
}
is->is_flags &= ~(SI_W_SADDR|SI_W_DADDR);
if ((is->is_flags & (SI_WILDA|SI_WILDP)) == 0) {
ATOMIC_DECL(ips_stats.iss_wild);
}
@ -1919,8 +1956,10 @@ fr_info_t *fin;
}
backward = IP6_NEQ(&is->is_src, &dst);
i = (backward << 1) + fin->fin_out;
#if 0
if (is->is_icmppkts[i] > is->is_pkts[i])
continue;
#endif
ips_stats.iss_hits++;
is->is_icmppkts[i]++;
is->is_bytes[i] += fin->fin_plen;
@ -1966,8 +2005,11 @@ fr_info_t *fin;
tcp, FI_ICMPCMP))) {
backward = IP6_NEQ(&is->is_dst, &src);
i = (backward << 1) + fin->fin_out;
if (((is->is_pass & FR_NOICMPERR) != 0) ||
(is->is_icmppkts[i] > is->is_pkts[i]))
if (((is->is_pass & FR_NOICMPERR) != 0)
#if 0
|| (is->is_icmppkts[i] > is->is_pkts[i])
#endif
)
break;
ips_stats.iss_hits++;
is->is_icmppkts[i]++;
@ -2426,12 +2468,14 @@ u_32_t *passp;
matched:
fr = is->is_rule;
if (fr != NULL) {
#if 0
if ((fin->fin_out == 0) && (fr->fr_nattag.ipt_num[0] != 0)) {
if (fin->fin_nattag == NULL)
return NULL;
if (fr_matchtag(&fr->fr_nattag, fin->fin_nattag) != 0)
return NULL;
}
#endif
(void) strncpy(fin->fin_group, fr->fr_group, FR_GROUPLEN);
fin->fin_icode = fr->fr_icode;
}
@ -2754,8 +2798,10 @@ int which, proto;
for (isp = &ips_list; ((is = *isp) != NULL); ) {
delete = 0;
if ((proto != 0) && (is->is_v != proto))
if ((proto != 0) && (is->is_v != proto)) {
isp = &is->is_next;
continue;
}
switch (which)
{