Skip to content

[dhcp_server] Revert container-side docker0 syslog iptables add/del (#26637); caclmgrd to own the rule #28328

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
StormLiangMS merged 1 commit into from
Jul 16, 2026
+0 −10
Merged

[dhcp_server] Revert container-side docker0 syslog iptables add/del (#26637); caclmgrd to own the rule #28328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,6 @@ function preStartAction()
echo "Cannot fetch system eeprom information. Setting chassis serial number to N/A."
$SONIC_DB_CLI STATE_DB HSET 'DEVICE_METADATA|localhost' chassis_serial_number "N/A"
fi
{%- elif docker_container_name == "dhcp_server" %}
# dhcp_server is the only bridge-mode container. caclmgrd's catch-all DROP
# on the INPUT chain blocks its syslog (UDP 514) to host rsyslog.
# Restrict to docker0 interface to minimize security impact.
iptables -C INPUT -i docker0 -p udp --dport 514 -j ACCEPT -m comment --comment "dhcp_server_syslog" 2>/dev/null || \
iptables -I INPUT -i docker0 -p udp --dport 514 -j ACCEPT -m comment --comment "dhcp_server_syslog"
{%- else %}
: # nothing
{%- endif %}
Expand Down Expand Up @@ -894,10 +888,6 @@ stop() {
/usr/local/bin/container stop $DOCKERNAME
{%- endif %}
fi
{%- if docker_container_name == "dhcp_server" %}
# Remove syslog iptables exception added during start
iptables -D INPUT -i docker0 -p udp --dport 514 -j ACCEPT -m comment --comment "dhcp_server_syslog" 2>/dev/null || true
{%- endif %}
{%- endif %}
}

Expand Down
Loading