summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_vty.c4
-rw-r--r--bgpd/bgpd.c2
-rw-r--r--doc/user/bgp.rst10
-rw-r--r--ospf6d/ospf6_top.c7
-rw-r--r--ospfd/ospf_vty.c4
-rw-r--r--ospfd/ospfd.c2
-rw-r--r--tests/topotests/bgp_community_alias/r1/bgpd.conf2
-rw-r--r--tests/topotests/bgp_community_alias/r2/bgpd.conf3
-rw-r--r--tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf2
-rw-r--r--tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf2
-rw-r--r--tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf2
-rw-r--r--tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf2
-rw-r--r--tests/topotests/zebra_opaque/r1/bgpd.conf2
-rw-r--r--tests/topotests/zebra_opaque/r2/bgpd.conf3
-rw-r--r--tests/topotests/zebra_opaque/r3/ospf6d.conf1
-rw-r--r--tests/topotests/zebra_opaque/r3/ospfd.conf1
-rw-r--r--tests/topotests/zebra_opaque/r4/ospf6d.conf1
-rw-r--r--tests/topotests/zebra_opaque/r4/ospfd.conf1
18 files changed, 34 insertions, 17 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index e3f1abe74..36fe17bc0 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -16994,8 +16994,8 @@ int bgp_config_write(struct vty *vty)
if (bgp_option_check(BGP_OPT_NO_FIB))
vty_out(vty, "bgp no-rib\n");
- if (!CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA))
- vty_out(vty, "no bgp send-extra-data zebra\n");
+ if (CHECK_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA))
+ vty_out(vty, "bgp send-extra-data zebra\n");
/* BGP configuration. */
for (ALL_LIST_ELEMENTS(bm->bgp, mnode, mnnode, bgp)) {
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 72e7a936c..f33ec1479 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -7725,8 +7725,6 @@ void bgp_master_init(struct thread_master *master, const int buffer_size,
bm->socket_buffer = buffer_size;
bm->wait_for_fib = false;
- SET_FLAG(bm->flags, BM_FLAG_SEND_EXTRA_DATA_TO_ZEBRA);
-
bgp_mac_init();
/* init the rd id space.
assign 0th index in the bitfield,
diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index 004b1723e..7d7335a23 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -3921,11 +3921,11 @@ configuration write operation.
.. clicmd:: bgp send-extra-data zebra
-This Command turns off the ability of BGP to send extra data to zebra.
-In this case it's the AS-Path being used for the path. The default behavior
-in BGP is to send this data and to turn it off enter the no form of the command.
-If extra data was sent to zebra, and this command is turned on there is no
-effort to clean up this data in the rib.
+This command turns on the ability of BGP to send extra data to zebra. Currently,
+it's the AS-Path, communities, and the path selection reason. The default
+behavior in BGP is not to send this data. If the routes were sent to zebra and
+the option is changed, bgpd doesn't reinstall the routes to comply with the new
+setting.
.. _bgp-suppress-fib:
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index e2db77d44..2e9e32f2e 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -436,7 +436,6 @@ static struct ospf6 *ospf6_create(const char *name)
o->fd = -1;
o->max_multipath = MULTIPATH_NUM;
- SET_FLAG(o->config_flags, OSPF6_SEND_EXTRA_DATA_TO_ZEBRA);
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",
&ospf6->router_id_static);
- if (!CHECK_FLAG(ospf6->config_flags,
- OSPF6_SEND_EXTRA_DATA_TO_ZEBRA))
- vty_out(vty, " no ospf6 send-extra-data zebra\n");
+ if (CHECK_FLAG(ospf6->config_flags,
+ OSPF6_SEND_EXTRA_DATA_TO_ZEBRA))
+ vty_out(vty, " ospf6 send-extra-data zebra\n");
/* log-adjacency-changes flag print. */
if (CHECK_FLAG(ospf6->config_flags,
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 36cb0673e..482319ffb 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -12297,8 +12297,8 @@ static int ospf_config_write_one(struct vty *vty, struct ospf *ospf)
&ospf->router_id_static);
/* zebra opaque attributes configuration. */
- if (!CHECK_FLAG(ospf->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA))
- vty_out(vty, " no ospf send-extra-data zebra\n");
+ if (CHECK_FLAG(ospf->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA))
+ vty_out(vty, " ospf send-extra-data zebra\n");
/* ABR type print. */
if (ospf->abr_type != OSPF_ABR_DEFAULT)
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 726ce329e..e5f3eec60 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -406,8 +406,6 @@ struct ospf *ospf_new_alloc(unsigned short instance, const char *name)
ospf_opaque_type11_lsa_init(new);
- SET_FLAG(new->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA);
-
QOBJ_REG(new, ospf);
new->fd = -1;
diff --git a/tests/topotests/bgp_community_alias/r1/bgpd.conf b/tests/topotests/bgp_community_alias/r1/bgpd.conf
index 13b57ad24..844ab2855 100644
--- a/tests/topotests/bgp_community_alias/r1/bgpd.conf
+++ b/tests/topotests/bgp_community_alias/r1/bgpd.conf
@@ -1,4 +1,6 @@
!
+bgp send-extra-data zebra
+!
bgp community alias 65001:1 community-r2-1
bgp community alias 65002:2 community-r2-2
bgp community alias 65001:1:1 large-community-r2-1
diff --git a/tests/topotests/bgp_community_alias/r2/bgpd.conf b/tests/topotests/bgp_community_alias/r2/bgpd.conf
index 9276fe592..780607702 100644
--- a/tests/topotests/bgp_community_alias/r2/bgpd.conf
+++ b/tests/topotests/bgp_community_alias/r2/bgpd.conf
@@ -1,3 +1,6 @@
+!
+bgp send-extra-data zebra
+!
router bgp 65002
no bgp ebgp-requires-policy
neighbor 192.168.1.1 remote-as external
diff --git a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf
index c2a49252d..8b743bd32 100644
--- a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf
+++ b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r1/bgpd.conf
@@ -1,4 +1,6 @@
!
+bgp send-extra-data zebra
+!
ipv6 access-list nh1 permit 2001:db8:1::/64
ipv6 access-list nh2 permit 2001:db8:2::/64
ipv6 access-list nh3 permit 2001:db8:3::/64
diff --git a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf
index 19dcf3664..61c36d366 100644
--- a/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf
+++ b/tests/topotests/bgp_route_map_match_ipv6_nexthop/r2/bgpd.conf
@@ -1,4 +1,6 @@
!
+bgp send-extra-data zebra
+!
router bgp 65002
bgp router-id 10.10.10.2
no bgp ebgp-requires-policy
diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
index d07d0532e..d113db12b 100644
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -1,5 +1,7 @@
frr defaults traditional
!
+bgp send-extra-data zebra
+!
hostname r1
password zebra
!
diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf
index d0b3ea8ad..9a7831dd2 100644
--- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf
+++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/bgpd.conf
@@ -1,5 +1,7 @@
frr defaults traditional
!
+bgp send-extra-data zebra
+!
hostname r2
password zebra
!
diff --git a/tests/topotests/zebra_opaque/r1/bgpd.conf b/tests/topotests/zebra_opaque/r1/bgpd.conf
index b0eac45bb..3831360d9 100644
--- a/tests/topotests/zebra_opaque/r1/bgpd.conf
+++ b/tests/topotests/zebra_opaque/r1/bgpd.conf
@@ -1,4 +1,6 @@
!
+bgp send-extra-data zebra
+!
router bgp 65001
no bgp ebgp-requires-policy
neighbor 192.168.1.2 remote-as external
diff --git a/tests/topotests/zebra_opaque/r2/bgpd.conf b/tests/topotests/zebra_opaque/r2/bgpd.conf
index 517ef70f2..ec4760515 100644
--- a/tests/topotests/zebra_opaque/r2/bgpd.conf
+++ b/tests/topotests/zebra_opaque/r2/bgpd.conf
@@ -1,3 +1,6 @@
+!
+bgp send-extra-data zebra
+!
router bgp 65002
no bgp ebgp-requires-policy
neighbor 192.168.1.1 remote-as external
diff --git a/tests/topotests/zebra_opaque/r3/ospf6d.conf b/tests/topotests/zebra_opaque/r3/ospf6d.conf
index bf3d18c6d..7782f4061 100644
--- a/tests/topotests/zebra_opaque/r3/ospf6d.conf
+++ b/tests/topotests/zebra_opaque/r3/ospf6d.conf
@@ -5,4 +5,5 @@ interface r3-eth0
ipv6 ospf6 dead-interval 10
!
router ospf6
+ ospf6 send-extra-data zebra
!
diff --git a/tests/topotests/zebra_opaque/r3/ospfd.conf b/tests/topotests/zebra_opaque/r3/ospfd.conf
index fdc7a9786..f1492676a 100644
--- a/tests/topotests/zebra_opaque/r3/ospfd.conf
+++ b/tests/topotests/zebra_opaque/r3/ospfd.conf
@@ -5,4 +5,5 @@ interface r3-eth0
ip ospf dead-interval 10
!
router ospf
+ ospf send-extra-data zebra
!
diff --git a/tests/topotests/zebra_opaque/r4/ospf6d.conf b/tests/topotests/zebra_opaque/r4/ospf6d.conf
index 3b6846ff1..5118a5358 100644
--- a/tests/topotests/zebra_opaque/r4/ospf6d.conf
+++ b/tests/topotests/zebra_opaque/r4/ospf6d.conf
@@ -5,4 +5,5 @@ interface r4-eth0
ipv6 ospf6 dead-interval 10
!
router ospf6
+ ospf6 send-extra-data zebra
!
diff --git a/tests/topotests/zebra_opaque/r4/ospfd.conf b/tests/topotests/zebra_opaque/r4/ospfd.conf
index 6e08beebc..0da181b78 100644
--- a/tests/topotests/zebra_opaque/r4/ospfd.conf
+++ b/tests/topotests/zebra_opaque/r4/ospfd.conf
@@ -5,4 +5,5 @@ interface r4-eth0
ip ospf dead-interval 10
!
router ospf
+ ospf send-extra-data zebra
!
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 06:15:12 +0100