Skip to content

Conversation

@Monviech
Copy link
Member

Fixes: #9425

A bit unsure if I got all spots, but this seems to work.

@AdSchellevis please correct this one as needed.

@Monviech Monviech self-assigned this Nov 19, 2025
@Monviech Monviech added the cleanup Low impact changes label Nov 19, 2025
Copy link
Member

@fichtner fichtner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks-like-it-does-the-thing type of approval

@Monviech Monviech force-pushed the firewall-interfacenot-floating branch from 66de53d to df0c802 Compare November 21, 2025 08:03
@Monviech
Copy link
Member Author

Monviech commented Nov 21, 2025

I fixed something small and now it reflects reality in my test:

Empty Interface, Inverted Group, Inverted Interface, Multiple Interface -> All in floating
Single group -> Is in group
Single interface -> Is in interface

image

@fichtner Should I wait on this one or is it okay for master?

// floating: empty, multiple, or inverted interface
(string)$this->interfacenot === "1" ||
(strpos($interface, ",")) !== false ||
empty($interface)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesn't seem to match our actual sorting

if (isset($rule['floating'])) {
$prio = 200000;
} elseif (isset($ifgroups[$rule['interface']])) {
$prio = 300000 + $ifgroups[$rule['interface']];
} else {
$prio = 400000;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

be0b18930f36f9 says it's a floating rule pinned to one interface so this seems correct?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cleanup Low impact changes

Development

Successfully merging this pull request may close these issues.

firewall: Rules with inverted interfaces in Firewall: Automation: Filter display in the wrong group

4 participants