Merge pull request #87 from jaredhendrickson13/fw_state_size

Cleanup Firewall States Size model

Author: jaredhendrickson13

pfSense-pkg-API/files/etc/inc/api/models/APIFirewallStatesSizeRead.inc

@@ -15,6 +15,7 @@
 
 require_once("api/framework/APIModel.inc");
 require_once("api/framework/APIResponse.inc");
+require_once("includes/functions.inc.php");
 
 
 class APIFirewallStatesSizeRead extends APIModel {
@@ -25,16 +26,19 @@ class APIFirewallStatesSizeRead extends APIModel {
     }
 
     public function action() {
-        # Check our maximum state table size
-        if (isset($this->config["system"]["maximumstates"])) {
+        # Check our default state table size
+        $size_array["defaultmaximumstates"] = intval(pfsense_default_state_size());
+
+        # Check our maximum state table size if configured, Otherwise, use default.
+        if (!empty($this->config["system"]["maximumstates"])) {
             $size_array["maximumstates"] = intval($this->config["system"]["maximumstates"]);
         } else {
-            $size_array["maximumstates"] = intval(pfsense_default_state_size());
+            $size_array["maximumstates"] = $size_array["defaultmaximumstates"];
         }
+
         # Check our current state table size
-        $size_array["currentstates"] = count(APIFirewallStatesRead::get_state_table());
-        # Check our default state table size
-        $size_array["defaultmaximumstates"] = intval(pfsense_default_state_size());
+        $size_array["currentstates"] = intval(explode("/", get_pfstate())[0]);
+
         return APIResponse\get(0, $size_array);
     }
 }