Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge af3734867f into 3dd4d417be

Browse source
This commit is contained in:
JosiahMg 2025-04-29 16:20:41 +00:00 committed by GitHub
parent 3dd4d417be af3734867f
commit 73c14384c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 100 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
isisd/isis_cli.c
View file

@ -1441,6 +1441,37 @@ DEFPY_YANG(isis_redistribute, isis_redistribute_cmd,
level);
}
DEFPY_YANG(isis_redistribute_isis, isis_redistribute_isis_cmd,
"[no] redistribute <ipv4|ipv6>$ip isis "
"<level-1|level-2>$level "
"[{metric (0-16777215)|route-map RMAP_NAME$route_map}]",
NO_STR REDIST_STR
"Redistribute IPv4 routes\n"
"Redistribute IPv6 routes\n"
"Intermediate System to Intermediate System (IS-IS)\n"
"Redistribute into level-1\n"
"Redistribute into level-2\n"
"Metric for redistributed routes\n"
"IS-IS default metric\n"
"Route map reference\n"
"Pointer to route-map entries\n")
{
if (no)
nb_cli_enqueue_change(vty, ".", NB_OP_DESTROY, NULL);
else {
nb_cli_enqueue_change(vty, ".", NB_OP_CREATE, NULL);
nb_cli_enqueue_change(vty, "./route-map",
route_map ? NB_OP_MODIFY : NB_OP_DESTROY,
route_map ? route_map : NULL);
nb_cli_enqueue_change(vty, "./metric", NB_OP_MODIFY,
metric_str ? metric_str : NULL);
}
return nb_cli_apply_changes(vty,
"./redistribute/%s[protocol='isis'][level='%s']",
ip, level);
}
/*
* XPath: /frr-isisd:isis/instance/redistribute/table
*/
@ -4029,6 +4060,7 @@ void isis_cli_init(void)
install_element(ISIS_NODE, &isis_default_originate_cmd);
install_element(ISIS_NODE, &isis_redistribute_cmd);
install_element(ISIS_NODE, &isis_redistribute_isis_cmd);
install_element(ISIS_NODE, &isis_redistribute_table_cmd);
install_element(ISIS_NODE, &isis_topology_cmd);

65
isisd/isis_lsp.c
View file

@ -918,6 +918,30 @@ static void lsp_build_internal_reach_ipv6(struct isis_lsp *lsp,
metric, false, pcfgs);
}
static bool check_ip_in_self_level_db(const struct prefix_ipv4 *ipv4,
struct isis_area *area, int level)
{
struct isis_lsp *lsp = NULL;
struct lspdb_head *head = &area->lspdb[level - 1];
if (head) {
frr_each (lspdb, head, lsp) {
for (struct isis_item *i =
lsp->tlvs->extended_ip_reach.head;
i; i = i->next) {
struct isis_extended_ip_reach *rt =
(struct isis_extended_ip_reach *)i;
if (IPV4_ADDR_SAME(&ipv4->prefix,
&rt->prefix.prefix) &&
ipv4->prefixlen == rt->prefix.prefixlen) {
return true;
}
}
}
}
return false;
}
static void lsp_build_ext_reach_ipv4(struct isis_lsp *lsp,
struct isis_area *area)
@ -934,6 +958,13 @@ static void lsp_build_ext_reach_ipv4(struct isis_lsp *lsp,
struct prefix_ipv4 *ipv4 = (struct prefix_ipv4 *)&rn->p;
struct isis_ext_info *info = rn->info;
if (info && info->origin == ZEBRA_ROUTE_ISIS) {
if ((area->is_type != IS_LEVEL_1_AND_2) ||
(ipv4 &&
check_ip_in_self_level_db(ipv4, area, lsp->level)))
continue;
}
uint32_t metric = info->metric;
if (metric > MAX_WIDE_PATH_METRIC)
metric = MAX_WIDE_PATH_METRIC;
@ -965,6 +996,31 @@ static void lsp_build_ext_reach_ipv4(struct isis_lsp *lsp,
}
}
static bool check_ipv6_in_self_level_db(const struct prefix_ipv6 *ipv6,
struct isis_area *area, int level)
{
struct isis_lsp *lsp = NULL;
struct lspdb_head *head = &area->lspdb[level - 1];
if (head) {
frr_each (lspdb, head, lsp) {
for (struct isis_item *i = lsp->tlvs->ipv6_reach.head;
i; i = i->next) {
struct isis_ipv6_reach *rt =
(struct isis_ipv6_reach *)i;
if (IPV6_ADDR_SAME(&ipv6->prefix.s6_addr,
rt->prefix.prefix.s6_addr) &&
ipv6->prefixlen == rt->prefix.prefixlen) {
return true;
}
}
}
}
return false;
}
static void lsp_build_ext_reach_ipv6(struct isis_lsp *lsp,
struct isis_area *area)
{
@ -978,11 +1034,18 @@ static void lsp_build_ext_reach_ipv6(struct isis_lsp *lsp,
if (!rn->info)
continue;
struct isis_ext_info *info = rn->info;
struct prefix_ipv6 *p, *src_p;
struct prefix_ipv6 *p = NULL, *src_p;
srcdest_rnode_prefixes(rn, (const struct prefix **)&p,
(const struct prefix **)&src_p);
if (info && info->origin == ZEBRA_ROUTE_ISIS) {
if ((area->is_type != IS_LEVEL_1_AND_2) ||
(p &&
check_ipv6_in_self_level_db(p, area, lsp->level)))
continue;
}
uint32_t metric = info->metric;
if (info->metric > MAX_WIDE_PATH_METRIC)
metric = MAX_WIDE_PATH_METRIC;

6
lib/zclient.c
View file

@ -599,8 +599,10 @@ void zclient_send_reg_requests(struct zclient *zclient, vrf_id_t vrf_id)
/* Set unwanted redistribute route. */
for (afi = AFI_IP; afi < AFI_MAX; afi++)
vrf_bitmap_set(&zclient->redist[afi][zclient->redist_default],
vrf_id);
if (zclient->redist_default != ZEBRA_ROUTE_ISIS)
vrf_bitmap_set(&zclient->redist[afi]
[zclient->redist_default],
vrf_id);
/* Flush all redistribute request. */
if (vrf_id == VRF_DEFAULT) {

2
yang/frr-isisd.yang
View file

@ -1535,7 +1535,6 @@ module frr-isisd {
"IPv4 route redistribution.";
leaf protocol {
type frr-route-types:frr-route-types-v4;
must ". != \"isis\"";
description
"Originating routing protocol for the IPv4 routes.";
}
@ -1582,7 +1581,6 @@ module frr-isisd {
"IPv6 route redistribution.";
leaf protocol {
type frr-route-types:frr-route-types-v6;
must ". != \"isis\"";
description
"Originating routing protocol for the IPv6 routes.";
}