diff options
| author | ae <ae@FreeBSD.org> | 2016-09-30 03:27:07 +0000 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-15 11:05:10 -0500 |
| commit | f25f84e7a008fdb5fd0792791dfcb1c933acc9db (patch) | |
| tree | a7bf04b4ba593e7a9b3cff1f421bc9dc3ea0b734 | |
| parent | 849fe595dde2c28feb99e70c9f3e3aae3956b2ec (diff) | |
| download | FreeBSD-src-f25f84e7a008fdb5fd0792791dfcb1c933acc9db.zip FreeBSD-src-f25f84e7a008fdb5fd0792791dfcb1c933acc9db.tar.gz | |
MFC r305940:
Move opcode rewriter init and destroy handlers into non-VNET code.
PR: 212576,212649,212077
Submitted by: John Zielinski
(cherry picked from commit ea6ed08789ae8292a4851ab4d8c3aa9727aa42ba)
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index e6a930c..9a23f8d 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -2699,6 +2699,7 @@ ipfw_init(void) default_fw_tables = IPFW_TABLES_MAX; ipfw_init_sopt_handler(); + ipfw_init_obj_rewriter(); ipfw_iface_init(); return (error); } @@ -2712,6 +2713,7 @@ ipfw_destroy(void) ipfw_iface_destroy(); ipfw_destroy_sopt_handler(); + ipfw_destroy_obj_rewriter(); printf("IP firewall unloaded\n"); } @@ -2746,7 +2748,6 @@ vnet_ipfw_init(const void *unused) /* Init shared services hash table */ ipfw_init_srv(chain); - ipfw_init_obj_rewriter(); ipfw_init_counters(); /* insert the default rule and create the initial map */ chain->n_rules = 1; @@ -2853,7 +2854,6 @@ vnet_ipfw_uninit(const void *unused) IPFW_LOCK_DESTROY(chain); ipfw_dyn_uninit(1); /* free the remaining parts */ ipfw_destroy_counters(); - ipfw_destroy_obj_rewriter(); return (0); } |
