From 08f60f652a025366d89080021d257f826c69fe60 Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Fri, 24 Jan 2020 11:52:52 -0800 Subject: [PATCH] Update lldpd to latest stable version (#3905) * Change lldpd version * Remove patches not-required patches --- rules/lldpd.mk | 2 +- ...el-to-find-appropriate-nl_pid-automa.patch | 25 ----------------- .../0003-update-tx-interval-immediately.patch | 20 -------------- ...ad-all-notifications-in-lldpctl_recv.patch | 27 ------------------- src/lldpd/patch/series | 3 --- 5 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 src/lldpd/patch/0002-Let-linux-kernel-to-find-appropriate-nl_pid-automa.patch delete mode 100644 src/lldpd/patch/0003-update-tx-interval-immediately.patch delete mode 100644 src/lldpd/patch/0005-Read-all-notifications-in-lldpctl_recv.patch diff --git a/rules/lldpd.mk b/rules/lldpd.mk index bae83f7263..acd28f3359 100644 --- a/rules/lldpd.mk +++ b/rules/lldpd.mk @@ -1,6 +1,6 @@ # lldpd package -LLDPD_VERSION = 0.9.6 +LLDPD_VERSION = 1.0.4 LLDPD_VERSION_SUFFIX = 1 LLDPD_VERSION_FULL = $(LLDPD_VERSION)-$(LLDPD_VERSION_SUFFIX) diff --git a/src/lldpd/patch/0002-Let-linux-kernel-to-find-appropriate-nl_pid-automa.patch b/src/lldpd/patch/0002-Let-linux-kernel-to-find-appropriate-nl_pid-automa.patch deleted file mode 100644 index 801fdd8ec9..0000000000 --- a/src/lldpd/patch/0002-Let-linux-kernel-to-find-appropriate-nl_pid-automa.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2ee8585e8b716719a11235ab5c291b2f6ac9ce1a Mon Sep 17 00:00:00 2001 -From: Pavel Shirshov -Date: Wed, 17 Oct 2018 21:05:58 +0000 -Subject: [PATCH] Let linux kernel to find appropriate nl_pid automatically - ---- - src/daemon/netlink.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/netlink.c b/src/daemon/netlink.c -index 1a64a23..f4227b8 100644 ---- a/src/daemon/netlink.c -+++ b/src/daemon/netlink.c -@@ -93,7 +93,7 @@ netlink_connect(struct lldpd *cfg, int protocol, unsigned groups) - int s; - struct sockaddr_nl local = { - .nl_family = AF_NETLINK, -- .nl_pid = getpid(), -+ .nl_pid = 0, - .nl_groups = groups - }; - --- -2.7.4 - diff --git a/src/lldpd/patch/0003-update-tx-interval-immediately.patch b/src/lldpd/patch/0003-update-tx-interval-immediately.patch deleted file mode 100644 index b6b2950012..0000000000 --- a/src/lldpd/patch/0003-update-tx-interval-immediately.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/daemon/client.c b/src/daemon/client.c -index 8382d02..38cf3f3 100644 ---- a/src/daemon/client.c -+++ b/src/daemon/client.c -@@ -71,7 +71,6 @@ client_handle_set_configuration(struct lldpd *cfg, enum hmsg_type *type, - if (CHANGED(c_tx_interval) && config->c_tx_interval != 0) { - if (config->c_tx_interval < 0) { - log_debug("rpc", "client asked for immediate retransmission"); -- levent_send_now(cfg); - } else { - log_debug("rpc", "client change transmit interval to %d", - config->c_tx_interval); -@@ -79,6 +78,7 @@ client_handle_set_configuration(struct lldpd *cfg, enum hmsg_type *type, - LOCAL_CHASSIS(cfg)->c_ttl = cfg->g_config.c_tx_interval * - cfg->g_config.c_tx_hold; - } -+ levent_send_now(cfg); - } - if (CHANGED(c_tx_hold) && config->c_tx_hold > 0) { - log_debug("rpc", "client change transmit hold to %d", diff --git a/src/lldpd/patch/0005-Read-all-notifications-in-lldpctl_recv.patch b/src/lldpd/patch/0005-Read-all-notifications-in-lldpctl_recv.patch deleted file mode 100644 index 1c3781da67..0000000000 --- a/src/lldpd/patch/0005-Read-all-notifications-in-lldpctl_recv.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b8e66b52f40103fd3abea77031c4634742c31860 Mon Sep 17 00:00:00 2001 -From: Pavel Shirshov -Date: Thu, 12 Dec 2019 12:47:42 -0800 -Subject: [PATCH 1/1] Read all notifications in lldpctl_recv - ---- - src/lib/connection.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/connection.c b/src/lib/connection.c -index 591d9e9..88bbc99 100644 ---- a/src/lib/connection.c -+++ b/src/lib/connection.c -@@ -253,8 +253,8 @@ lldpctl_recv(lldpctl_conn_t *conn, const uint8_t *data, size_t length) - memcpy(conn->input_buffer + conn->input_buffer_len, data, length); - conn->input_buffer_len += length; - -- /* Is it a notification? */ -- check_for_notification(conn); -+ /* Read all notifications */ -+ while(!check_for_notification(conn)); - - RESET_ERROR(conn); - --- -2.17.1.windows.2 - diff --git a/src/lldpd/patch/series b/src/lldpd/patch/series index 626c5d5975..419fbc96a1 100644 --- a/src/lldpd/patch/series +++ b/src/lldpd/patch/series @@ -1,8 +1,5 @@ # This series applies on GIT commit 396961a038a38675d46f96eaa7b430b2a1f8701b 0001-return-error-when-port-does-not-exist.patch -0002-Let-linux-kernel-to-find-appropriate-nl_pid-automa.patch -0003-update-tx-interval-immediately.patch 0004-lldpctl-put-a-lock-around-some-commands-to-avoid-rac.patch -0005-Read-all-notifications-in-lldpctl_recv.patch 0006-lib-fix-memory-leak.patch 0007-lib-fix-memory-leak-when-handling-I-O.patch