From efb4eb3f8f6d76fcd54970e5cd6a65983399982a Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Mon, 18 Jul 2022 05:33:47 -0400
Subject: [PATCH] firewall: fix "statistics" spelling in function and file name
---
plist | 2 +-
.../OPNsense/Diagnostics/Api/FirewallController.php | 2 +-
.../OPNsense/Diagnostics/FirewallController.php | 10 +++++-----
src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml | 2 +-
.../scripts/filter/{pfstatistcs.py => pfstatistics.py} | 0
.../service/conf/actions.d/actions_filter.conf | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
rename src/opnsense/scripts/filter/{pfstatistcs.py => pfstatistics.py} (100%)
diff --git a/plist b/plist
index c5bde0993..bcc9adc25 100644
--- a/plist
+++ b/plist
@@ -761,7 +761,7 @@
/usr/local/opnsense/scripts/filter/list_states.py
/usr/local/opnsense/scripts/filter/list_table.py
/usr/local/opnsense/scripts/filter/list_tables.py
-/usr/local/opnsense/scripts/filter/pfstatistcs.py
+/usr/local/opnsense/scripts/filter/pfstatistics.py
/usr/local/opnsense/scripts/filter/pftablecount.py
/usr/local/opnsense/scripts/filter/pftop.py
/usr/local/opnsense/scripts/filter/read_log.py
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php
index db0e6e9f3..e400360ce 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/FirewallController.php
@@ -352,7 +352,7 @@ class FirewallController extends ApiControllerBase
* retrieve various pf statistics
* @return mixed
*/
- public function pfStatistcsAction($section = null)
+ public function pfStatisticsAction($section = null)
{
return json_decode((new Backend())->configdpRun('filter diag info', [$section]), true);
}
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php
index a6df48cd0..d1ab328bd 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/FirewallController.php
@@ -76,27 +76,27 @@ class FirewallController extends IndexController
[
"name" => "info",
"caption" => gettext("info"),
- "endpoint" => "/api/diagnostics/firewall/pf_statistcs/info"
+ "endpoint" => "/api/diagnostics/firewall/pf_statistics/info"
],
[
"name" => "memory",
"caption" => gettext("memory"),
- "endpoint" => "/api/diagnostics/firewall/pf_statistcs/memory"
+ "endpoint" => "/api/diagnostics/firewall/pf_statistics/memory"
],
[
"name" => "timeouts",
"caption" => gettext("timeouts"),
- "endpoint" => "/api/diagnostics/firewall/pf_statistcs/timeouts"
+ "endpoint" => "/api/diagnostics/firewall/pf_statistics/timeouts"
],
[
"name" => "interfaces",
"caption" => gettext("interfaces"),
- "endpoint" => "/api/diagnostics/firewall/pf_statistcs/interfaces"
+ "endpoint" => "/api/diagnostics/firewall/pf_statistics/interfaces"
],
[
"name" => "rules",
"caption" => gettext("rules"),
- "endpoint" => "/api/diagnostics/firewall/pf_statistcs/rules"
+ "endpoint" => "/api/diagnostics/firewall/pf_statistics/rules"
]
];
$this->view->default_tab = "info";
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index 2c9952f25..2fb504157 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -144,7 +144,7 @@
Diagnostics: Firewall statistics
ui/diagnostics/firewall/statistics
- api/diagnostics/firewall/pf_statistcs/*
+ api/diagnostics/firewall/pf_statistics/*
diff --git a/src/opnsense/scripts/filter/pfstatistcs.py b/src/opnsense/scripts/filter/pfstatistics.py
similarity index 100%
rename from src/opnsense/scripts/filter/pfstatistcs.py
rename to src/opnsense/scripts/filter/pfstatistics.py
diff --git a/src/opnsense/service/conf/actions.d/actions_filter.conf b/src/opnsense/service/conf/actions.d/actions_filter.conf
index ab93d6e9c..199b65938 100644
--- a/src/opnsense/service/conf/actions.d/actions_filter.conf
+++ b/src/opnsense/service/conf/actions.d/actions_filter.conf
@@ -102,7 +102,7 @@ type:script_output
message:request pftop statistics
[diag.info]
-command:/usr/local/opnsense/scripts/filter/pfstatistcs.py
+command:/usr/local/opnsense/scripts/filter/pfstatistics.py
parameters: %s
type:script_output
message:request pf diagnostic information