proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 09:20:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10408 from idryzhov/no-opaque-by-default

Browse Source 
*: do not send opaque data to zebra by default
This commit is contained in:
Donatas Abraitis 2022-01-28 12:54:16 +02:00 committed by GitHub
commit 7a90d91586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_vty.c
View File

@ -16995,8 +16995,8 @@ int bgp_config_write(struct vty *vty)
if (bgp_option_check(BGP_OPT_NO_FIB)) if (bgp_option_check(BGP_OPT_NO_FIB))
vty_out(vty, "bgp no-rib\n"); vty_out(vty, "bgp no-rib\n");
if (!CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA)) if (CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA))
vty_out(vty, "no bgp send-extra-data zebra\n"); vty_out(vty, "bgp send-extra-data zebra\n");
/* BGP configuration. */ /* BGP configuration. */
for (ALL_LIST_ELEMENTS(bm->bgp, mnode, mnnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, mnode, mnnode, bgp)) {

2
bgpd/bgpd.c
View File

@ -7820,8 +7820,6 @@ void bgp_master_init(struct thread_master *master, const int buffer_size,
bm->socket_buffer = buffer_size; bm->socket_buffer = buffer_size;
bm->wait_for_fib = false; bm->wait_for_fib = false;
SET_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA);
bgp_mac_init(); bgp_mac_init();
/* init the rd id space. /* init the rd id space.
assign 0th index in the bitfield, assign 0th index in the bitfield,

10
doc/user/bgp.rst
View File

@ -3921,11 +3921,11 @@ configuration write operation.
.. clicmd:: bgp send-extra-data zebra .. clicmd:: bgp send-extra-data zebra
This Command turns off the ability of BGP to send extra data to zebra. This command turns on the ability of BGP to send extra data to zebra. Currently,
In this case it's the AS-Path being used for the path. The default behavior it's the AS-Path, communities, and the path selection reason. The default
in BGP is to send this data and to turn it off enter the no form of the command. behavior in BGP is not to send this data. If the routes were sent to zebra and
If extra data was sent to zebra, and this command is turned on there is no the option is changed, bgpd doesn't reinstall the routes to comply with the new
effort to clean up this data in the rib. setting.
.. _bgp-suppress-fib: .. _bgp-suppress-fib:

5
ospf6d/ospf6_top.c
View File

@ -436,7 +436,6 @@ static struct ospf6 *ospf6_create(const char *name)
o->fd = -1; o->fd = -1;
o->max_multipath = MULTIPATH_NUM; o->max_multipath = MULTIPATH_NUM;
SET_FLAG(o->config_flags, OSPF6_SEND_EXTRA_DATA_TO_ZEBRA);
o->oi_write_q = list_new(); o->oi_write_q = list_new();
@ -2236,9 +2235,9 @@ static int config_write_ospf6(struct vty *vty)
vty_out(vty, " ospf6 router-id %pI4\n", vty_out(vty, " ospf6 router-id %pI4\n",
&ospf6->router_id_static); &ospf6->router_id_static);
if (!CHECK_FLAG(ospf6->config_flags, if (CHECK_FLAG(ospf6->config_flags,
OSPF6_SEND_EXTRA_DATA_TO_ZEBRA)) OSPF6_SEND_EXTRA_DATA_TO_ZEBRA))
vty_out(vty, " no ospf6 send-extra-data zebra\n"); vty_out(vty, " ospf6 send-extra-data zebra\n");
/* log-adjacency-changes flag print. */ /* log-adjacency-changes flag print. */
if (CHECK_FLAG(ospf6->config_flags, if (CHECK_FLAG(ospf6->config_flags,

4
ospfd/ospf_vty.c
View File

@ -12293,8 +12293,8 @@ static int ospf_config_write_one(struct vty *vty, struct ospf *ospf)
&ospf->router_id_static); &ospf->router_id_static);
/* zebra opaque attributes configuration. */ /* zebra opaque attributes configuration. */
if (!CHECK_FLAG(ospf->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA)) if (CHECK_FLAG(ospf->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA))
vty_out(vty, " no ospf send-extra-data zebra\n"); vty_out(vty, " ospf send-extra-data zebra\n");
/* ABR type print. */ /* ABR type print. */
if (ospf->abr_type != OSPF_ABR_DEFAULT) if (ospf->abr_type != OSPF_ABR_DEFAULT)

2
ospfd/ospfd.c
View File

@ -406,8 +406,6 @@ struct ospf *ospf_new_alloc(unsigned short instance, const char *name)
ospf_opaque_type11_lsa_init(new); ospf_opaque_type11_lsa_init(new);
SET_FLAG(new->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA);
QOBJ_REG(new, ospf); QOBJ_REG(new, ospf);
new->fd = -1; new->fd = -1;

2
tests/topotests/bgp_community_alias/r1/bgpd.conf
View File

@ -1,4 +1,6 @@
! !
bgp send-extra-data zebra
!
bgp community alias 65001:1 community-r2-1 bgp community alias 65001:1 community-r2-1
bgp community alias 65002:2 community-r2-2 bgp community alias 65002:2 community-r2-2
bgp community alias 65001:1:1 large-community-r2-1 bgp community alias 65001:1:1 large-community-r2-1

3
tests/topotests/bgp_community_alias/r2/bgpd.conf
View File

@ -1,3 +1,6 @@
!
bgp send-extra-data zebra
!
router bgp 65002 router bgp 65002
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
neighbor 192.168.1.1 remote-as external neighbor 192.168.1.1 remote-as external

2
tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf
View File

@ -1,4 +1,6 @@
! !
bgp send-extra-data zebra
!
ipv6 access-list nh1 permit 2001:db8:1::/64 ipv6 access-list nh1 permit 2001:db8:1::/64
ipv6 access-list nh2 permit 2001:db8:2::/64 ipv6 access-list nh2 permit 2001:db8:2::/64
ipv6 access-list nh3 permit 2001:db8:3::/64 ipv6 access-list nh3 permit 2001:db8:3::/64

2
tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf
View File

@ -1,4 +1,6 @@
! !
bgp send-extra-data zebra
!
router bgp 65002 router bgp 65002
bgp router-id 10.10.10.2 bgp router-id 10.10.10.2
no bgp ebgp-requires-policy no bgp ebgp-requires-policy

2
tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
View File

@ -1,5 +1,7 @@
frr defaults traditional frr defaults traditional
! !
bgp send-extra-data zebra
!
hostname r1 hostname r1
password zebra password zebra
! !

2
tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf
View File

@ -1,5 +1,7 @@
frr defaults traditional frr defaults traditional
! !
bgp send-extra-data zebra
!
hostname r2 hostname r2
password zebra password zebra
! !

2
tests/topotests/zebra_opaque/r1/bgpd.conf
View File

@ -1,4 +1,6 @@
! !
bgp send-extra-data zebra
!
router bgp 65001 router bgp 65001
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
neighbor 192.168.1.2 remote-as external neighbor 192.168.1.2 remote-as external

3
tests/topotests/zebra_opaque/r2/bgpd.conf
View File

@ -1,3 +1,6 @@
!
bgp send-extra-data zebra
!
router bgp 65002 router bgp 65002
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
neighbor 192.168.1.1 remote-as external neighbor 192.168.1.1 remote-as external

1
tests/topotests/zebra_opaque/r3/ospf6d.conf
View File

@ -5,4 +5,5 @@ interface r3-eth0
ipv6 ospf6 dead-interval 10 ipv6 ospf6 dead-interval 10
! !
router ospf6 router ospf6
ospf6 send-extra-data zebra
! !

1
tests/topotests/zebra_opaque/r3/ospfd.conf
View File

@ -5,4 +5,5 @@ interface r3-eth0
ip ospf dead-interval 10 ip ospf dead-interval 10
! !
router ospf router ospf
ospf send-extra-data zebra
! !

1
tests/topotests/zebra_opaque/r4/ospf6d.conf
View File

@ -5,4 +5,5 @@ interface r4-eth0
ipv6 ospf6 dead-interval 10 ipv6 ospf6 dead-interval 10
! !
router ospf6 router ospf6
ospf6 send-extra-data zebra
! !

1
tests/topotests/zebra_opaque/r4/ospfd.conf
View File

@ -5,4 +5,5 @@ interface r4-eth0
ip ospf dead-interval 10 ip ospf dead-interval 10
! !
router ospf router ospf
ospf send-extra-data zebra
! !