Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

npftest: adjust for the npf_bpf_filter() change.

This commit is contained in:
rmind 2013-11-23 19:40:11 +00:00
parent c4d05d4533
commit 1e9541dade
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: npf_bpf_test.c,v 1.3 2013/11/16 01:41:43 rmind Exp $ */
/* $NetBSD: npf_bpf_test.c,v 1.4 2013/11/23 19:40:11 rmind Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -63,6 +63,7 @@ test_bpf_code(void *code, size_t size)
{
ifnet_t *dummy_ifp = npf_test_addif(IFNAME_TEST, false, false);
npf_cache_t npc = { .npc_info = 0 };
bpf_args_t bc_args;
struct mbuf *m;
nbuf_t nbuf;
int ret, jret;
@ -73,12 +74,17 @@ test_bpf_code(void *code, size_t size)
nbuf_init(&nbuf, m, dummy_ifp);
npf_cache_all(&npc, &nbuf);
ret = npf_bpf_filter(&npc, &nbuf, code, NULL);
memset(&bc_args, 0, sizeof(bpf_args_t));
bc_args.pkt = m;
bc_args.wirelen = m_length(m);
bc_args.arg = &npc;
ret = npf_bpf_filter(&bc_args, code, NULL);
/* JIT-compiled code. */
jcode = npf_bpf_compile(code, size);
if (jcode) {
jret = npf_bpf_filter(&npc, &nbuf, NULL, jcode);
jret = npf_bpf_filter(&bc_args, NULL, jcode);
assert(ret == jret);
bpf_jit_freecode(jcode);
} else if (lverbose) {