diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-08-02 10:09:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 10:09:53 +0300 |
| commit | 2b32e22e62eeb3ccb6c298f1afd1c074cd155f62 (patch) | |
| tree | 604e859a7927c00a74a6ef4e0a240a1ad100198f /packages/frr/patches/0002-ospfd-Fix-wrong-advertise-router-calculation-in-tran.patch | |
| parent | adfd8a58c66adb6e5a61bc8a00ec1d183368a196 (diff) | |
| parent | 213bdf28fe2ae6879dd710e84d3ea767d24e5da4 (diff) | |
| download | vyos-build-2b32e22e62eeb3ccb6c298f1afd1c074cd155f62.tar.gz vyos-build-2b32e22e62eeb3ccb6c298f1afd1c074cd155f62.zip | |
Merge pull request #374 from c-po/t5415-frr-9.0
frr: T5415: upgrade to stable/9.0 branch
Diffstat (limited to 'packages/frr/patches/0002-ospfd-Fix-wrong-advertise-router-calculation-in-tran.patch')
| -rw-r--r-- | packages/frr/patches/0002-ospfd-Fix-wrong-advertise-router-calculation-in-tran.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/packages/frr/patches/0002-ospfd-Fix-wrong-advertise-router-calculation-in-tran.patch b/packages/frr/patches/0002-ospfd-Fix-wrong-advertise-router-calculation-in-tran.patch deleted file mode 100644 index b78fdf04..00000000 --- a/packages/frr/patches/0002-ospfd-Fix-wrong-advertise-router-calculation-in-tran.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 29f1a00109eba4a5f23662b377d372f92735b2b6 Mon Sep 17 00:00:00 2001 -From: Zhiyuan Wan <h@iloli.bid> -Date: Mon, 3 Apr 2023 14:35:14 +0800 -Subject: [PATCH 2/3] ospfd: Fix wrong advertise router calculation in transit - network - -The ospfd mistakenly copy advertise router from vertex->id, which may -not be correct in an OSPF transit network. - -Signed-off-by: Zhiyuan Wan <h@iloli.bid> ---- - ospfd/ospf_route.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c -index fea9f79bf..c98790b5e 100644 ---- a/ospfd/ospf_route.c -+++ b/ospfd/ospf_route.c -@@ -864,7 +864,7 @@ void ospf_route_copy_nexthops_from_vertex(struct ospf_area *area, - || area->spf_dry_run) { - path = ospf_path_new(); - path->nexthop = nexthop->router; -- path->adv_router = v->id; -+ path->adv_router = v->lsa->adv_router; - - if (oi) { - path->ifindex = oi->ifp->ifindex; --- -2.30.2 - |