diff options
| author | Paul Donald | 2025-10-17 19:33:13 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-10-19 17:35:44 +0000 |
| commit | 217e3320f21c49cc3c6d38844a24d1b74fdf04cb (patch) | |
| tree | 63265f4708fda8c107e49456ff08535db2cb43ba | |
| parent | 03045951eeae1c31d2c1a4b7acf6b53c7fc8d563 (diff) | |
| download | openwrt-217e3320f21c49cc3c6d38844a24d1b74fdf04cb.tar.gz | |
lldpd: bump to 1.0.20
Also implemented the med fast-start -> lldp fast-start change.
lldpd includes a backwards compat handler for the older med command,
but it's better to make these changes so they align with documentation.
Changes:
https://github.com/lldpd/lldpd/releases/tag/1.0.20
Changes:
Enable fast start unconditionally (and move its configuration in "configure lldp")
Make VLAN advertisements configurable
Fix:
Do not break zero-copy traffic on Linux
Fix crash on rapid addition/removal of interfaces
Fix management address selection when pattern is a negative IP address
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20438
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | package/network/services/lldpd/Makefile | 4 | ||||
| -rw-r--r-- | package/network/services/lldpd/files/lldpd.init | 26 |
2 files changed, 17 insertions, 13 deletions
diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 418f64360b..28e6273f38 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd -PKG_VERSION:=1.0.19 +PKG_VERSION:=1.0.20 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lldpd/lldpd/releases/download/$(PKG_VERSION)/ -PKG_HASH:=4de17fe5137b4d44a7bd57f8dfc80cffe2c8bb3691b4ae3012b5a6ea20d79ee0 +PKG_HASH:=c851ce102444b932b691f0d00142520333030822709fc4566ef20c651ae1714f PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be> PKG_LICENSE:=ISC diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index e59b5d9800..e9891389c2 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -231,13 +231,15 @@ write_lldpd_conf() local lldp_mgmt_addr_advertisements config_get_bool lldp_mgmt_addr_advertisements 'config' 'lldp_mgmt_addr_advertisements' 1 - if [ "$CONFIG_LLDPD_WITH_LLDPMED" = "y" ]; then - local lldpmed_fast_start - config_get_bool lldpmed_fast_start 'config' 'lldpmed_fast_start' 0 + # lldpd 1.0.20 configure med fast-start -> configure lldp fast-start (doesn't depend on med, enabled unconditionally) + # See: https://github.com/lldpd/lldpd/commit/f2ea6e6a86e7d70104e1428a94ec37a24fe604ef + local lldp_fast_start + config_get_bool lldp_fast_start 'config' 'lldpmed_fast_start' 0 - local lldpmed_fast_start_tx_interval - config_get lldpmed_fast_start_tx_interval 'config' 'lldpmed_fast_start_tx_interval' 0 + local lldp_fast_start_tx_interval + config_get lldp_fast_start_tx_interval 'config' 'lldpmed_fast_start_tx_interval' 0 + if [ "$CONFIG_LLDPD_WITH_LLDPMED" = "y" ]; then local lldp_location config_get lldp_location 'config' 'lldp_location' @@ -283,11 +285,11 @@ write_lldpd_conf() [ -n "$lldp_med_inv_asset_id" ] && echo "configure inventory asset \"$lldp_med_inv_asset_id\"" >> "$LLDPD_CONF" fi - 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" + if [ "$lldp_fast_start" -gt 0 ]; then + if [ "$lldp_fast_start_tx_interval" -gt 0 ]; then + echo "configure lldp fast-start tx-interval $lldp_fast_start_tx_interval" >> "$LLDPD_CONF" else - echo "configure med fast-start enable" >> "$LLDPD_CONF" + echo "configure lldp fast-start enable" >> "$LLDPD_CONF" fi fi if [ "$CONFIG_LLDPD_WITH_LLDPMED" = "y" ]; then @@ -493,6 +495,7 @@ reload_service() { $LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF pause unconfigure lldp custom-tlv + unconfigure lldp fast-start unconfigure lldp capabilities-advertisements unconfigure lldp management-addresses-advertisements # unconfigures user-configured system capabilities, and instead uses the kernel information: @@ -511,12 +514,13 @@ reload_service() { unconfigure inventory model unconfigure inventory asset EOF + if [ "$CONFIG_LLDPD_WITH_LLDPMED" = "y" ]; then $LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF - unconfigure med fast-start + # unconfigure med xxxxxxx EOF - fi + # Rewrite lldpd.conf # If something changed it should be included by the lldpcli call write_lldpd_conf |