Author: ae
Date: Sun Sep 18 17:35:17 2016
New Revision: 305940
URL: https://svnweb.freebsd.org/changeset/base/305940

Log:
  Move opcode rewriter init and destroy handlers into non-VENT code.
  
  PR:           212576,212649,212077
  Submitted by: John Zielinski
  MFC after:    1 week

Modified:
  head/sys/netpfil/ipfw/ip_fw2.c

Modified: head/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw2.c      Sun Sep 18 17:33:49 2016        
(r305939)
+++ head/sys/netpfil/ipfw/ip_fw2.c      Sun Sep 18 17:35:17 2016        
(r305940)
@@ -2710,6 +2710,7 @@ ipfw_init(void)
          default_fw_tables = IPFW_TABLES_MAX;
 
        ipfw_init_sopt_handler();
+       ipfw_init_obj_rewriter();
        ipfw_iface_init();
        return (error);
 }
@@ -2723,6 +2724,7 @@ ipfw_destroy(void)
 
        ipfw_iface_destroy();
        ipfw_destroy_sopt_handler();
+       ipfw_destroy_obj_rewriter();
        printf("IP firewall unloaded\n");
 }
 
@@ -2757,7 +2759,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;
@@ -2862,7 +2863,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();
        ipfw_bpf_uninit(last);
        return (0);
 }
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to