Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lldpd: get_config_cid_ifaces() -> get_interface_csv()

Browse source 
where csv = comma separated value(s)

Make the function more generic. Can use it for not only 'config'.

Now it can be used to parse interfaces for additional lldpd settings,
e.g. custom-tlv.

Tested on: 22.03.6

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/14872
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Paul Donald 2024-04-21 23:18:36 +02:00 committed by Robert Marko
parent 635be2a329
commit a015f59880
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/network/services/lldpd/files/lldpd.init
View file

@ -75,9 +75,9 @@ get_config_restart_hash() {
export -n "$var=$_hash" export -n "$var=$_hash"
} }
get_config_cid_ifaces() { get_interface_csv() {
local _ifaces local _ifaces
config_get _ifaces 'config' "$2" config_get _ifaces "$2" "$3"
local _iface _ifnames="" local _iface _ifnames=""
# Set noglob to prevent '*' capturing diverse file names in the for ... in # Set noglob to prevent '*' capturing diverse file names in the for ... in
@ -109,7 +109,7 @@ write_lldpd_conf()
config_get lldp_hostname 'config' 'lldp_hostname' "$(cat /proc/sys/kernel/hostname)" config_get lldp_hostname 'config' 'lldp_hostname' "$(cat /proc/sys/kernel/hostname)"
local ifnames local ifnames
get_config_cid_ifaces ifnames "interface" get_interface_csv ifnames 'config' "interface"
local lldp_mgmt_ip local lldp_mgmt_ip
config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip' config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip'
@ -335,7 +335,7 @@ start_service() {
# ChassisID interfaces # ChassisID interfaces
local ifnames local ifnames
get_config_cid_ifaces ifnames "cid_interface" get_interface_csv ifnames 'config' "cid_interface"
[ -n "$ifnames" ] && procd_append_param command -C "$ifnames" [ -n "$ifnames" ] && procd_append_param command -C "$ifnames"