MFC of change [19782] per request from sullrich@

Scale state table size with memory, never allocate more than 10% system ram, this leads to 12K states on 128M and 102K on 1G systems - this should be a good default

2 files changed, 4 insertions, 4 deletions

diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php
index 7cb93fb..21a89f3 100644
--- a/usr/local/www/includes/functions.inc.php
+++ b/usr/local/www/includes/functions.inc.php
@@ -71,14 +71,14 @@ function get_pfstate() {
 	global $config;
 	$matches = "";
 	if (isset($config['system']['maximumstates']) and $config['system']['maximumstates'] > 0)
-	        $maxstates="/{$config['system']['maximumstates']}";
+	        $maxstates="{$config['system']['maximumstates']}";
 	else
-	        $maxstates="/10000";
+	        $maxstates=pfsense_default_state_size();
 	$curentries = `/sbin/pfctl -si |grep current`;
 	if (preg_match("/([0-9]+)/", $curentries, $matches)) {
 	     $curentries = $matches[1];
 	}
-	return $curentries . $maxstates;
+	return $curentries . "/" . $maxstates;
 }
 
 function has_temp() {
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index f4c9bd4..b0adaa1 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -626,7 +626,7 @@ include("head.inc");
 				<br />
 				<strong>Maximum number of connections to hold in the firewall state table.</strong>
 				<br />
-				<span class="vexpl">Note:  Leave this blank for the default of 10000</span>
+				<span class="vexpl">Note:  Leave this blank for the default.  On your system the default size is: <?= pfsense_default_state_size() ?></span>
 			</td>
 		</tr>
 		<tr>