~cdwertmann/cumulus-frr/+git/trunk:stable/10.0

Last commit made on 2024-05-06
Get this branch:
git clone -b stable/10.0 https://git.launchpad.net/~cdwertmann/cumulus-frr/+git/trunk

Branch merges

Branch information

Name:
stable/10.0
Repository:
lp:~cdwertmann/cumulus-frr/+git/trunk

Recent commits

6056a8c... by Donald Sharp <email address hidden>

Merge pull request #15935 from FRRouting/mergify/bp/stable/10.0/pr-15921

bgpd: Fix crash when deleting the SRv6 locator (backport #15921)

238f2b0... by Carmine Scarpitta <email address hidden>

bgpd: Fix the order of NULL check and ZAPI decode

When BGP receives an SRV6_LOCATOR_ADD message from zebra, it calls the
`bgp_zebra_process_srv6_locator_add()` function to process the message.
`bgp_zebra_process_srv6_locator_add()` decodes the message first, and
then if the pointer to the default BGP instance is NULL (i.e. the
default BGP instance is not configured yet), it returns early without
doing anything and without using the decoded message information.

This commit fixes the order of the operations executed by
`bgp_zebra_process_srv6_locator_add()`. We first ensure that the default
BGP instance is ready and we return early if it is not. Then, we decode
the message and do something with the information contained in it.

Signed-off-by: Carmine Scarpitta <email address hidden>
(cherry picked from commit bdc2c7bc5473b5582419702211c22e5d29bf0631)

20593bf... by Carmine Scarpitta <email address hidden>

bgpd: Fix crash when deleting the SRv6 locator

When BGP receives a `SRV6_LOCATOR_DEL` from zebra, it invokes
`bgp_zebra_process_srv6_locator_delete` to process the message.

`bgp_zebra_process_srv6_locator_delete` obtains a pointer to the default
BGP instance and then dereferences this pointer.

If the default BGP instance is not ready / not configured yet, this
pointer this pointer is `NULL` and dereferencing it causes BGP to crash.

This commit fix the issue by adding a a check to verify if the pointer
is `NULL` and returning early if it is.

Signed-off-by: Carmine Scarpitta <email address hidden>
(cherry picked from commit ae3241b96d7be08d627f142030a41031492ffaf5)

8fb9a51... by Donatas Abraitis <email address hidden>

Merge pull request #15906 from FRRouting/mergify/bp/stable/10.0/pr-15840

ospf6d: fix interface type vs. connected routes updates (backport #15840)

40bbd93... by David Lamparter <email address hidden>

ospf6d: accept CLI `no` for point-to-multipoint

`point-to-multipoint` was missing on the removal variant of this CLI
command.

Signed-off-by: David Lamparter <email address hidden>
(cherry picked from commit 52734fc8e5dad3569c3c37251f6dcc7a83c07299)

7f63d9c... by David Lamparter <email address hidden>

ospf6d: force recalculate on interface_up

interface_up also handles changes to the interface type, i.e. broadcast
to ptp to ptmp. Connected routes for these are different and must be
readvertised, which is done in ospf6_interface_recalculate_cost() - but
only if the cost changed. Use the force variant here.

Signed-off-by: David Lamparter <email address hidden>
(cherry picked from commit d7f54c4d5692c85d0f6a5bb384b156f252b92e20)

a5c72ea... by David Lamparter <email address hidden>

ospf6d: fix loopback/ptp/ptmp conn. route checks

The code emitting connected routes was checking against the interface
state (which can also be lo/ptp/ptmp) rather than the interface type.
This was causing wrong IA prefixes for connected routes getting put up
out if the interface was down intermittently.

Signed-off-by: David Lamparter <email address hidden>
(cherry picked from commit 4aa200c7c55c84033a804d7c37847790c936e256)

b12af0d... by David Lamparter <email address hidden>

ospf6d: fix DEFUN formatting wrecked by clang

clang-format doesn't understand `DEFUN` and formats it rather ugly.
Standard approach was to skip these in clang-format, which hasn't
happened here sadly.

Signed-off-by: David Lamparter <email address hidden>
(cherry picked from commit b47657600b4f6975aaaadf860b233d432d325d38)

c1ed2ac... by Donald Sharp <email address hidden>

Merge pull request #15916 from FRRouting/mergify/bp/stable/10.0/pr-15837

fix use of deprecated c-ares api (backport #15837)

08d97fd... by Andrew Cooks <email address hidden>

lib: replace deprecated ares_gethostbyname

c-ares has deprecated ares_gethostbyname() in version 1.28.0
Replace it with ares_getaddrinfo().

This fixes a build error on Fedora 40.

Signed-off-by: Andrew Cooks <email address hidden>
(cherry picked from commit 89a2e4d8257a91d115fa29e02261c33312da5cba)