ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-18 10:46:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

lldpd: option to disable LLDP-MED inventory TLV

Browse Source 
add option to disable LLDP-MED inventory TLV transmission

Signed-off-by: Stephen Howell <howels@allthatwemight.be>
This commit is contained in:
Stephen Howell 2023-12-16 23:08:08 +00:00 committed by Stijn Tintel
parent 058f284b1a
commit 1753498b01
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/services/lldpd/Makefile
View File

@ -82,6 +82,10 @@ endif
ifneq ($(CONFIG_LLDPD_WITH_SNMP),y) ifneq ($(CONFIG_LLDPD_WITH_SNMP),y)
sed -i -e '/agentxsocket/d' $(1)/etc/init.d/lldpd $(1)/etc/config/lldpd sed -i -e '/agentxsocket/d' $(1)/etc/init.d/lldpd $(1)/etc/config/lldpd
endif endif
ifneq ($(CONFIG_LLDPD_WITH_LLDPMED),y)
sed -i -e 's/CONFIG_LLDPD_WITH_LLDPMED=y/CONFIG_LLDPD_WITH_LLDPMED=n/g' $(1)/etc/init.d/lldpd
sed -i -e '/agentxsocket/d' $(1)/etc/config/lldpd
endif
endef endef
define Package/lldpd/conffiles define Package/lldpd/conffiles

10
package/network/services/lldpd/files/lldpd.init
View File

@ -4,6 +4,8 @@
START=90 START=90
STOP=01 STOP=01
CONFIG_LLDPD_WITH_LLDPMED=y
USE_PROCD=1 USE_PROCD=1
LLDPDBIN=/usr/sbin/lldpd LLDPDBIN=/usr/sbin/lldpd
LLDPCLI=/usr/sbin/lldpcli LLDPCLI=/usr/sbin/lldpcli
@ -37,6 +39,9 @@ get_config_restart_hash() {
config_get v 'config' 'filter'; append _string "$v" "," config_get v 'config' 'filter'; append _string "$v" ","
config_get_bool v 'config' 'readonly_mode'; append _string "$v" "," config_get_bool v 'config' 'readonly_mode'; append _string "$v" ","
config_get_bool v 'config' 'lldp_no_version'; append _string "$v" "," config_get_bool v 'config' 'lldp_no_version'; append _string "$v" ","
if [ "$CONFIG_LLDPD_WITH_LLDPMED" == "y" ]; then
config_get_bool v 'config' 'lldpmed_no_inventory'; append _string "$v" ","
fi
config_get_bool v 'config' 'enable_lldp' 1; append _string "$v" "," config_get_bool v 'config' 'enable_lldp' 1; append _string "$v" ","
config_get_bool v 'config' 'enable_cdp'; append _string "$v" "," config_get_bool v 'config' 'enable_cdp'; append _string "$v" ","
config_get_bool v 'config' 'enable_edp'; append _string "$v" "," config_get_bool v 'config' 'enable_edp'; append _string "$v" ","
@ -110,6 +115,7 @@ start_service() {
local lldp_class local lldp_class
local lldp_location local lldp_location
local lldp_no_version local lldp_no_version
local lldpmed_no_inventory
local readonly_mode local readonly_mode
local agentxsocket local agentxsocket
local filter local filter
@ -122,6 +128,9 @@ start_service() {
config_get lldp_class 'config' 'lldp_class' config_get lldp_class 'config' 'lldp_class'
config_get lldp_location 'config' 'lldp_location' 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
config_get_bool lldpmed_no_inventory 'config' 'lldpmed_no_inventory' 0
fi
config_get_bool readonly_mode 'config' 'readonly_mode' 0 config_get_bool readonly_mode 'config' 'readonly_mode' 0
config_get agentxsocket 'config' 'agentxsocket' config_get agentxsocket 'config' 'agentxsocket'
config_get filter 'config' 'filter' 15 config_get filter 'config' 'filter' 15
@ -142,6 +151,7 @@ start_service() {
[ $enable_edp -gt 0 ] && procd_append_param command '-e' [ $enable_edp -gt 0 ] && procd_append_param command '-e'
[ $readonly_mode -gt 0 ] && procd_append_param command '-r' [ $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 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 "$lldp_class" ] && procd_append_param command -M "$lldp_class"
[ -n "$agentxsocket" ] && procd_append_param command -x -X "$agentxsocket" [ -n "$agentxsocket" ] && procd_append_param command -x -X "$agentxsocket"
[ -n "$filter" ] && procd_append_param command -H "$filter" [ -n "$filter" ] && procd_append_param command -H "$filter"