Skip to content

Cleanup Firewall States Size model #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaredhendrickson13 merged 2 commits into from
Feb 24, 2021
Merged

Cleanup Firewall States Size model #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ddd701
Cleaned up the APIFirewallStatesSizeRead.inc model class to be more e…
jaredhendrickson13 Feb 24, 2021
d91ef11
Merge branch 'v120' of github.com:jaredhendrickson13/pfsense-api into…
jaredhendrickson13 Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions pfSense-pkg-API/files/etc/inc/api/models/APIFirewallStatesSizeRead.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}
}