/ - Diff - pfSense - pfSense bugtracker

« Previous | Next »

Revision 25a0f534

Added by Marcos M 8 months ago

ID 25a0f5347408b21dd3ce93b1ca5179dbb3fbe418
Parent dcc4d84d
Child 9970b06f

Decrease the number of config requests when deleting filter rules

+    }
     /**
      * Get the first and last rule's index for an interface, and optionally the
      * relative index of a rule within the interface.
      * Get the first and last rule's index for an interface, and optionally
      * a rule index relative to the number of rules on the interface.
+     *
      * @param string $if The interface used to calculate the rule indices
      * @param int $idx (optional) A rule index
      * @param string $interface The interface used to find the rule indices
      * @param int $rule_index (optional) A rule index
+     *
      * @return array Contains the matching interface's first and last rule's index,
      *               and the matching rule's relative index if found.
      */
     function get_interface_ruleindex(string $interface, ?int $rule_index = null): array {
     function get_interface_ruleindex(string $interface, ?int $rule_index = null, ?array $rules = null): array {
     	if (isset($rule_index) && ($rule_index < 0)) {
     		unset($rule_index);
+    	}
-...
     		return $interface_rule_index;
+    	}
     	$rules = $rules ?? config_get_path('filter/rule', []);
     	$interface = strtolower($interface);
     	$relative_index_count = -1; // a valid index count starts at 0
     	foreach (config_get_path('filter/rule',[]) as $idx => $rule) {
     	foreach ($rules as $idx => $rule) {
     		// skip rules on unrelated interfaces
     		if ((isset($rule['floating']) && ($interface != "floatingrules")) ||
     		    (!isset($rule['floating']) && ($interface != strtolower($rule['interface'])))) {

     	printf("%s/%s</a><br />", format_number($states), format_bytes($bytes));
+    }
     function delete_nat_association($id) {
     	$a_nat = config_get_path('nat/rule');
     	if (!$id || !is_array($a_nat)) {
     function delete_nat_association(array $associations_to_remove = []) {
     	if (empty($associations_to_remove)) {
     		return;
+    	}
     	foreach ($a_nat as &$natent) {
     		if ($natent['associated-rule-id'] == $id) {
     	$nat_rules = config_get_path('nat/rule', []);
     	if (empty($nat_rules)) {
     		return;
+    	}
     	$update_config = false;
     	foreach ($nat_rules as &$natent) {
     		if (in_array($natent['associated-rule-id'], $associations_to_remove)) {
     			$natent['associated-rule-id'] = '';
     			$update_config = true;
+    		}
+    	}
     	config_set_path('nat/rule', $a_nat);
     	if ($update_config) {
     		config_set_path('nat/rule', $nat_rules);
+    	}
+    }
     filter_rules_sort();
-...
+    }
     if ($_POST['act'] == "del") {
     	if (config_get_path("filter/rule/{$_POST['id']}")) {
     	$rule = is_numericint($_POST['id']) ? config_get_path("filter/rule/{$_POST['id']}") : null;
     	if (isset($rule)) {
     		// separators must be updated before the rule is removed
     		$ridx = get_interface_ruleindex($if, $_POST['id']);
     		$a_separators = config_get_path('filter/separator/' . strtolower($if), []);
     		shift_separators($a_separators, $ridx['index'], true);
     		config_set_path('filter/separator/' . strtolower($if), $a_separators);
     		// remove the rule
     		if (!empty(config_get_path("filter/rule/{$_POST['id']}/associated-rule-id"))) {
     			delete_nat_association(config_get_path("filter/rule/{$_POST['id']}/associated-rule-id"));
     		if (!empty($rule['associated-rule-id'])) {
     			delete_nat_association([$rule['associated-rule-id']]);
+    		}
     		config_del_path("filter/rule/{$_POST['id']}");
-...
     	if (is_array($_POST['rule']) && count($_POST['rule'])) {
     		$removed = false;
     		$a_separators = config_get_path('filter/separator/' . strtolower($if), []);
     		$a_rules = config_get_path('filter/rule', []);
     		$associations_to_remove = [];
     		foreach ($_POST['rule'] as $rulei) {
     			if (!isset($a_rules[$rulei])) {
     				continue;
+    			}
     			// separators must be updated before the rule is removed
     			$ridx = get_interface_ruleindex($if, $rulei);
     			$ridx = get_interface_ruleindex($if, $rulei, $a_rules);
     			shift_separators($a_separators, $ridx['index'], true);
     			// remove the rule
     			delete_nat_association(config_get_path("filter/rule/{$rulei}/associated-rule-id"));
     			config_del_path("filter/rule/{$rulei}");
     			if (!empty($a_rules[$rulei]['associated-rule-id'])) {
     				$associations_to_remove[] = $a_rules[$rulei]['associated-rule-id'];
+    			}
     			unset($a_rules[$rulei]);
     			$removed = true;
+    		}
     		config_set_path('filter/separator/' . strtolower($if), $a_separators);
     		if ($removed) {
     			delete_nat_association($associations_to_remove);
     			config_set_path('filter/separator/' . strtolower($if), $a_separators);
     			config_set_path('filter/rule', $a_rules);
     			if (write_config(gettext("Firewall: Rules - deleted selected firewall rules."))) {
     				mark_subsystem_dirty('filter');
+    			}

Also available in: Unified diff

Project

General

Profile

pfSense

Revision 25a0f534

Added by Marcos M 8 months ago