]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
lldpd: get_config_cid_ifaces() -> get_interface_csv()
authorPaul Donald <newtwen+github@gmail.com>
Sun, 21 Apr 2024 21:18:36 +0000 (23:18 +0200)
committerRobert Marko <robimarko@gmail.com>
Sat, 22 Mar 2025 16:15:38 +0000 (17:15 +0100)
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>
package/network/services/lldpd/files/lldpd.init

index 6c1c184bfa10a6f066a5e7a8a074bed72f1c826c..2ad59f8cb14ccaf88471ec5048ace093de1c126f 100644 (file)
@@ -75,9 +75,9 @@ get_config_restart_hash() {
        export -n "$var=$_hash"
 }
 
-get_config_cid_ifaces() {
+get_interface_csv() {
        local _ifaces
-       config_get _ifaces 'config' "$2"
+       config_get _ifaces "$2" "$3"
 
        local _iface _ifnames=""
        # 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)"
 
        local ifnames
-       get_config_cid_ifaces ifnames "interface"
+       get_interface_csv ifnames 'config' "interface"
 
        local lldp_mgmt_ip
        config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip'
@@ -335,7 +335,7 @@ start_service() {
 
     # ChassisID interfaces
        local ifnames
-       get_config_cid_ifaces ifnames "cid_interface"
+       get_interface_csv ifnames 'config' "cid_interface"
 
        [ -n "$ifnames" ] && procd_append_param command -C "$ifnames"