From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH frr] frr: fix "ran out of docstring" error for autort patch
Date: Fri, 19 Sep 2025 15:56:19 +0200 [thread overview]
Message-ID: <20250919135620.221766-1-g.goller@proxmox.com> (raw)
Add a description to the `autort` command ASN parameter. Otherwise this
throws an error on startup "ran out of docstring". As it's only a small
non-functional fix I decided to fix this directly and refresh the patch
instead of creating a new one.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
...on-for-RT-auto-derivation-to-force-A.patch | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
index 49ce025a509d..5035b2110f76 100644
--- a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
+++ b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
@@ -11,6 +11,7 @@ as route-target AS:VNI need to be the same on the each peer
Link: https://github.com/FRRouting/frr/pull/7535
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
[ GG: ported to latest stable 10.2.1 ]
+ [ GG: fixed the "ran out of docstring" bug ]
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
bgpd/bgp_evpn.c | 13 +++++++++++--
@@ -20,9 +21,9 @@ Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Index: b/bgpd/bgp_evpn.c
===================================================================
---- a/bgpd/bgp_evpn.c 2025-03-07 11:09:47.315423809 +0100
-+++ b/bgpd/bgp_evpn.c 2025-03-07 11:09:47.312423806 +0100
-@@ -622,7 +622,12 @@
+--- a/bgpd/bgp_evpn.c 2025-09-19 15:38:36.128022733 +0200
++++ b/bgpd/bgp_evpn.c 2025-09-19 15:38:36.126001948 +0200
+@@ -624,7 +624,12 @@
if (bgp->advertise_autort_rfc8365)
SET_FLAG(vni, EVPN_AUTORT_VXLAN);
@@ -36,7 +37,7 @@ Index: b/bgpd/bgp_evpn.c
ecomadd = ecommunity_new();
ecommunity_add_val(ecomadd, &eval, false, false);
-@@ -5490,7 +5495,11 @@
+@@ -5651,7 +5656,11 @@
if (bgp->advertise_autort_rfc8365)
SET_FLAG(vni, EVPN_AUTORT_VXLAN);
@@ -51,9 +52,9 @@ Index: b/bgpd/bgp_evpn.c
ecommunity_add_val(ecom_auto, &eval, false, false);
Index: b/bgpd/bgp_evpn_vty.c
===================================================================
---- a/bgpd/bgp_evpn_vty.c 2025-03-07 11:09:47.315423809 +0100
-+++ b/bgpd/bgp_evpn_vty.c 2025-03-07 11:09:47.313423807 +0100
-@@ -3744,32 +3744,51 @@
+--- a/bgpd/bgp_evpn_vty.c 2025-09-19 15:38:36.128022733 +0200
++++ b/bgpd/bgp_evpn_vty.c 2025-09-19 15:39:31.389174565 +0200
+@@ -3744,32 +3744,52 @@
return CMD_SUCCESS;
}
@@ -96,7 +97,8 @@ Index: b/bgpd/bgp_evpn_vty.c
"Auto-derivation of RT\n"
- "Auto-derivation of RT using RFC8365\n")
+ "Auto-derivation of RT using RFC8365\n"
-+ "Auto-derivation AS\n")
++ "Auto-derivation AS\n"
++ "AS number to use\n")
{
struct bgp *bgp = VTY_GET_CONTEXT(bgp);
@@ -115,7 +117,7 @@ Index: b/bgpd/bgp_evpn_vty.c
return CMD_SUCCESS;
}
-@@ -7286,6 +7305,9 @@
+@@ -7295,6 +7315,9 @@
if (bgp->advertise_autort_rfc8365)
vty_out(vty, " autort rfc8365-compatible\n");
@@ -125,7 +127,7 @@ Index: b/bgpd/bgp_evpn_vty.c
if (bgp->advertise_gw_macip)
vty_out(vty, " advertise-default-gw\n");
-@@ -7528,8 +7550,8 @@
+@@ -7537,8 +7560,8 @@
install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
@@ -138,9 +140,9 @@ Index: b/bgpd/bgp_evpn_vty.c
install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd);
Index: b/bgpd/bgpd.h
===================================================================
---- a/bgpd/bgpd.h 2025-03-07 11:09:47.315423809 +0100
-+++ b/bgpd/bgpd.h 2025-03-07 11:09:47.313423807 +0100
-@@ -745,6 +745,9 @@
+--- a/bgpd/bgpd.h 2025-09-19 15:38:36.128022733 +0200
++++ b/bgpd/bgpd.h 2025-09-19 15:38:36.127010776 +0200
+@@ -757,6 +757,9 @@
/* EVPN - use RFC 8365 to auto-derive RT */
int advertise_autort_rfc8365;
--
2.47.3
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
reply other threads:[~2025-09-19 13:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250919135620.221766-1-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.