diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-03-21 14:59:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-21 14:59:47 +0200 |
| commit | feb144cdd771c4f3ec4eff8801bf3e98cbfd052f (patch) | |
| tree | 6576a5093d291a7e2bb30b7477c82ca85e1ed13a | |
| parent | d552f7f8c38d7ad3bd28d9019a58b57e41b07f0b (diff) | |
| parent | 0aa4c0366d3b9b6793d562cdc9b91e6a52e86c07 (diff) | |
| download | vyos-build-feb144cdd771c4f3ec4eff8801bf3e98cbfd052f.tar.gz vyos-build-feb144cdd771c4f3ec4eff8801bf3e98cbfd052f.zip | |
T7226: Fixed ldpd crash with tLDP message for disabled LDP hello message
| -rw-r--r-- | scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch (renamed from scripts/package-build/frr/patches/frr/0001-T7226-Option-for-disabled-LDP-hello-message-during-T.patch) | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/package-build/frr/patches/frr/0001-T7226-Option-for-disabled-LDP-hello-message-during-T.patch b/scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch index 4d17f777..67f85d01 100644 --- a/scripts/package-build/frr/patches/frr/0001-T7226-Option-for-disabled-LDP-hello-message-during-T.patch +++ b/scripts/package-build/frr/patches/frr/0001-ldpd-Option-for-disabled-LDP-hello-message-during-TC.patch @@ -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> 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 sending additional LDP hello multicast messages during TCP session establishment. This option enables per interface: "(config-ldp-af-if)". + +Signed-off-by: Andrii Melnychenko <a.melnychenko@vyos.io> --- ldpd/interface.c | 2 ++ ldpd/ldp_vty.h | 1 + @@ -154,7 +156,7 @@ index ad831a6ea..40a1e8c3c 100644 struct iface_ldp_sync { diff --git a/ldpd/neighbor.c b/ldpd/neighbor.c -index 2596c7948..b9199f0d9 100644 +index 2596c7948..00a809186 100644 --- a/ldpd/neighbor.c +++ b/ldpd/neighbor.c @@ -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) - send_hello(adj->source.type, adj->source.link.ia, - 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, + adj->source.target); |