 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf.c,v 1.3 2011/11/04 01:00:28 zoltan Exp $	*/
+/*	$NetBSD: npf.c,v 1.4 2011/11/26 23:11:19 rmind Exp $	*/
 /*-
  * Copyright (c) 2010-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,50 +20,52 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.3 2011/11/04 01:00:28 zoltan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.4 2011/11/26 23:11:19 rmind Exp $");
 #include <sys/types.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <prop/proplib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <err.h>
 #define	_NPF_PRIVATE
 #include "npf.h"
 struct nl_config {
 	/* Rules, translations, tables, procedures. */
 	prop_array_t		ncf_rules_list;
 	prop_array_t		ncf_rproc_list;
 	prop_array_t		ncf_table_list;
 	prop_array_t		ncf_nat_list;
 	/* Priority counters. */
 	pri_t			ncf_rule_pri;
 	pri_t			ncf_nat_pri;
 	/* Custom file to externalise property-list. */
 	const char *		ncf_plist;
 };
 struct nl_rule {
 	prop_dictionary_t	nrl_dict;
 };
 struct nl_rproc {
 	prop_dictionary_t	nrp_dict;
 };
 struct nl_table {
 	prop_dictionary_t	ntl_dict;
 };
 @@ -79,66 +81,76 @@ npf_config_create(void)
 	ncf = malloc(sizeof(nl_config_t));
 	if (ncf == NULL) {
 		return NULL;
+	}
 	ncf->ncf_rules_list = prop_array_create();
 	ncf->ncf_rproc_list = prop_array_create();
 	ncf->ncf_table_list = prop_array_create();
 	ncf->ncf_nat_list = prop_array_create();
 	ncf->ncf_rule_pri = 1;
 	ncf->ncf_nat_pri = 1;
 	ncf->ncf_plist = NULL;
 	return ncf;
+}
 int
 npf_config_submit(nl_config_t *ncf, int fd)
+{
 	prop_dictionary_t npf_dict;
 	const char *plist = ncf->ncf_plist;
 	int error = 0;
 	npf_dict = prop_dictionary_create();
 	if (npf_dict == NULL) {
 		return ENOMEM;
+	}
 	prop_dictionary_set(npf_dict, "rules", ncf->ncf_rules_list);
 	prop_dictionary_set(npf_dict, "rprocs", ncf->ncf_rproc_list);
 	prop_dictionary_set(npf_dict, "tables", ncf->ncf_table_list);
 	prop_dictionary_set(npf_dict, "translation", ncf->ncf_nat_list);
-#ifndef _NPF_TESTING
+	if (plist) {
-	error = prop_dictionary_send_ioctl(npf_dict, fd, IOC_NPF_RELOAD);
+		if (!prop_dictionary_externalize_to_file(npf_dict, plist)) {
-#else
+			error = errno;
 	if (!prop_dictionary_externalize_to_file(npf_dict, "./npf.plist")) {
-		error = errno;
+	} else {
 		error = prop_dictionary_send_ioctl(npf_dict, fd, IOC_NPF_RELOAD);
+	}
 #endif
 	prop_object_release(npf_dict);
 	return error;
+}
 void
 npf_config_destroy(nl_config_t *ncf)
+{
 	prop_object_release(ncf->ncf_rules_list);
 	prop_object_release(ncf->ncf_rproc_list);
 	prop_object_release(ncf->ncf_table_list);
 	prop_object_release(ncf->ncf_nat_list);
 	free(ncf);
+}
 void
 _npf_config_setsubmit(nl_config_t *ncf, const char *plist_file)
+{
 	ncf->ncf_plist = plist_file;
+}
 static bool
 _npf_prop_array_lookup(prop_array_t array, const char *key, const char *name)
+{
 	prop_dictionary_t dict;
 	prop_object_iterator_t it;
 	it = prop_array_iterator(array);
 	while ((dict = prop_object_iterator_next(it)) != NULL) {
 		const char *lname;
 		prop_dictionary_get_cstring_nocopy(dict, key, &lname);
 		if (strcmp(name, lname) == 0)
 			break;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npf.h,v 1.2 2011/11/04 01:00:28 zoltan Exp $	*/
+/*	$NetBSD: npf.h,v 1.3 2011/11/26 23:11:19 rmind Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This material is based upon work partially supported by The
  * NetBSD Foundation under a contract with Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -53,26 +53,29 @@ typedef struct nl_table		nl_table_t;
 typedef struct nl_rule		nl_nat_t;
 #define	NPF_CODE_NCODE		1
 #define	NPF_CODE_BPF		2
 #define	NPF_PRI_NEXT		(-1)
 #define	NPF_MAX_TABLE_ID	(16)
 nl_config_t *	npf_config_create(void);
 int		npf_config_submit(nl_config_t *, int);
 void		npf_config_destroy(nl_config_t *);
 #ifdef _NPF_PRIVATE
 void		_npf_config_setsubmit(nl_config_t *, const char *);
 #endif
 nl_rule_t *	npf_rule_create(const char *, uint32_t, u_int);
 int		npf_rule_setcode(nl_rule_t *, int, const void *, size_t);
 int		npf_rule_setproc(nl_config_t *, nl_rule_t *, const char *);
 bool		npf_rule_exists_p(nl_config_t *, const char *);
 int		npf_rule_insert(nl_config_t *, nl_rule_t *, nl_rule_t *, pri_t);
 void		npf_rule_destroy(nl_rule_t *);
 nl_rproc_t *	npf_rproc_create(const char *);
 bool		npf_rproc_exists_p(nl_config_t *, const char *);
 int		npf_rproc_insert(nl_config_t *, nl_rproc_t *);
 #ifdef _NPF_PRIVATE