From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 043AF1FF16F for ; Thu, 13 Mar 2025 13:50:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 876BC187CC; Thu, 13 Mar 2025 13:50:01 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Thu, 13 Mar 2025 13:49:56 +0100 Message-Id: <20250313124956.367059-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.428 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_ASCII_DIVIDERS 0.8 Email that uses ascii formatting dividers and possible spam tricks KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH frr] frr: fix bit flag collision in patch X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: Thomas Lamprecht Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- * 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 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 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