Add a knob to tune the maximum number of tables that can be defined, the pf default of 1000 is too low for systems with >500 aliases.

2 files changed, 14 insertions, 5 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 706e6f1..901aabf 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -252,6 +252,15 @@ function filter_configure_sync($delete_states_if_needed = true) {
 		copy("{$g['tmp_path']}/rules.debug", "{$g['tmp_path']}/rules.debug.old");
 
 	$rules = "";
+	if($config['system']['maximumtables'] <> "" && is_numeric($config['system']['maximumtables'])) {
+		/* User defined maximum table entries in Advanced menu. */
+		$rules .= "set limit tables {$config['system']['maximumtables']}\n";
+	}
+	if($config['system']['maximumtableentries'] <> "" && is_numeric($config['system']['maximumtableentries'])) {
+		/* User defined maximum table entries in Advanced menu. */
+		$rules .= "set limit table-entries {$config['system']['maximumtableentries']}\n";
+	}
+
 	$rules .= "{$aliases} \n";
 	$rules .= "{$gateways} \n";
 	update_filter_reload_status("Setting up logging information");
@@ -274,11 +283,6 @@ function filter_configure_sync($delete_states_if_needed = true) {
 		$rules .= "set limit src-nodes {$max_states}\n";
 	}
 
-	if($config['system']['maximumtableentries'] <> "" && is_numeric($config['system']['maximumtableentries'])) {
-		/* User defined maximum table entries in Advanced menu. */
-		$rules .= "set limit table-entries {$config['system']['maximumtableentries']}\n";
-	}
-
 	// Configure flowtable support if enabled.
 	flowtable_configure();
 
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index faa4e77..8b6301b 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1369,6 +1369,11 @@ function pfsense_default_state_size() {
   return $max_states;
 }
 
+function pfsense_default_tables_size() {
+	$current = `pfctl -sm | grep ^tables | awk '{print $4};'`;
+	return $current;
+}
+
 function pfsense_default_table_entries_size() {
 	$current = `pfctl -sm | grep table-entries | awk '{print $4};'`;
 	return $current;