vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #934 from AndriiFullroot/VyOS_T7226

Browse Source 
T7226: Fixed ldpd crash with tLDP message for disabled LDP hello message
This commit is contained in:
Viacheslav Hletenko 2025-03-21 14:59:47 +02:00 committed by GitHub
commit feb144cdd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/package-build/frr/patches/frr/0001-T7226-Option-for-disabled-LDP-hello-message-during-T.patch → scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch
View File

@ -1,12 +1,14 @@
From 9f0dc1829119ea180c2ee2ebe7dcd847556c6fda Mon Sep 17 00:00:00 2001 From 945eff42df61982585011fa8427050c74ca90c6b Mon Sep 17 00:00:00 2001
From: Andrii Melnychenko <a.melnychenko@vyos.io> From: Andrii Melnychenko <a.melnychenko@vyos.io>
Date: Mon, 17 Mar 2025 13:25:20 +0100 Date: Mon, 17 Mar 2025 13:25:20 +0100
Subject: [PATCH 1/1] T7226 Option for disabled LDP hello message during TCP Subject: [PATCH 1/1] ldpd: Option for disabled LDP hello message during TCP
Added option "disable-establish-hello" that disableds Added option "disable-establish-hello" that disableds
sending additional LDP hello multicast messages during sending additional LDP hello multicast messages during
TCP session establishment. TCP session establishment.
This option enables per interface: "(config-ldp-af-if)". This option enables per interface: "(config-ldp-af-if)".
Signed-off-by: Andrii Melnychenko <a.melnychenko@vyos.io>
--- ---
ldpd/interface.c | 2 ++ ldpd/interface.c | 2 ++
ldpd/ldp_vty.h | 1 + ldpd/ldp_vty.h | 1 +
@ -154,7 +156,7 @@ index ad831a6ea..40a1e8c3c 100644
struct iface_ldp_sync { struct iface_ldp_sync {
diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c
index 2596c7948..b9199f0d9 100644 index 2596c7948..00a809186 100644
--- a/ldpd/neighbor.c --- a/ldpd/neighbor.c
+++ b/ldpd/neighbor.c +++ b/ldpd/neighbor.c
@@ -630,8 +630,9 @@ nbr_establish_connection(struct nbr *nbr) @@ -630,8 +630,9 @@ nbr_establish_connection(struct nbr *nbr)
@ -163,7 +165,7 @@ index 2596c7948..b9199f0d9 100644
RB_FOREACH(adj, nbr_adj_head, &nbr->adj_tree) RB_FOREACH(adj, nbr_adj_head, &nbr->adj_tree)
- send_hello(adj->source.type, adj->source.link.ia, - send_hello(adj->source.type, adj->source.link.ia,
- adj->source.target); - adj->source.target);
+ if (!adj->source.link.ia->disable_establish_hello) + if (!(adj->source.type == HELLO_LINK && adj->source.link.ia->disable_establish_hello))
+ send_hello(adj->source.type, adj->source.link.ia, + send_hello(adj->source.type, adj->source.link.ia,
+ adj->source.target); + adj->source.target);