lldpd: Implement location parameter
Previously only partially implemented. After commit
5007f488bb
lldp_location was never removed
Now, add the value of lldp_location to the generated config.
The location param has a few syntaxes, so the config acquires the first
usage from the man page: 'address country EU'
Supplementary fix for PR #14193 (this param was included in the original
PR #13018 but the lldp_location fixes were absent from PR #14193).
Tested on 22.03.5, 22.03.6
Signed-off-by: Paul Donald <newtwen@gmail.com>
This commit is contained in:
parent
79ee4cb039
commit
53252eeb3b
|
@ -7,7 +7,7 @@ config lldpd config
|
||||||
option agentxsocket /var/run/agentx.sock
|
option agentxsocket /var/run/agentx.sock
|
||||||
|
|
||||||
option lldp_class 4
|
option lldp_class 4
|
||||||
option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4"
|
option lldp_location "address country EU"
|
||||||
|
|
||||||
# if empty, the distribution description is sent
|
# if empty, the distribution description is sent
|
||||||
#option lldp_description "OpenWrt System"
|
#option lldp_description "OpenWrt System"
|
||||||
|
|
|
@ -114,6 +114,10 @@ write_lldpd_conf()
|
||||||
|
|
||||||
local lldpmed_fast_start_tx_interval
|
local lldpmed_fast_start_tx_interval
|
||||||
config_get lldpmed_fast_start_tx_interval 'config' 'lldpmed_fast_start_tx_interval' 0
|
config_get lldpmed_fast_start_tx_interval 'config' 'lldpmed_fast_start_tx_interval' 0
|
||||||
|
|
||||||
|
local lldp_location
|
||||||
|
config_get lldp_location 'config' 'lldp_location'
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local lldp_agenttype
|
local lldp_agenttype
|
||||||
|
@ -145,8 +149,15 @@ write_lldpd_conf()
|
||||||
echo "configure med fast-start enable" >> "$LLDPD_CONF"
|
echo "configure med fast-start enable" >> "$LLDPD_CONF"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
[ -n "$lldp_agenttype" ] && echo "configure lldp agent-type $lldp_agenttype" >> "$LLDPD_CONF"
|
if [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ]; then
|
||||||
[ -n "$lldp_portidsubtype" ] && echo "configure lldp portidsubtype $lldp_portidsubtype" >> "$LLDPD_CONF"
|
# other 'configure med xxx' statements go here
|
||||||
|
|
||||||
|
[ -n "$lldp_location" ] && echo "configure med location" "$lldp_location" >> "$LLDPD_CONF"
|
||||||
|
|
||||||
|
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"
|
[ -n "$lldp_platform" ] && echo "configure system platform" "\"$lldp_platform\"" >> "$LLDPD_CONF"
|
||||||
[ -n $lldp_tx_interval ] && echo "configure lldp tx-interval $lldp_tx_interval" >> "$LLDPD_CONF"
|
[ -n $lldp_tx_interval ] && 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"
|
[ $lldp_tx_hold -gt 0 ] && echo "configure lldp tx-hold $lldp_tx_hold" >> "$LLDPD_CONF"
|
||||||
|
@ -170,7 +181,6 @@ start_service() {
|
||||||
local enable_edp
|
local enable_edp
|
||||||
local force_edp
|
local force_edp
|
||||||
local lldp_class
|
local lldp_class
|
||||||
local lldp_location
|
|
||||||
local lldp_no_version
|
local lldp_no_version
|
||||||
local lldpmed_no_inventory
|
local lldpmed_no_inventory
|
||||||
local readonly_mode
|
local readonly_mode
|
||||||
|
@ -199,7 +209,6 @@ start_service() {
|
||||||
config_get_bool force_edp 'config' 'force_edp' 0
|
config_get_bool force_edp 'config' 'force_edp' 0
|
||||||
fi
|
fi
|
||||||
config_get lldp_class 'config' 'lldp_class'
|
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
|
config_get_bool lldp_no_version 'config' 'lldp_no_version' 0
|
||||||
if [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ]; then
|
if [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ]; then
|
||||||
config_get_bool lldpmed_no_inventory 'config' 'lldpmed_no_inventory' 0
|
config_get_bool lldpmed_no_inventory 'config' 'lldpmed_no_inventory' 0
|
||||||
|
|
Loading…
Reference in New Issue