proxmox-mirrors/frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/frr synced 2025-04-28 18:23:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: fix bit flag collision in options field

Browse Source 
Resolve conflict between F_ISIS_UNIT_TEST and ISIS_OPT_DUMMY_AS_LOOPBACK
which were both using the same bit value (0x01). This collision caused
unit test mode to be unintentionally enabled when DUMMY_AS_LOOPBACK was set.

Link: https://github.com/FRRouting/frr/pull/18377
Fixes: ecf591e ("frr: add the dummy_as_loopback patch series, enable it by default")
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
This commit is contained in:
Gabriel Goller 2025-03-14 10:52:20 +01:00 committed by Thomas Lamprecht
parent 55ad3259e0
commit 8d36cd6e35
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/patches/pve/0005-fabricd-add-option-to-treat-dummy-interfaces-as-loop.patch vendored
View File

@ -18,8 +18,8 @@ Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
isisd/isis_circuit.c | 9 +++++---- isisd/isis_circuit.c | 9 +++++----
isisd/isis_main.c | 16 +++++++++++++--- isisd/isis_main.c | 16 +++++++++++++---
isisd/isisd.c | 19 +++++++++++++++++++ isisd/isisd.c | 19 +++++++++++++++++++
isisd/isisd.h | 4 ++++ isisd/isisd.h | 6 +++++-
6 files changed, 57 insertions(+), 12 deletions(-) 6 files changed, 58 insertions(+), 13 deletions(-)
Index: b/doc/manpages/frr-fabricd.rst Index: b/doc/manpages/frr-fabricd.rst
=================================================================== ===================================================================
@ -181,15 +181,18 @@ Index: b/isisd/isisd.h
=================================================================== ===================================================================
--- a/isisd/isisd.h 2025-03-07 11:09:47.700424235 +0100 --- a/isisd/isisd.h 2025-03-07 11:09:47.700424235 +0100
+++ b/isisd/isisd.h 2025-03-07 11:09:47.698424233 +0100 +++ b/isisd/isisd.h 2025-03-07 11:09:47.698424233 +0100
@@ -74,7 +74,9 @@ @@ -74,9 +74,11 @@
struct list *isis; struct list *isis;
/* ISIS thread master. */ /* ISIS thread master. */
struct event_loop *master; struct event_loop *master;
+ /* Various global options */ + /* Various global options */
uint8_t options; uint8_t options;
+#define ISIS_OPT_DUMMY_AS_LOOPBACK (1 << 0) +#define F_ISIS_UNIT_TEST (1 << 0)
+#define ISIS_OPT_DUMMY_AS_LOOPBACK (1 << 1)
}; };
#define F_ISIS_UNIT_TEST 0x01 -#define F_ISIS_UNIT_TEST 0x01
#define ISIS_DEFAULT_MAX_AREA_ADDRESSES 3
@@ -269,6 +271,8 @@ @@ -269,6 +271,8 @@
void isis_terminate(void); void isis_terminate(void);