Misc fixes captured on NetBSD. (#104)

.travis.yml

@@ -1,3 +1,6 @@
+branches:
+  only: master
+
 language: c
 
 compiler:

src/kern/npf_conf.c

@@ -30,19 +30,19 @@
 /*
  * NPF configuration loading mechanism.
  *
- * The main operations on the configuration are:
+ * The main operations on the configuration are the following:
  * 1) Read access, primarily from the npf_packet_handler() function.
- * 2) Write access on particular set, mainly rule or table updates.
+ * 2) Write access on a particular set, mainly rule or table updates.
  * 3) Deletion of the configuration after the reload operation.
  *
  * Synchronization
  *
- *	For (1) case, EBR is used to allow concurrent access to the
- *	configuration set (ruleset, etc).  It guarantees that the
+ *	For the (1) case, EBR is used to allow concurrent access to
+ *	the configuration set (ruleset, etc).  It guarantees that the
  *	configuration will not be destroyed while accessing it.
  *
- *	Writers, i.e. cases (2) and (3) use mutual exclusion and when
- *	necessary the writer-side barrier of the EBR.
+ *	For the cases (2) and (3), mutual exclusion (npf_t::config_lock)
+ *	is used with, when necessarya, the writer-side barrier of EBR.
  */
 
 #ifdef _KERNEL

src/kern/npf_os.c

@@ -155,7 +155,7 @@ npf_init(void)
 	error = npfk_sysinit(nworkers);
 	if (error)
 		return error;
-	npf = npfk_create(0, NULL, &kern_ifops);
+	npf = npfk_create(0, NULL, &kern_ifops, NULL);
 	npf_setkernctx(npf);
 	npf_pfil_register(true);
 

src/npfctl/npf_show.c

@@ -377,7 +377,7 @@ scan_marks(npf_conf_info_t *ctx, const struct mark_keyword_mapent *mk,
 			 * otherwise we just need to note the mark.
 			 */
 			ctx->curmark = m;
-			CTASSERT(BM_COUNT < (sizeof(uint64_t) * CHAR_BIT));
+			assert(BM_COUNT < (sizeof(uint64_t) * CHAR_BIT));
 			ctx->seen_marks = UINT64_C(1) << m;
 			assert(mk->fwords == nwords);
 

src/npfctl/npf_var.c

@@ -243,7 +243,7 @@ npfvar_get_data(const npfvar_t *vp, unsigned type, size_t idx)
 	if (el && NPFVAR_TYPE(el->e_type) != NPFVAR_TYPE(type)) {
 		yyerror("variable '%s' element %zu "
 		    "is of type '%s' rather than '%s'", vp->v_key,
-		    npfvar_type(el->e_type), npfvar_type(type));
+		    idx, npfvar_type(el->e_type), npfvar_type(type));
 		return NULL;
 	}
 	return el->e_data;

src/npftest/libnpftest/npf_gc_test.c

@@ -6,6 +6,7 @@
 
 #ifdef _KERNEL
 #include <sys/types.h>
+#include <sys/kmem.h>
 #endif
 
 #include "npf.h"
@@ -232,7 +233,7 @@ run_worker_tests(npf_t *npf)
 		npf_worker_signal(test_npf);
 
 		npf_ebr_destroy(test_npf->ebr);
-		free(test_npf); // npfk_destroy()
+		kmem_free(test_npf, sizeof(npf_t)); // npfk_destroy()
 	}
 
 	/*