CVS commit: src/sys/net/npf

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Dec 28 21:55:04 UTC 2016

Modified Files:
        src/sys/net/npf: npf_impl.h npf_rproc.c npf_ruleset.c

Log Message:
export rprocs too so we don't lose them.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.14 -r1.15 src/sys/net/npf/npf_rproc.c
cvs rdiff -u -r1.43 -r1.44 src/sys/net/npf/npf_ruleset.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_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.64 src/sys/net/npf/npf_impl.h:1.65
--- src/sys/net/npf/npf_impl.h:1.64	Mon Dec 26 18:05:06 2016
+++ src/sys/net/npf/npf_impl.h	Wed Dec 28 16:55:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_impl.h,v 1.64 2016/12/26 23:05:06 christos Exp $	*/
+/*	$NetBSD: npf_impl.h,v 1.65 2016/12/28 21:55:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -359,6 +359,7 @@ int		npf_rprocset_export(const npf_rproc
 npf_rproc_t *	npf_rproc_create(prop_dictionary_t);
 void		npf_rproc_acquire(npf_rproc_t *);
 void		npf_rproc_release(npf_rproc_t *);
+const char *	npf_rproc_getname(const npf_rproc_t *);
 bool		npf_rproc_run(npf_cache_t *, npf_rproc_t *, int *);
 
 /* State handling. */

Index: src/sys/net/npf/npf_rproc.c
diff -u src/sys/net/npf/npf_rproc.c:1.14 src/sys/net/npf/npf_rproc.c:1.15
--- src/sys/net/npf/npf_rproc.c:1.14	Mon Dec 26 18:05:06 2016
+++ src/sys/net/npf/npf_rproc.c	Wed Dec 28 16:55:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_rproc.c,v 1.14 2016/12/26 23:05:06 christos Exp $	*/
+/*	$NetBSD: npf_rproc.c,v 1.15 2016/12/28 21:55:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -311,6 +311,15 @@ npf_rproc_acquire(npf_rproc_t *rp)
 }
 
 /*
+ * npf_rproc_getname: return the name of the given rproc
+ */
+const char *
+npf_rproc_getname(const npf_rproc_t *rp)
+{
+	return rp->rp_name;
+}
+
+/*
  * npf_rproc_release: drop the reference count and destroy the rule
  * procedure on the last reference.
  */

Index: src/sys/net/npf/npf_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.43 src/sys/net/npf/npf_ruleset.c:1.44
--- src/sys/net/npf/npf_ruleset.c:1.43	Mon Dec 26 18:05:06 2016
+++ src/sys/net/npf/npf_ruleset.c	Wed Dec 28 16:55:04 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_ruleset.c,v 1.43 2016/12/26 23:05:06 christos Exp $	*/
+/*	$NetBSD: npf_ruleset.c,v 1.44 2016/12/28 21:55:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.43 2016/12/26 23:05:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.44 2016/12/28 21:55:04 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -740,6 +740,14 @@ npf_rule_export(npf_t *npf, const npf_ru
 	if (rl->r_info) {
 		prop_dictionary_set(rldict, "info", rl->r_info);
 	}
+
+	npf_rproc_t *rp = npf_rule_getrproc(rl);
+	if (rp != NULL) {
+		prop_dictionary_set_cstring(rldict, "rproc",
+		    npf_rproc_getname(rp));
+		npf_rproc_release(rp);
+	}
+
 	return 0;
 }