Module Name: src
Committed By: rmind
Date: Wed Feb 5 03:49:48 UTC 2014
Modified Files:
src/usr.sbin/npf/npftest: npftest.c npftest.h
src/usr.sbin/npf/npftest/libnpftest: npf_nat_test.c npf_test.h
npf_test_subr.c
Log Message:
npftest: fix previous harder - pass and use libc's random(3).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/npf/npftest/npftest.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/npf/npftest/npftest.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npftest/libnpftest/npf_test.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npftest/npftest.c
diff -u src/usr.sbin/npf/npftest/npftest.c:1.14 src/usr.sbin/npf/npftest/npftest.c:1.15
--- src/usr.sbin/npf/npftest/npftest.c:1.14 Wed Feb 5 03:30:13 2014
+++ src/usr.sbin/npf/npftest/npftest.c Wed Feb 5 03:49:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npftest.c,v 1.14 2014/02/05 03:30:13 rmind Exp $ */
+/* $NetBSD: npftest.c,v 1.15 2014/02/05 03:49:48 rmind Exp $ */
/*
* NPF testing framework.
@@ -207,7 +207,7 @@ main(int argc, char **argv)
rump_init();
rump_schedule();
- rumpns_npf_test_init();
+ rumpns_npf_test_init(random);
if (config) {
load_npf_config(config);
Index: src/usr.sbin/npf/npftest/npftest.h
diff -u src/usr.sbin/npf/npftest/npftest.h:1.10 src/usr.sbin/npf/npftest/npftest.h:1.11
--- src/usr.sbin/npf/npftest/npftest.h:1.10 Fri Nov 8 00:38:27 2013
+++ src/usr.sbin/npf/npftest/npftest.h Wed Feb 5 03:49:48 2014
@@ -12,7 +12,7 @@
#include <net/if.h>
-void rumpns_npf_test_init(void);
+void rumpns_npf_test_init(long (*)(void));
int rumpns_npf_test_load(const void *);
ifnet_t * rumpns_npf_test_addif(const char *, bool, bool);
ifnet_t * rumpns_npf_test_getif(const char *);
Index: src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c:1.5 src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c:1.6
--- src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c:1.5 Wed Feb 5 03:30:13 2014
+++ src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c Wed Feb 5 03:49:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_nat_test.c,v 1.5 2014/02/05 03:30:13 rmind Exp $ */
+/* $NetBSD: npf_nat_test.c,v 1.6 2014/02/05 03:49:48 rmind Exp $ */
/*
* NPF NAT test.
@@ -16,7 +16,7 @@
#define NPF_BINAT (NPF_NATIN | NPF_NATOUT)
-#define RANDOM_PORT 45600
+#define RANDOM_PORT 53472
static const struct test_case {
const char * src;
Index: src/usr.sbin/npf/npftest/libnpftest/npf_test.h
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.11 src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.12
--- src/usr.sbin/npf/npftest/libnpftest/npf_test.h:1.11 Fri Nov 8 00:38:27 2013
+++ src/usr.sbin/npf/npftest/libnpftest/npf_test.h Wed Feb 5 03:49:48 2014
@@ -39,7 +39,7 @@
#define REMOTE_IP1 "192.0.2.3"
#define REMOTE_IP2 "192.0.2.4"
-void npf_test_init(void);
+void npf_test_init(long (*)(void));
int npf_test_load(const void *);
ifnet_t * npf_test_addif(const char *, bool, bool);
ifnet_t * npf_test_getif(const char *);
Index: src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c
diff -u src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c:1.7 src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c:1.8
--- src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c:1.7 Wed Feb 5 03:30:13 2014
+++ src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c Wed Feb 5 03:49:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_test_subr.c,v 1.7 2014/02/05 03:30:13 rmind Exp $ */
+/* $NetBSD: npf_test_subr.c,v 1.8 2014/02/05 03:49:48 rmind Exp $ */
/*
* NPF initialisation and handler routines.
@@ -20,11 +20,13 @@ static void * cstream_ptr;
static bool cstream_retval;
static void npf_state_sample(npf_state_t *, bool);
+static long (*npf_random_func)(void) = NULL;
void
-npf_test_init(void)
+npf_test_init(long (*rndfunc)(void))
{
npf_state_setsampler(npf_state_sample);
+ npf_random_func = rndfunc;
}
int
@@ -122,5 +124,5 @@ npf_test_statetrack(const void *data, si
uint32_t
_arc4random(void)
{
- return random();
+ return (uint32_t)(npf_random_func ? npf_random_func() : random());
}
