ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

lldpd: LLDPD binds to only specified interfaces

Browse Source 
Bind to the configured system interfaces only. Switchport interfaces
are no longer ignored and uci interface values for LLDPD are honored.

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
This commit is contained in:
Stephen Howell 2023-12-16 22:41:22 +00:00 committed by Stijn Tintel
parent e483c247dc
commit 064b4999ad
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/network/services/lldpd/files/lldpd.init
View File

@ -33,6 +33,7 @@ get_config_restart_hash() {
config_get v 'config' 'lldp_class'; append _string "$v" ","
config_get v 'config' 'agentxsocket'; append _string "$v" ","
config_get v 'config' 'cid_interface'; append _string "$v" ","
config_get_bool v 'config' 'readonly_mode'; append _string "$v" ","
config_get_bool v 'config' 'enable_lldp' 1; append _string "$v" ","
config_get_bool v 'config' 'enable_cdp'; append _string "$v" ","
@ -44,6 +45,21 @@ get_config_restart_hash() {
export -n "$var=$_hash"
}
get_config_cid_ifaces() {
local _ifaces
config_get _ifaces 'config' 'cid_interface'
local _iface _ifnames=""
for _iface in $_ifaces; do
local _ifname=""
if network_get_device _ifname "$_iface" || [ -e "/sys/class/net/$_iface" ]; then
append _ifnames "${_ifname:-$_iface}" ","
fi
done
export -n "${1}=$_ifnames"
}
write_lldpd_conf()
{
local lldp_description
@ -122,6 +138,11 @@ start_service() {
[ -n "$lldp_class" ] && procd_append_param command -M "$lldp_class"
[ -n "$agentxsocket" ] && procd_append_param command -x -X "$agentxsocket"
# ChassisID interfaces
local ifnames
get_config_cid_ifaces ifnames
[ -n "$ifnames" ] && procd_append_param command -C "$ifnames"
# Overwrite default configuration locations processed by lldpcli at start
procd_append_param command -O "$LLDPD_CONF"