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

update patches

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2021-07-13 17:24:53 +02:00 committed by Thomas Lamprecht
parent 1969044cf9
commit 18819c80b1
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/patches/pve/0001-enable-bgp-daemon.patch vendored
View File

@ -1,7 +1,7 @@
From f098e90f4d690e771f63f48e0540a470faa91892 Mon Sep 17 00:00:00 2001 From 249e602260f1c5bacffb7bc5bd0f5e8db635050d Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com> From: Alexandre Derumier <aderumier@odiso.com>
Date: Wed, 25 Nov 2020 12:41:32 +0100 Date: Wed, 25 Nov 2020 12:41:32 +0100
Subject: [PATCH] enable bgp && bfd daemons Subject: [PATCH 1/2] enable bgp && bfd daemons
Signed-off-by: Alexandre Derumier <aderumier@odiso.com> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
--- ---
@ -9,12 +9,12 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
index 8bec3c5bb..7cdfa840c 100644 index f6d512be7..4cddea326 100644
--- a/tools/etc/frr/daemons --- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
# #
# The watchfrr and zebra daemons are always started. # The watchfrr, zebra and staticd daemons are always started.
# #
-bgpd=no -bgpd=no
+bgpd=yes +bgpd=yes
@ -31,5 +31,5 @@ index 8bec3c5bb..7cdfa840c 100644
vrrpd=no vrrpd=no
-- --
2.20.1 2.30.2

24
debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch vendored
View File

@ -1,7 +1,7 @@
From c3e66b067564281a58fcf3b99559d289a75090e9 Mon Sep 17 00:00:00 2001 From 159e7b812c722f663de48049d2070401dcb246b5 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com> From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 17 Nov 2020 06:01:26 +0100 Date: Tue, 17 Nov 2020 06:01:26 +0100
Subject: [PATCH 1/3] bgpd : add an option for RT auto-derivation to force AS Subject: [PATCH 2/2] bgpd : add an option for RT auto-derivation to force AS
Allow to define a custom AS for autort AS:VNI Allow to define a custom AS for autort AS:VNI
@ -16,10 +16,10 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
3 files changed, 47 insertions(+), 17 deletions(-) 3 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 84e8960ee..73acc5d7b 100644 index fa4145cf7..9ab60abe5 100644
--- a/bgpd/bgp_evpn.c --- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c +++ b/bgpd/bgp_evpn.c
@@ -512,7 +512,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl) @@ -509,7 +509,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
if (bgp->advertise_autort_rfc8365) if (bgp->advertise_autort_rfc8365)
vni |= EVPN_AUTORT_VXLAN; vni |= EVPN_AUTORT_VXLAN;
@ -32,7 +32,7 @@ index 84e8960ee..73acc5d7b 100644
ecomadd = ecommunity_new(); ecomadd = ecommunity_new();
ecommunity_add_val(ecomadd, &eval, false, false); ecommunity_add_val(ecomadd, &eval, false, false);
@@ -4238,7 +4242,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl) @@ -4253,7 +4257,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
if (bgp->advertise_autort_rfc8365) if (bgp->advertise_autort_rfc8365)
vni |= EVPN_AUTORT_VXLAN; vni |= EVPN_AUTORT_VXLAN;
@ -46,10 +46,10 @@ index 84e8960ee..73acc5d7b 100644
ecom_auto = ecommunity_new(); ecom_auto = ecommunity_new();
ecommunity_add_val(ecom_auto, &eval, false, false); ecommunity_add_val(ecom_auto, &eval, false, false);
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index e9e2aafeb..6cc6bba33 100644 index 2f207f8ab..fac80c0d7 100644
--- a/bgpd/bgp_evpn_vty.c --- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c
@@ -3226,32 +3226,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni, @@ -3213,32 +3213,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -111,7 +111,7 @@ index e9e2aafeb..6cc6bba33 100644
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@@ -5596,6 +5612,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi, @@ -5599,6 +5615,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
if (bgp->advertise_autort_rfc8365) if (bgp->advertise_autort_rfc8365)
vty_out(vty, " autort rfc8365-compatible\n"); vty_out(vty, " autort rfc8365-compatible\n");
@ -121,7 +121,7 @@ index e9e2aafeb..6cc6bba33 100644
if (bgp->advertise_gw_macip) if (bgp->advertise_gw_macip)
vty_out(vty, " advertise-default-gw\n"); vty_out(vty, " advertise-default-gw\n");
@@ -5732,8 +5751,8 @@ void bgp_ethernetvpn_init(void) @@ -5735,8 +5754,8 @@ void bgp_ethernetvpn_init(void)
install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd); install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd); install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd); install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
@ -133,10 +133,10 @@ index e9e2aafeb..6cc6bba33 100644
install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_default_gw_cmd); install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_default_gw_cmd);
install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd); install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd);
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index d22fd008d..941066e2e 100644 index 19aa1ce5f..2ace67112 100644
--- a/bgpd/bgpd.h --- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h +++ b/bgpd/bgpd.h
@@ -614,6 +614,9 @@ struct bgp { @@ -616,6 +616,9 @@ struct bgp {
/* EVPN - use RFC 8365 to auto-derive RT */ /* EVPN - use RFC 8365 to auto-derive RT */
int advertise_autort_rfc8365; int advertise_autort_rfc8365;
@ -147,5 +147,5 @@ index d22fd008d..941066e2e 100644
* Flooding mechanism for BUM packets for VxLAN-EVPN. * Flooding mechanism for BUM packets for VxLAN-EVPN.
*/ */
-- --
2.20.1 2.30.2