peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-22 01:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1355 from kernelkit/fwfixes

Browse Source
This commit is contained in:
Joachim Wiberg
2026-01-18 15:21:36 +01:00
committed by GitHub
parent 5a651800f3 5e180abae4
commit a5a4f2a42b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/firewall.c
+11 -4
View File
@@ -487,7 +487,15 @@ int firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct l
sr_error_t err = SR_ERR_OK;
char **ifaces = NULL;
if (diff && !lydx_get_xpathf(diff, XPATH))
/*
* Trigger firewall regeneration if:
* 1. Firewall configuration changed, OR
* 2. Interface membership changed (bridge-port/lag-port)
* which affects L3 interface enumeration
*/
if (diff && !lydx_get_xpathf(diff, XPATH) &&
!lydx_get_xpathf(diff, "/ietf-interfaces:interfaces/interface/bridge-port") &&
!lydx_get_xpathf(diff, "/ietf-interfaces:interfaces/interface/lag-port"))
return SR_ERR_OK;
switch (event) {
@@ -549,9 +557,8 @@ int firewall_change(sr_session_ctx_t *session, struct lyd_node *config, struct l
goto done;
}
if (lydx_get_descendant(diff, "firewall", "default", NULL) ||
lydx_get_descendant(diff, "firewall", "logging", NULL))
generate_firewalld_conf(global);
/* Always generate firewalld.conf when firewall is enabled */
generate_firewalld_conf(global);
/*
* Regenerate everything if anything in firewall changed, firewalld