diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 7bd342cb9..d4405d54c 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -90,33 +90,6 @@ function is_bogonsv6_used() { return $usebogonsv6; } -function flowtable_configure() { - global $config, $g; - - if (empty($config['system']['flowtable'])) { - set_single_sysctl("net.inet.flowtable.enable", "0"); - return; - } - - // Figure out how many flows we should reserve - // sized 2x larger than the number of unique connection destinations. - if($config['system']['maximumstates'] <> "" && is_numeric($config['system']['maximumstates'])) - $maxstates = $config['system']['maximumstates']; - else - $maxstates = 150000; - // nmbflows cpu count * ($maxstates * 2) - $cpus = get_single_sysctl('kern.smp.cpus'); - $nmbflows = ($cpus*($maxstates*2)); - // Flowtable currently only works on 8.0 - if(get_freebsd_version() == "8") { - set_sysctl(array( - "net.inet.flowtable.nmbflows" => $nmbflows, - "net.inet.ip.output_flowtable_size" => $maxstates, - "net.inet.flowtable.enable" => "1") - ); - } -} - function filter_pflog_start($kill_first = false) { global $config, $g; if ($g['platform'] == 'jail') @@ -273,9 +246,6 @@ function filter_configure_sync($delete_states_if_needed = true) { if (isset($config['system']['lb_use_sticky']) && is_numeric($config['system']['srctrack']) && ($config['system']['srctrack'] > 0)) $limitrules .= "set timeout src.track {$config['system']['srctrack']}\n"; - // Configure flowtable support if enabled. - flowtable_configure(); - $rules = ""; $rules = "{$limitrules}\n"; $rules .= "{$aliases} \n"; diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php index 24114904c..ee9550a76 100644 --- a/usr/local/www/system_advanced_network.php +++ b/usr/local/www/system_advanced_network.php @@ -140,9 +140,6 @@ if ($_POST) { // Write out configuration (config.xml) write_config(); - // Configure flowtable support from filter.inc - flowtable_configure(); - // Set preferred protocol prefer_ipv4_or_ipv6();