Module Name: src
Committed By: rmind
Date: Wed May 14 20:35:27 UTC 2014
Modified Files:
src/sys/net/npf: npf_session.c
Log Message:
npf_session_inspect: do not silently drop the packet on state check failure.
Let the rules deal with it (e.g. we may want to log it).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/net/npf/npf_session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_session.c
diff -u src/sys/net/npf/npf_session.c:1.31 src/sys/net/npf/npf_session.c:1.32
--- src/sys/net/npf/npf_session.c:1.31 Fri Mar 14 11:29:44 2014
+++ src/sys/net/npf/npf_session.c Wed May 14 20:35:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_session.c,v 1.31 2014/03/14 11:29:44 rmind Exp $ */
+/* $NetBSD: npf_session.c,v 1.32 2014/05/14 20:35:27 rmind Exp $ */
/*-
* Copyright (c) 2010-2013 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_session.c,v 1.31 2014/03/14 11:29:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_session.c,v 1.32 2014/05/14 20:35:27 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -590,10 +590,9 @@ npf_session_inspect(npf_cache_t *npc, nb
/* Inspect the protocol data and handle state changes. */
if (!npf_state_inspect(npc, nbuf, &se->s_state, forw)) {
- /* Silently block invalid packets. */
+ /* Invalid: let the rules deal with it. */
npf_session_release(se);
npf_stats_inc(NPF_STAT_INVALID_STATE);
- *error = ENETUNREACH;
se = NULL;
}
return se;
