mirror of
https://github.com/FRRouting/frr.git
synced 2025-04-30 13:37:17 +02:00
ospfd: Correct one word
Signed-off-by: anlan_cs <anlan_cs@126.com>
This commit is contained in:
parent
f536ca30f5
commit
3522ab21d0
|
@ -1823,7 +1823,7 @@ static void ospf_abr_nssa_type7_default_create(struct ospf *ospf,
|
||||||
"Announcing Type-7 default route into NSSA area %pI4",
|
"Announcing Type-7 default route into NSSA area %pI4",
|
||||||
&area->area_id);
|
&area->area_id);
|
||||||
|
|
||||||
/* Prepare the extrenal_info for aggregator */
|
/* Prepare the external_info for aggregator */
|
||||||
memset(&ei, 0, sizeof(struct external_info));
|
memset(&ei, 0, sizeof(struct external_info));
|
||||||
ei.p.family = AF_INET;
|
ei.p.family = AF_INET;
|
||||||
ei.p.prefixlen = 0;
|
ei.p.prefixlen = 0;
|
||||||
|
|
|
@ -492,7 +492,7 @@ static void ospf_aggr_handle_external_info(void *data)
|
||||||
ei->to_be_processed = true;
|
ei->to_be_processed = true;
|
||||||
|
|
||||||
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
|
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
|
||||||
zlog_debug("%s: Handle extrenal route(%pI4/%d)", __func__,
|
zlog_debug("%s: Handle external route(%pI4/%d)", __func__,
|
||||||
&ei->p.prefix, ei->p.prefixlen);
|
&ei->p.prefix, ei->p.prefixlen);
|
||||||
|
|
||||||
assert(ospf);
|
assert(ospf);
|
||||||
|
@ -571,7 +571,7 @@ static void ospf_external_aggr_delete(struct ospf *ospf, struct route_node *rn)
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ospf_external_aggr_rt *
|
struct ospf_external_aggr_rt *
|
||||||
ospf_extrenal_aggregator_lookup(struct ospf *ospf, struct prefix_ipv4 *p)
|
ospf_external_aggregator_lookup(struct ospf *ospf, struct prefix_ipv4 *p)
|
||||||
{
|
{
|
||||||
struct route_node *rn;
|
struct route_node *rn;
|
||||||
struct ospf_external_aggr_rt *summary_rt = NULL;
|
struct ospf_external_aggr_rt *summary_rt = NULL;
|
||||||
|
@ -617,7 +617,7 @@ void ospf_unlink_ei_from_aggr(struct ospf *ospf,
|
||||||
{
|
{
|
||||||
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
|
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
|
||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s: Unlinking extrenal route(%pI4/%d) from aggregator(%pI4/%d), external route count:%ld",
|
"%s: Unlinking external route(%pI4/%d) from aggregator(%pI4/%d), external route count:%ld",
|
||||||
__func__, &ei->p.prefix, ei->p.prefixlen,
|
__func__, &ei->p.prefix, ei->p.prefixlen,
|
||||||
&aggr->p.prefix, aggr->p.prefixlen,
|
&aggr->p.prefix, aggr->p.prefixlen,
|
||||||
OSPF_EXTERNAL_RT_COUNT(aggr));
|
OSPF_EXTERNAL_RT_COUNT(aggr));
|
||||||
|
@ -648,7 +648,7 @@ static void ospf_link_ei_to_aggr(struct ospf_external_aggr_rt *aggr,
|
||||||
{
|
{
|
||||||
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
|
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
|
||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s: Linking extrenal route(%pI4/%d) to aggregator(%pI4/%d)",
|
"%s: Linking external route(%pI4/%d) to aggregator(%pI4/%d)",
|
||||||
__func__, &ei->p.prefix, ei->p.prefixlen,
|
__func__, &ei->p.prefix, ei->p.prefixlen,
|
||||||
&aggr->p.prefix, aggr->p.prefixlen);
|
&aggr->p.prefix, aggr->p.prefixlen);
|
||||||
(void)hash_get(aggr->match_extnl_hash, ei, hash_alloc_intern);
|
(void)hash_get(aggr->match_extnl_hash, ei, hash_alloc_intern);
|
||||||
|
@ -703,7 +703,7 @@ struct ospf_lsa *ospf_originate_summary_lsa(struct ospf *ospf,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Prepare the extrenal_info for aggregator */
|
/* Prepare the external_info for aggregator */
|
||||||
memset(&ei_aggr, 0, sizeof(ei_aggr));
|
memset(&ei_aggr, 0, sizeof(ei_aggr));
|
||||||
ei_aggr.p = aggr->p;
|
ei_aggr.p = aggr->p;
|
||||||
ei_aggr.tag = aggr->tag;
|
ei_aggr.tag = aggr->tag;
|
||||||
|
@ -1063,7 +1063,7 @@ static void ospf_handle_external_aggr_update(struct ospf *ospf)
|
||||||
|
|
||||||
aggr->action = OSPF_ROUTE_AGGR_NONE;
|
aggr->action = OSPF_ROUTE_AGGR_NONE;
|
||||||
|
|
||||||
/* Prepare the extrenal_info for aggregator */
|
/* Prepare the external_info for aggregator */
|
||||||
memset(&ei_aggr, 0, sizeof(ei_aggr));
|
memset(&ei_aggr, 0, sizeof(ei_aggr));
|
||||||
ei_aggr.p = aggr->p;
|
ei_aggr.p = aggr->p;
|
||||||
ei_aggr.tag = aggr->tag;
|
ei_aggr.tag = aggr->tag;
|
||||||
|
@ -1176,7 +1176,7 @@ int ospf_asbr_external_aggregator_set(struct ospf *ospf, struct prefix_ipv4 *p,
|
||||||
{
|
{
|
||||||
struct ospf_external_aggr_rt *aggregator;
|
struct ospf_external_aggr_rt *aggregator;
|
||||||
|
|
||||||
aggregator = ospf_extrenal_aggregator_lookup(ospf, p);
|
aggregator = ospf_external_aggregator_lookup(ospf, p);
|
||||||
|
|
||||||
if (aggregator) {
|
if (aggregator) {
|
||||||
if (CHECK_FLAG(aggregator->flags,
|
if (CHECK_FLAG(aggregator->flags,
|
||||||
|
@ -1236,7 +1236,7 @@ int ospf_asbr_external_rt_no_advertise(struct ospf *ospf, struct prefix_ipv4 *p)
|
||||||
struct ospf_external_aggr_rt *aggr;
|
struct ospf_external_aggr_rt *aggr;
|
||||||
route_tag_t tag = 0;
|
route_tag_t tag = 0;
|
||||||
|
|
||||||
aggr = ospf_extrenal_aggregator_lookup(ospf, p);
|
aggr = ospf_external_aggregator_lookup(ospf, p);
|
||||||
if (aggr) {
|
if (aggr) {
|
||||||
if (CHECK_FLAG(aggr->flags, OSPF_EXTERNAL_AGGRT_NO_ADVERTISE))
|
if (CHECK_FLAG(aggr->flags, OSPF_EXTERNAL_AGGRT_NO_ADVERTISE))
|
||||||
return OSPF_SUCCESS;
|
return OSPF_SUCCESS;
|
||||||
|
|
|
@ -144,7 +144,7 @@ extern int ospf_external_aggregator_timer_set(struct ospf *ospf,
|
||||||
extern void ospf_external_aggrigator_free(struct ospf_external_aggr_rt *aggr);
|
extern void ospf_external_aggrigator_free(struct ospf_external_aggr_rt *aggr);
|
||||||
|
|
||||||
extern struct ospf_external_aggr_rt *
|
extern struct ospf_external_aggr_rt *
|
||||||
ospf_extrenal_aggregator_lookup(struct ospf *ospf, struct prefix_ipv4 *p);
|
ospf_external_aggregator_lookup(struct ospf *ospf, struct prefix_ipv4 *p);
|
||||||
|
|
||||||
void ospf_unset_all_aggr_flag(struct ospf *ospf);
|
void ospf_unset_all_aggr_flag(struct ospf *ospf);
|
||||||
|
|
||||||
|
|
|
@ -325,7 +325,7 @@ static void ospf_process_self_originated_lsa(struct ospf *ospf,
|
||||||
LSA_REFRESH_FORCE, false);
|
LSA_REFRESH_FORCE, false);
|
||||||
} else {
|
} else {
|
||||||
aggr = (struct ospf_external_aggr_rt *)
|
aggr = (struct ospf_external_aggr_rt *)
|
||||||
ospf_extrenal_aggregator_lookup(ospf, &p);
|
ospf_external_aggregator_lookup(ospf, &p);
|
||||||
if (aggr) {
|
if (aggr) {
|
||||||
struct external_info ei_aggr;
|
struct external_info ei_aggr;
|
||||||
|
|
||||||
|
|
|
@ -4064,7 +4064,7 @@ struct ospf_lsa *ospf_lsa_refresh(struct ospf *ospf, struct ospf_lsa *lsa)
|
||||||
ospf, lsa, ei, LSA_REFRESH_FORCE, false);
|
ospf, lsa, ei, LSA_REFRESH_FORCE, false);
|
||||||
else {
|
else {
|
||||||
aggr = (struct ospf_external_aggr_rt *)
|
aggr = (struct ospf_external_aggr_rt *)
|
||||||
ospf_extrenal_aggregator_lookup(ospf, &p);
|
ospf_external_aggregator_lookup(ospf, &p);
|
||||||
if (aggr) {
|
if (aggr) {
|
||||||
struct external_info ei_aggr;
|
struct external_info ei_aggr;
|
||||||
|
|
||||||
|
|
|
@ -843,7 +843,7 @@ static void ospf_finish_final(struct ospf *ospf)
|
||||||
ospf_distance_reset(ospf);
|
ospf_distance_reset(ospf);
|
||||||
route_table_finish(ospf->distance_table);
|
route_table_finish(ospf->distance_table);
|
||||||
|
|
||||||
/* Release extrenal Aggregator table */
|
/* Release external Aggregator table */
|
||||||
for (rn = route_top(ospf->rt_aggr_tbl); rn; rn = route_next(rn)) {
|
for (rn = route_top(ospf->rt_aggr_tbl); rn; rn = route_next(rn)) {
|
||||||
struct ospf_external_aggr_rt *aggr;
|
struct ospf_external_aggr_rt *aggr;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue