lldpd: add option to force SONMP enabled

[openwrt/staging/robimarko.git] / package / network / services / lldpd / files / lldpd.init

diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 98e7e97193b29f04c9a6fa9477828d1a39c585e0..8e825e4f879ff9b44f29175feff4cf70de12e949 100644 (file)
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -4,7 +4,10 @@
 START=90
 STOP=01
 
+CONFIG_LLDPD_WITH_CDP=y
+CONFIG_LLDPD_WITH_FDP=y
 CONFIG_LLDPD_WITH_LLDPMED=y
+CONFIG_LLDPD_WITH_SONMP=y
 
 USE_PROCD=1
 LLDPDBIN=/usr/sbin/lldpd
@@ -44,18 +47,28 @@ get_config_restart_hash() {
        fi
        config_get_bool v 'config' 'enable_lldp' 1; append _string "$v" ","
        config_get_bool v 'config' 'force_lldp'; append _string "$v" ","
-       config_get_bool v 'config' 'enable_cdp'; append _string "$v" ","
+       if [ "$CONFIG_LLDPD_WITH_CDP" == "y" ]; then
+               config_get_bool v 'config' 'enable_cdp'; append _string "$v" ","
+               config_get      v 'config' 'cdp_version'; append _string "$v" ","
+               config_get_bool v 'config' 'force_cdp'; append _string "$v" ","
+               config_get_bool v 'config' 'force_cdpv2'; append _string "$v" ","
+       fi
        config_get_bool v 'config' 'enable_edp'; append _string "$v" ","
-       config_get_bool v 'config' 'enable_fdp'; append _string "$v" ","
-       config_get_bool v 'config' 'enable_sonmp'; append _string "$v" ","
+       if [ "$CONFIG_LLDPD_WITH_FDP" == "y" ]; then
+               config_get_bool v 'config' 'enable_fdp'; append _string "$v" ","
+               config_get_bool v 'config' 'force_fdp'; append _string "$v" ","
+       fi
+       if [ "$CONFIG_LLDPD_WITH_SONMP" == "y" ]; then
+               config_get_bool v 'config' 'enable_sonmp'; append _string "$v" ","
+               config_get_bool v 'config' 'force_sonmp'; append _string "$v" ","
+       fi
 
        _hash=`echo -n "${_string}" | md5sum | awk '{ print \$1 }'`
        export -n "$var=$_hash"
 }
 
 get_config_cid_ifaces() {
-       local _ifaces
-       config_get _ifaces 'config' 'cid_interface'
+       local _ifacesCONFIG_LLDPD_WITH_FDP
 
        local _iface _ifnames=""
        for _iface in $_ifaces; do
@@ -135,8 +148,13 @@ start_service() {
        local enable_lldp
        local force_lldp
        local enable_cdp
+       local cdp_version
+       local force_cdp
+       local force_cdpv2
        local enable_fdp
+       local force_fdp
        local enable_sonmp
+       local force_sonmp
        local enable_edp
        local lldp_class
        local lldp_location
@@ -149,9 +167,20 @@ start_service() {
        config_load 'lldpd'
        config_get_bool enable_lldp 'config' 'enable_lldp' 1
        config_get_bool force_lldp 'config' 'force_lldp' 0
-       config_get_bool enable_cdp 'config' 'enable_cdp' 0
-       config_get_bool enable_fdp 'config' 'enable_fdp' 0
-       config_get_bool enable_sonmp 'config' 'enable_sonmp' 0
+       if [ "$CONFIG_LLDPD_WITH_CDP" == "y" ]; then
+               config_get_bool enable_cdp 'config' 'enable_cdp' 0
+               config_get cdp_version 'config' 'cdp_version' 'cdpv1v2'
+               config_get_bool force_cdp 'config' 'force_cdp' 0
+               config_get_bool force_cdpv2 'config' 'force_cdpv2' 0
+       fi
+       if [ "$CONFIG_LLDPD_WITH_FDP" == "y" ]; then
+               config_get_bool enable_fdp 'config' 'enable_fdp' 0
+               config_get_bool force_fdp 'config' 'force_fdp' 0
+       fi
+       if [ "$CONFIG_LLDPD_WITH_SONMP" == "y" ]; then
+               config_get_bool enable_sonmp 'config' 'enable_sonmp' 0
+               config_get_bool force_sonmp 'config' 'force_sonmp' 0
+       fi
        config_get_bool enable_edp 'config' 'enable_edp' 0
        config_get lldp_class 'config' 'lldp_class'
        config_get lldp_location 'config' 'lldp_location'
@@ -182,12 +211,53 @@ start_service() {
                procd_append_param command '-ll'
        fi
 
-       [ $enable_cdp -gt 0 ] && procd_append_param command '-c'
-       [ $enable_fdp -gt 0 ] && procd_append_param command '-f'
-       [ $enable_sonmp -gt 0 ] && procd_append_param command '-s'
+       if [ "$CONFIG_LLDPD_WITH_CDP" == "y" ] && [ $enable_cdp -gt 0 ]; then
+               if [ $cdp_version == "cdpv2" ]; then
+                       if [ $force_cdp -gt 0 ]; then
+                               # CDPv1 disabled, CDPv2 forced
+                               procd_append_param command '-ccccc'
+                       else
+                               # CDPv1 disabled, CDPv2 enabled
+                               procd_append_param command '-cccc'
+                       fi
+               elif [ $cdp_version == "cdpv1v2" ]; then
+                       if [ $force_cdp -gt 0 ] && [ $force_cdpv2 -gt 0 ]; then
+                               # CDPv1 enabled, CDPv2 forced
+                               procd_append_param command '-ccc'
+                       elif [ $force_cdp -gt 0 ]; then
+                               # CDPv1 forced, CDPv2 enabled
+                               procd_append_param command '-cc'
+                       else
+                               # CDPv1 and CDPv2 enabled
+                               procd_append_param command '-c'
+                       fi
+               fi
+       fi
+
+       if [ "$CONFIG_LLDPD_WITH_FDP" == "y" ] && [ $enable_fdp -gt 0 ]; then
+               if [ $force_fdp -gt 0 ]; then
+                       # FDP enbled and forced
+                       procd_append_param command '-ff'
+               else
+                       # FDP enabled
+                       procd_append_param command '-f'
+               fi
+       fi
+
+       if [ "$CONFIG_LLDPD_WITH_SONMP" == "y" ] && [ $enable_sonmp -gt 0 ]; then
+               if [ $force_sonmp -gt 0 ]; then
+                       # SONMP enabled and forced
+                       procd_append_param command '-ss'
+               else
+                       # SONMP enabled
+                       procd_append_param command '-s'
+               fi
+       fi
+
        [ $enable_edp -gt 0 ] && procd_append_param command '-e'
+
        [ $readonly_mode -gt 0 ] && procd_append_param command '-r'
-       [ $lldp_no_version -gt 0 ] && procd_append_param command '-k'
+       [ $lldp_no_version -gt 0 ] && procd_append_param commanpackage/network/services/lldpd/Makefile package/network/services/lldpd/files/lldpd.initd '-k'
        [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ] && [ $lldpmed_no_inventory -gt 0 ] && procd_append_param command '-i'
        [ -n "$lldp_class" ] && procd_append_param command -M "$lldp_class"
        [ -n "$agentxsocket" ] && procd_append_param command -x -X "$agentxsocket"
@@ -242,6 +312,7 @@ reload_service() {
                $LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF
                        unconfigure med fast-start
                EOF
+
        fi
        # Rewrite lldpd.conf
        # If something changed it should be included by the lldpcli call