lldpd: remove unneeded quotes and variable quoting

[openwrt/staging/nbd.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 faf100b1989d29bf10de12be8411e704bc93911c..3fc47bb3e37fed05feb9a6db54c4678cd6a2fe71 100644 (file)
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -5,7 +5,11 @@ START=90
 STOP=01
 
 CONFIG_LLDPD_WITH_CDP=y
+CONFIG_LLDPD_WITH_EDP=y
+CONFIG_LLDPD_WITH_FDP=y
 CONFIG_LLDPD_WITH_LLDPMED=y
+CONFIG_LLDPD_WITH_SNMP=y
+CONFIG_LLDPD_WITH_SONMP=y
 
 USE_PROCD=1
 LLDPDBIN=/usr/sbin/lldpd
@@ -35,7 +39,9 @@ get_config_restart_hash() {
        config_load 'lldpd'
 
        config_get      v 'config' 'lldp_class'; append _string "$v" ","
-       config_get      v 'config' 'agentxsocket'; append _string "$v" ","
+       if [ "$CONFIG_LLDPD_WITH_SNMP" == "y" ]; then
+               config_get      v 'config' 'agentxsocket'; append _string "$v" ","
+       fi
        config_get      v 'config' 'cid_interface'; append _string "$v" ","
        config_get      v 'config' 'filter'; append _string "$v" ","
        config_get_bool v 'config' 'readonly_mode'; append _string "$v" ","
@@ -51,9 +57,18 @@ get_config_restart_hash() {
                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_EDP" == "y" ]; then
+               config_get_bool v 'config' 'enable_edp'; append _string "$v" ","
+               config_get_bool v 'config' 'force_edp'; append _string "$v" ","
+       fi
+       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"
@@ -115,22 +130,34 @@ write_lldpd_conf()
        local lldp_portidsubtype
        config_get lldp_portidsubtype 'config' 'lldp_portidsubtype' 'macaddress'
 
+       local lldp_platform
+       config_get lldp_platform 'config' 'lldp_platform' ""
+
+       local lldp_tx_interval
+       config_get lldp_tx_interval 'config' 'lldp_tx_interval' 0
+
+       local lldp_tx_hold
+       config_get lldp_tx_hold 'config' 'lldp_tx_hold' 0
+
        # Clear out the config file first
        echo -n > "$LLDPD_CONF"
        [ -n "$ifnames" ] && echo "configure system interface pattern" "$ifnames" >> "$LLDPD_CONF"
        [ -n "$lldp_description" ] && echo "configure system description" "\"$lldp_description\"" >> "$LLDPD_CONF"
        [ -n "$lldp_hostname" ] && echo "configure system hostname" "\"$lldp_hostname\"" >> "$LLDPD_CONF"
        [ -n "$lldp_mgmt_ip" ] && echo "configure system ip management pattern" "\"$lldp_mgmt_ip\"" >> "$LLDPD_CONF"
-       [ -n "$lldp_syscapabilities" ] && echo "configure system capabilities enabled" "\"$lldp_syscapabilities\"" >> "$LLDPD_CONF"
+       [ -n "$lldp_syscapabilities" ] && echo "configure system capabilities enabled $lldp_syscapabilities" >> "$LLDPD_CONF"
        if [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ] && [ $lldpmed_fast_start -gt 0 ]; then
                if [ $lldpmed_fast_start_tx_interval -gt 0 ]; then
-                       echo "configure med fast-start tx-interval" "\"$lldpmed_fast_start_tx_interval\"" >> "$LLDPD_CONF"
+                       echo "configure med fast-start tx-interval $lldpmed_fast_start_tx_interval" >> "$LLDPD_CONF"
                else
-                       echo "configure med fast-start" "enable" >> "$LLDPD_CONF"
+                       echo "configure med fast-start enable" >> "$LLDPD_CONF"
                fi
        fi
        [ -n "$lldp_agenttype" ] && echo "configure lldp agent-type" "\"$lldp_agenttype\"" >> "$LLDPD_CONF"
        [ -n "$lldp_portidsubtype" ] && echo "configure lldp portidsubtype" "\"$lldp_portidsubtype\"" >> "$LLDPD_CONF"
+       [ -n "$lldp_platform" ] && echo "configure system platform" "\"$lldp_platform\"" >> "$LLDPD_CONF"
+       [ $lldp_tx_interval -gt 0 ] && echo "configure lldp tx-interval" "$lldp_tx_interval" >> "$LLDPD_CONF"
+       [ $lldp_tx_hold -gt 0 ] && echo "configure lldp tx-hold" "$lldp_tx_hold" >> "$LLDPD_CONF"
 
        # Since lldpd's sysconfdir is /tmp, we'll symlink /etc/lldpd.d to /tmp/$LLDPD_CONFS_DIR
        [ -e $LLDPD_CONFS_DIR ] || ln -s /etc/lldpd.d $LLDPD_CONFS_DIR
@@ -145,8 +172,11 @@ start_service() {
        local force_cdp
        local force_cdpv2
        local enable_fdp
+       local force_fdp
        local enable_sonmp
+       local force_sonmp
        local enable_edp
+       local force_edp
        local lldp_class
        local lldp_location
        local lldp_no_version
@@ -164,9 +194,18 @@ start_service() {
                config_get_bool force_cdp 'config' 'force_cdp' 0
                config_get_bool force_cdpv2 'config' 'force_cdpv2' 0
        fi
-       config_get_bool enable_fdp 'config' 'enable_fdp' 0
-       config_get_bool enable_sonmp 'config' 'enable_sonmp' 0
-       config_get_bool enable_edp 'config' 'enable_edp' 0
+       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
+       if [ "$CONFIG_LLDPD_WITH_EDP" == "y" ]; then
+               config_get_bool enable_edp 'config' 'enable_edp' 0
+               config_get_bool force_edp 'config' 'force_edp' 0
+       fi
        config_get lldp_class 'config' 'lldp_class'
        config_get lldp_location 'config' 'lldp_location'
        config_get_bool lldp_no_version 'config' 'lldp_no_version' 0
@@ -174,7 +213,9 @@ start_service() {
                config_get_bool lldpmed_no_inventory 'config' 'lldpmed_no_inventory' 0
        fi
        config_get_bool readonly_mode 'config' 'readonly_mode' 0
-       config_get agentxsocket 'config' 'agentxsocket'
+       if [ "$CONFIG_LLDPD_WITH_SNMP" == "y" ]; then
+               config_get agentxsocket 'config' 'agentxsocket'
+       fi
        config_get filter 'config' 'filter' 15
 
        mkdir -p ${LLDPD_RUN}
@@ -219,14 +260,41 @@ start_service() {
                fi
        fi
 
-       [ $enable_fdp -gt 0 ] && procd_append_param command '-f'
-       [ $enable_sonmp -gt 0 ] && procd_append_param command '-s'
-       [ $enable_edp -gt 0 ] && procd_append_param command '-e'
+       if [ "$CONFIG_LLDPD_WITH_FDP" == "y" ] && [ $enable_fdp -gt 0 ]; then
+               if [ $force_fdp -gt 0 ]; then
+                       # FDP enabled 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
+
+       if [ "$CONFIG_LLDPD_WITH_EDP" == "y" ] && [ $enable_edp -gt 0 ]; then
+               if [ $force_edp -gt 0 ]; then
+                       # EDP enabled and forced
+                       procd_append_param command '-ee'
+               else
+                       # EDP enabled
+                       procd_append_param command '-e'
+               fi
+       fi
+
        [ $readonly_mode -gt 0 ] && procd_append_param command '-r'
-       [ $lldp_no_version -gt 0 ] && procd_append_param commanpackage/network/services/lldpd/Makefile package/network/services/lldpd/files/lldpd.initd '-k'
+       [ $lldp_no_version -gt 0 ] && procd_append_param command '-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"
+       [ "$CONFIG_LLDPD_WITH_SNMP" == "y" ] && [ -n "$agentxsocket" ] && procd_append_param command -x -X "$agentxsocket"
        [ -n "$filter" ] && procd_append_param command -H "$filter"
 
     # ChassisID interfaces
@@ -273,11 +341,13 @@ reload_service() {
                unconfigure system description
                unconfigure system hostname
                unconfigure system ip management pattern
+               unconfigure system platform
        EOF
        if [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ]; then
                $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