[pve-devel] [PATCH v2 1/2] isisd: fix bit flag collision in options field
Gabriel Goller
g.goller at proxmox.com
Fri Mar 14 10:52:20 CET 2025
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 at proxmox.com>
---
...d-option-to-treat-dummy-interfaces-as-loop.patch | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/debian/patches/pve/0005-fabricd-add-option-to-treat-dummy-interfaces-as-loop.patch b/debian/patches/pve/0005-fabricd-add-option-to-treat-dummy-interfaces-as-loop.patch
index 331beed378ec..1ae2874b19c2 100644
--- a/debian/patches/pve/0005-fabricd-add-option-to-treat-dummy-interfaces-as-loop.patch
+++ b/debian/patches/pve/0005-fabricd-add-option-to-treat-dummy-interfaces-as-loop.patch
@@ -18,8 +18,8 @@ Signed-off-by: Gabriel Goller <g.goller at proxmox.com>
isisd/isis_circuit.c | 9 +++++----
isisd/isis_main.c | 16 +++++++++++++---
isisd/isisd.c | 19 +++++++++++++++++++
- isisd/isisd.h | 4 ++++
- 6 files changed, 57 insertions(+), 12 deletions(-)
+ isisd/isisd.h | 6 +++++-
+ 6 files changed, 58 insertions(+), 13 deletions(-)
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
+++ b/isisd/isisd.h 2025-03-07 11:09:47.698424233 +0100
-@@ -74,7 +74,9 @@
+@@ -74,9 +74,11 @@
struct list *isis;
/* ISIS thread master. */
struct event_loop *master;
+ /* Various global 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 @@
void isis_terminate(void);
--
2.39.5
More information about the pve-devel
mailing list