proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 14:29:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8499 from donaldsharp/ospf_what

Browse Source 
Ospf what
This commit is contained in:
Rafael Zalamena 2021-05-04 14:41:42 -03:00 committed by GitHub
commit bc79672d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 250 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
ospfd/ospf_asbr.c
View File

@ -113,7 +113,6 @@ ospf_external_info_add(struct ospf *ospf, uint8_t type, unsigned short instance,
struct external_info *new;
struct route_node *rn;
struct ospf_external *ext;
char inetbuf[INET6_BUFSIZ];
ext = ospf_external_lookup(ospf, type, instance);
if (!ext)
@ -121,26 +120,23 @@ ospf_external_info_add(struct ospf *ospf, uint8_t type, unsigned short instance,
rn = route_node_get(EXTERNAL_INFO(ext), (struct prefix *)&p);
/* If old info exists, -- discard new one or overwrite with new one? */
if (rn)
if (rn->info) {
new = rn->info;
if ((new->ifindex == ifindex)
&& (new->nexthop.s_addr == nexthop.s_addr)
&& (new->tag == tag)) {
route_unlock_node(rn);
return NULL; /* NULL => no LSA to refresh */
}
inet_ntop(AF_INET, (void *)&nexthop.s_addr, inetbuf,
sizeof(inetbuf));
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
zlog_debug(
"Redistribute[%s][%d][%u]: %pFX discarding old info with NH %s.",
ospf_redist_string(type), instance,
ospf->vrf_id, &p, inetbuf);
XFREE(MTYPE_OSPF_EXTERNAL_INFO, rn->info);
if (rn && rn->info) {
new = rn->info;
if ((new->ifindex == ifindex)
&& (new->nexthop.s_addr == nexthop.s_addr)
&& (new->tag == tag)) {
route_unlock_node(rn);
return NULL; /* NULL => no LSA to refresh */
}
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE))
zlog_debug(
"Redistribute[%s][%d][%u]: %pFX discarding old info with NH %pI4.",
ospf_redist_string(type), instance,
ospf->vrf_id, &p, &nexthop.s_addr);
XFREE(MTYPE_OSPF_EXTERNAL_INFO, rn->info);
}
/* Create new External info instance. */
new = ospf_external_info_new(type, instance);
new->p = p;
@ -155,12 +151,10 @@ ospf_external_info_add(struct ospf *ospf, uint8_t type, unsigned short instance,
rn->info = new;
if (IS_DEBUG_OSPF(lsa, LSA_GENERATE)) {
inet_ntop(AF_INET, (void *)&nexthop.s_addr, inetbuf,
sizeof(inetbuf));
zlog_debug(
"Redistribute[%s][%u]: %pFX external info created, with NH %s",
ospf_redist_string(type), ospf->vrf_id,
&p, inetbuf);
"Redistribute[%s][%u]: %pFX external info created, with NH %pI4",
ospf_redist_string(type), ospf->vrf_id, &p,
&nexthop.s_addr);
}
return new;
}
@ -329,34 +323,36 @@ void ospf_redistribute_withdraw(struct ospf *ospf, uint8_t type,
return;
/* Delete external info for specified type. */
if (EXTERNAL_INFO(ext))
for (rn = route_top(EXTERNAL_INFO(ext)); rn;
rn = route_next(rn))
if ((ei = rn->info)) {
struct ospf_external_aggr_rt *aggr;
if (!EXTERNAL_INFO(ext))
return;
if (is_prefix_default(&ei->p)
&& ospf->default_originate
!= DEFAULT_ORIGINATE_NONE)
continue;
for (rn = route_top(EXTERNAL_INFO(ext)); rn; rn = route_next(rn)) {
ei = rn->info;
aggr = ei->aggr_route;
if (!ei)
continue;
if (aggr)
ospf_unlink_ei_from_aggr(ospf, aggr,
ei);
else if (ospf_external_info_find_lsa(ospf,
&ei->p))
ospf_external_lsa_flush(
ospf, type, &ei->p,
struct ospf_external_aggr_rt *aggr;
if (is_prefix_default(&ei->p)
&& ospf->default_originate != DEFAULT_ORIGINATE_NONE)
continue;
aggr = ei->aggr_route;
if (aggr)
ospf_unlink_ei_from_aggr(ospf, aggr, ei);
else if (ospf_external_info_find_lsa(ospf, &ei->p))
ospf_external_lsa_flush(ospf, type, &ei->p,
ei->ifindex /*, ei->nexthop */);
ospf_external_info_free(ei);
route_unlock_node(rn);
rn->info = NULL;
}
ospf_external_info_free(ei);
route_unlock_node(rn);
rn->info = NULL;
}
}
/* External Route Aggregator Handlers */
bool is_valid_summary_addr(struct prefix_ipv4 *p)
{

3
ospfd/ospf_sr.c
View File

@ -1689,7 +1689,8 @@ void ospf_sr_ext_itf_add(struct ext_itf *exti)
else
srl->nhlfe[1].nexthop = exti->rmt_itf_addr.value;
break;
default:
case PREF_SID:
case LOCAL_SID:
/* Wrong SID Type. Abort! */
XFREE(MTYPE_OSPF_SR_PARAMS, srl);
return;

433
ospfd/ospf_zebra.c
View File

@ -637,7 +637,8 @@ void ospf_zebra_update_prefix_sid(const struct sr_prefix *srp)
}
}
break;
default:
case ADJ_SID:
case LAN_ADJ_SID:
return;
}
@ -765,12 +766,12 @@ int ospf_is_type_redistributed(struct ospf *ospf, int type,
ospf->vrf_id)
: ((instance
&& redist_check_instance(
&zclient->mi_redist[AFI_IP][type],
instance))
&zclient->mi_redist[AFI_IP][type],
instance))
|| (!instance
&& vrf_bitmap_check(
zclient->redist[AFI_IP][type],
ospf->vrf_id))));
zclient->redist[AFI_IP][type],
ospf->vrf_id))));
}
int ospf_redistribute_set(struct ospf *ospf, int type, unsigned short instance,
@ -1262,104 +1263,92 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
return 0;
}
if (ospf->router_id.s_addr != INADDR_ANY) {
if (ei) {
if (is_prefix_default(&p))
ospf_external_lsa_refresh_default(ospf);
else {
struct ospf_external_aggr_rt *aggr;
struct as_external_lsa *al;
struct ospf_lsa *lsa = NULL;
struct in_addr mask;
if (is_prefix_default(&p))
ospf_external_lsa_refresh_default(ospf);
else {
struct ospf_external_aggr_rt *aggr;
struct as_external_lsa *al;
struct ospf_lsa *lsa = NULL;
struct in_addr mask;
aggr = ospf_external_aggr_match(ospf,
&ei->p);
aggr = ospf_external_aggr_match(ospf, &ei->p);
if (aggr) {
/* Check the AS-external-LSA
* should be originated.
if (aggr) {
/* Check the AS-external-LSA
* should be originated.
*/
if (!ospf_redistribute_check(ospf, ei,
NULL))
return 0;
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
zlog_debug(
"%s: Send Aggreate LSA (%pI4/%d)",
__func__,
&aggr->p.prefix,
aggr->p.prefixlen);
ospf_originate_summary_lsa(ospf, aggr,
ei);
/* Handling the case where the
* external route prefix
* and aggegate prefix is same
* If same dont flush the
* originated
* external LSA.
*/
if (prefix_same(
(struct prefix *)&aggr->p,
(struct prefix *)&ei->p))
return 0;
lsa = ospf_external_info_find_lsa(
ospf, &ei->p);
if (lsa) {
al = (struct as_external_lsa *)
lsa->data;
masklen2ip(ei->p.prefixlen,
&mask);
if (mask.s_addr
!= al->mask.s_addr)
return 0;
ospf_external_lsa_flush(
ospf, ei->type, &ei->p,
0);
}
} else {
struct ospf_lsa *current;
current = ospf_external_info_find_lsa(
ospf, &ei->p);
if (!current) {
/* Check the
* AS-external-LSA
* should be
* originated.
*/
if (!ospf_redistribute_check(
ospf, ei, NULL))
return 0;
if (IS_DEBUG_OSPF(
lsa,
EXTNL_LSA_AGGR))
zlog_debug(
"%s: Send Aggreate LSA (%pI4/%d)",
__func__,
&aggr->p.prefix,
aggr->p.prefixlen);
ospf_originate_summary_lsa(
ospf, aggr, ei);
/* Handling the case where the
* external route prefix
* and aggegate prefix is same
* If same dont flush the
* originated
* external LSA.
*/
if (prefix_same(
(struct prefix
*)&aggr->p,
(struct prefix *)&ei
->p))
return 0;
lsa = ospf_external_info_find_lsa(
ospf, &ei->p);
if (lsa) {
al = (struct
as_external_lsa *)
lsa->data;
masklen2ip(
ei->p.prefixlen,
&mask);
if (mask.s_addr
!= al->mask.s_addr)
return 0;
ospf_external_lsa_flush(
ospf, ei->type,
&ei->p, 0);
}
ospf_external_lsa_originate(
ospf, ei);
} else {
struct ospf_lsa *current;
current =
ospf_external_info_find_lsa(
ospf, &ei->p);
if (!current) {
/* Check the
* AS-external-LSA
* should be
* originated.
*/
if (!ospf_redistribute_check(
ospf, ei,
NULL))
return 0;
ospf_external_lsa_originate(
ospf, ei);
} else {
if (IS_DEBUG_OSPF(
zebra,
ZEBRA_REDISTRIBUTE))
zlog_debug(
"%s: %pI4 refreshing LSA",
__func__,
&p.prefix);
ospf_external_lsa_refresh(
ospf, current,
ei,
LSA_REFRESH_FORCE,
false);
}
if (IS_DEBUG_OSPF(
zebra,
ZEBRA_REDISTRIBUTE))
zlog_debug(
"%s: %pI4 refreshing LSA",
__func__,
&p.prefix);
ospf_external_lsa_refresh(
ospf, current, ei,
LSA_REFRESH_FORCE,
false);
}
}
}
@ -1371,20 +1360,19 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
*/
ospf_external_lsa_default_routemap_apply(ospf, ei, cmd);
} else /* if (cmd == ZEBRA_REDISTRIBUTE_ROUTE_DEL) */
{
} else { /* if (cmd == ZEBRA_REDISTRIBUTE_ROUTE_DEL) */
struct ospf_external_aggr_rt *aggr;
ei = ospf_external_info_lookup(ospf, rt_type, api.instance, &p);
if (ei == NULL)
return 0;
else
/*
* Check if default-information originate i
* with some routemap prefix/access list match.
* Apply before ei is deleted.
*/
ospf_external_lsa_default_routemap_apply(ospf, ei, cmd);
/*
* Check if default-information originate i
* with some routemap prefix/access list match.
* Apply before ei is deleted.
*/
ospf_external_lsa_default_routemap_apply(ospf, ei, cmd);
aggr = ospf_external_aggr_match(ospf, &ei->p);
@ -1405,7 +1393,6 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
}
}
return 0;
}
@ -1490,85 +1477,83 @@ static int ospf_distribute_list_update_timer(struct thread *thread)
rt = ext->external_info;
if (!rt)
continue;
for (rn = route_top(rt); rn; rn = route_next(rn))
if ((ei = rn->info) != NULL) {
if (is_prefix_default(&ei->p))
default_refresh = 1;
else {
struct ospf_external_aggr_rt
*aggr;
aggr = ospf_external_aggr_match(
ospf, &ei->p);
if (aggr) {
/* Check the
* AS-external-LSA
* should be originated.
*/
if (!ospf_redistribute_check(
ospf, ei,
NULL)) {
for (rn = route_top(rt); rn; rn = route_next(rn)) {
ei = rn->info;
if (!ei)
continue;
ospf_unlink_ei_from_aggr(
ospf,
aggr,
ei);
continue;
}
if (is_prefix_default(&ei->p))
default_refresh = 1;
else {
struct ospf_external_aggr_rt *aggr;
if (IS_DEBUG_OSPF(
lsa,
EXTNL_LSA_AGGR))
zlog_debug(
"%s: Send Aggregate LSA (%pI4/%d)",
__func__,
&aggr->p.prefix,
aggr->p.prefixlen);
aggr = ospf_external_aggr_match(ospf,
&ei->p);
if (aggr) {
/* Check the
* AS-external-LSA
* should be originated.
*/
if (!ospf_redistribute_check(
ospf, ei, NULL)) {
/* Originate Aggregate
* LSA
*/
ospf_originate_summary_lsa(
ospf_unlink_ei_from_aggr(
ospf, aggr, ei);
} else if (
(lsa = ospf_external_info_find_lsa(
ospf,
&ei->p))) {
int force =
LSA_REFRESH_IF_CHANGED;
/* If this is a MaxAge
* LSA, we need to
* force refresh it
* because distribute
* settings might have
* changed and now,
* this LSA needs to be
* originated, not be
* removed.
* If we don't force
* refresh it, it will
* remain a MaxAge LSA
* because it will look
* like it hasn't
* changed. Neighbors
* will not receive
* updates for this LSA.
*/
if (IS_LSA_MAXAGE(lsa))
force = LSA_REFRESH_FORCE;
ospf_external_lsa_refresh(
ospf, lsa, ei,
force, false);
} else {
if (!ospf_redistribute_check(
ospf, ei,
NULL))
continue;
ospf_external_lsa_originate(
ospf, ei);
continue;
}
if (IS_DEBUG_OSPF(
lsa,
EXTNL_LSA_AGGR))
zlog_debug(
"%s: Send Aggregate LSA (%pI4/%d)",
__func__,
&aggr->p.prefix,
aggr->p.prefixlen);
/* Originate Aggregate
* LSA
*/
ospf_originate_summary_lsa(
ospf, aggr, ei);
} else if (
(lsa = ospf_external_info_find_lsa(
ospf, &ei->p))) {
int force =
LSA_REFRESH_IF_CHANGED;
/* If this is a MaxAge
* LSA, we need to
* force refresh it
* because distribute
* settings might have
* changed and now,
* this LSA needs to be
* originated, not be
* removed.
* If we don't force
* refresh it, it will
* remain a MaxAge LSA
* because it will look
* like it hasn't
* changed. Neighbors
* will not receive
* updates for this LSA.
*/
if (IS_LSA_MAXAGE(lsa))
force = LSA_REFRESH_FORCE;
ospf_external_lsa_refresh(
ospf, lsa, ei, force,
false);
} else {
if (!ospf_redistribute_check(
ospf, ei, NULL))
continue;
ospf_external_lsa_originate(
ospf, ei);
}
}
}
}
}
if (default_refresh)
@ -1718,17 +1703,16 @@ void ospf_prefix_list_update(struct prefix_list *plist)
struct ospf_redist *red;
red_list = ospf->redist[type];
if (red_list) {
for (ALL_LIST_ELEMENTS_RO(red_list, node,
red)) {
if (ROUTEMAP(red)) {
/* if route-map is not NULL
* it may be using
* this prefix list */
ospf_distribute_list_update(
ospf, type,
red->instance);
}
if (!red_list)
continue;
for (ALL_LIST_ELEMENTS_RO(red_list, node, red)) {
if (ROUTEMAP(red)) {
/* if route-map is not NULL
* it may be using
* this prefix list */
ospf_distribute_list_update(
ospf, type, red->instance);
}
}
}
@ -1736,28 +1720,24 @@ void ospf_prefix_list_update(struct prefix_list *plist)
/* Update area filter-lists. */
for (ALL_LIST_ELEMENTS_RO(ospf->areas, node, area)) {
/* Update filter-list in. */
if (PREFIX_NAME_IN(area))
if (strcmp(PREFIX_NAME_IN(area),
prefix_list_name(plist))
== 0) {
PREFIX_LIST_IN(area) =
prefix_list_lookup(
AFI_IP,
PREFIX_NAME_IN(area));
abr_inv++;
}
if (PREFIX_NAME_IN(area)
&& strcmp(PREFIX_NAME_IN(area),
prefix_list_name(plist))
== 0) {
PREFIX_LIST_IN(area) = prefix_list_lookup(
AFI_IP, PREFIX_NAME_IN(area));
abr_inv++;
}
/* Update filter-list out. */
if (PREFIX_NAME_OUT(area))
if (strcmp(PREFIX_NAME_OUT(area),
prefix_list_name(plist))
== 0) {
PREFIX_LIST_IN(area) =
prefix_list_lookup(
AFI_IP,
PREFIX_NAME_OUT(area));
abr_inv++;
}
if (PREFIX_NAME_OUT(area)
&& strcmp(PREFIX_NAME_OUT(area),
prefix_list_name(plist))
== 0) {
PREFIX_LIST_IN(area) = prefix_list_lookup(
AFI_IP, PREFIX_NAME_OUT(area));
abr_inv++;
}
}
/* Schedule ABR task. */
@ -1857,14 +1837,17 @@ void ospf_distance_reset(struct ospf *ospf)
struct route_node *rn;
struct ospf_distance *odistance;
for (rn = route_top(ospf->distance_table); rn; rn = route_next(rn))
if ((odistance = rn->info) != NULL) {
if (odistance->access_list)
free(odistance->access_list);
ospf_distance_free(odistance);
rn->info = NULL;
route_unlock_node(rn);
}
for (rn = route_top(ospf->distance_table); rn; rn = route_next(rn)) {
odistance = rn->info;
if (!odistance)
continue;
if (odistance->access_list)
free(odistance->access_list);
ospf_distance_free(odistance);
rn->info = NULL;
route_unlock_node(rn);
}
}
uint8_t ospf_distance_apply(struct ospf *ospf, struct prefix_ipv4 *p,
@ -1874,18 +1857,16 @@ uint8_t ospf_distance_apply(struct ospf *ospf, struct prefix_ipv4 *p,
if (ospf == NULL)
return 0;
if (ospf->distance_intra)
if (or->path_type == OSPF_PATH_INTRA_AREA)
return ospf->distance_intra;
if (ospf->distance_intra && or->path_type == OSPF_PATH_INTRA_AREA)
return ospf->distance_intra;
if (ospf->distance_inter)
if (or->path_type == OSPF_PATH_INTER_AREA)
return ospf->distance_inter;
if (ospf->distance_inter && or->path_type == OSPF_PATH_INTER_AREA)
return ospf->distance_inter;
if (ospf->distance_external)
if (or->path_type == OSPF_PATH_TYPE1_EXTERNAL ||
or->path_type == OSPF_PATH_TYPE2_EXTERNAL)
return ospf->distance_external;
if (ospf->distance_external
&& (or->path_type == OSPF_PATH_TYPE1_EXTERNAL ||
or->path_type == OSPF_PATH_TYPE2_EXTERNAL))
return ospf->distance_external;
if (ospf->distance_all)
return ospf->distance_all;