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.
Signed-off-by: Gabriel Goller <g.gol...@proxmox.com>
---
* I'm not sure about the debian version number, let me know if this is
wrong.
* I edited the patch introducing this bug, if it's better to add a new
patch, I'll be happy to change it.
* We are still testing the newest version so it's not yet ready for
testing/no-subscription.
debian/changelog | 6 ++++++
...d-option-to-treat-dummy-interfaces-as-loop.patch | 13 ++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6e68311132b1..7e2ffd7964a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frr (10.2.1-2+pve1) bookworm; urgency=medium
+
+ * fix fabricd dummy_as_loopback flag collision
+
+ -- Gabriel Goller <g.gol...@proxmox.com> Thu, 13 Mar 2025 13:33:46 +0100
+
frr (10.2.1-1+pve1) bookworm; urgency=medium
* update upstream source to 10.2.1
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..184a093334c9 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.gol...@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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
