Module Name: src
Committed By: rmind
Date: Fri Jul 25 23:07:21 UTC 2014
Modified Files:
src/sys/net/npf: npf_conn.c npf_conn.h npf_ctl.c
Log Message:
npf_mk_connlist: destroy the connections on error path.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/npf/npf_conn.c
cvs rdiff -u -r1.3 -r1.4 src/sys/net/npf/npf_conn.h
cvs rdiff -u -r1.35 -r1.36 src/sys/net/npf/npf_ctl.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_conn.c
diff -u src/sys/net/npf/npf_conn.c:1.6 src/sys/net/npf/npf_conn.c:1.7
--- src/sys/net/npf/npf_conn.c:1.6 Wed Jul 23 01:25:34 2014
+++ src/sys/net/npf/npf_conn.c Fri Jul 25 23:07:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_conn.c,v 1.6 2014/07/23 01:25:34 rmind Exp $ */
+/* $NetBSD: npf_conn.c,v 1.7 2014/07/25 23:07:21 rmind Exp $ */
/*-
* Copyright (c) 2014 Mindaugas Rasiukevicius <rmind at netbsd org>
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.6 2014/07/23 01:25:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.7 2014/07/25 23:07:21 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -141,7 +141,6 @@ static npf_conndb_t * conn_db __read_mo
static pool_cache_t conn_cache __read_mostly;
static kmutex_t conn_lock __cacheline_aligned;
-static void npf_conn_gc(npf_conndb_t *, bool, bool);
static void npf_conn_worker(void);
static void npf_conn_destroy(npf_conn_t *);
@@ -706,7 +705,7 @@ npf_conn_expired(const npf_conn_t *con,
* => If it is a flush request, then destroy all connections.
* => If 'sync' is true, then perform passive serialisation.
*/
-static void
+void
npf_conn_gc(npf_conndb_t *cd, bool flush, bool sync)
{
npf_conn_t *con, *prev, *gclist = NULL;
Index: src/sys/net/npf/npf_conn.h
diff -u src/sys/net/npf/npf_conn.h:1.3 src/sys/net/npf/npf_conn.h:1.4
--- src/sys/net/npf/npf_conn.h:1.3 Wed Jul 23 01:25:34 2014
+++ src/sys/net/npf/npf_conn.h Fri Jul 25 23:07:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_conn.h,v 1.3 2014/07/23 01:25:34 rmind Exp $ */
+/* $NetBSD: npf_conn.h,v 1.4 2014/07/25 23:07:21 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -114,6 +114,7 @@ void npf_conn_setpass(npf_conn_t *, npf
int npf_conn_setnat(const npf_cache_t *, npf_conn_t *,
npf_nat_t *, u_int);
npf_nat_t * npf_conn_retnat(npf_conn_t *, const int, bool *);
+void npf_conn_gc(npf_conndb_t *, bool, bool);
int npf_conn_export(prop_array_t);
int npf_conn_import(npf_conndb_t *, prop_dictionary_t,
npf_ruleset_t *);
Index: src/sys/net/npf/npf_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.35 src/sys/net/npf/npf_ctl.c:1.36
--- src/sys/net/npf/npf_ctl.c:1.35 Wed Jul 23 01:25:34 2014
+++ src/sys/net/npf/npf_ctl.c Fri Jul 25 23:07:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.35 2014/07/23 01:25:34 rmind Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.36 2014/07/25 23:07:21 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.35 2014/07/23 01:25:34 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.36 2014/07/25 23:07:21 rmind Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -492,7 +492,7 @@ npf_mk_connlist(prop_array_t conlist, np
}
prop_object_iterator_release(it);
if (error) {
- /* FIXME: npf_conn_gc(cd, true, false); */
+ npf_conn_gc(cd, true, false);
npf_conndb_destroy(cd);
} else {
*conndb = cd;
