Skip to content

Commit

Permalink
Merge branch 'FRRouting:master' into label-per-nexthop
Browse files Browse the repository at this point in the history
  • Loading branch information
@lsang6WIND
lsang6WIND authored Oct 25, 2024
2 parents d554310 + 3f446ec commit f83fd05
Show file tree
Hide file tree
Showing 243 changed files with 8,421 additions and 1,519 deletions.
24 changes: 12 additions & 12 deletions bfdd/bfdd_cli.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ void bfd_cli_show_minimum_ttl(struct vty *vty, const struct lyd_node *dnode,

DEFPY_YANG(
bfd_peer_mult, bfd_peer_mult_cmd,
"[no] detect-multiplier ![(2-255)$multiplier]",
"[no] detect-multiplier ![(1-255)$multiplier]",
NO_STR
"Configure peer detection multiplier\n"
"Configure peer detection multiplier value\n")
Expand All @@ -357,7 +357,7 @@ void bfd_cli_show_mult(struct vty *vty, const struct lyd_node *dnode,

DEFPY_YANG(
bfd_peer_rx, bfd_peer_rx_cmd,
"[no] receive-interval ![(10-60000)$interval]",
"[no] receive-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer receive interval\n"
"Configure peer receive interval value in milliseconds\n")
Expand All @@ -381,7 +381,7 @@ void bfd_cli_show_rx(struct vty *vty, const struct lyd_node *dnode,

DEFPY_YANG(
bfd_peer_tx, bfd_peer_tx_cmd,
"[no] transmit-interval ![(10-60000)$interval]",
"[no] transmit-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer transmit interval\n"
"Configure peer transmit interval value in milliseconds\n")
Expand Down Expand Up @@ -439,7 +439,7 @@ void bfd_cli_show_echo(struct vty *vty, const struct lyd_node *dnode,

DEFPY_YANG(
bfd_peer_echo_interval, bfd_peer_echo_interval_cmd,
"[no] echo-interval ![(10-60000)$interval]",
"[no] echo-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer echo intervals\n"
"Configure peer echo rx/tx intervals value in milliseconds\n")
Expand All @@ -462,7 +462,7 @@ DEFPY_YANG(

DEFPY_YANG(
bfd_peer_echo_transmit_interval, bfd_peer_echo_transmit_interval_cmd,
"[no] echo transmit-interval ![(10-60000)$interval]",
"[no] echo transmit-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer echo intervals\n"
"Configure desired transmit interval\n"
Expand Down Expand Up @@ -492,7 +492,7 @@ void bfd_cli_show_desired_echo_transmission_interval(

DEFPY_YANG(
bfd_peer_echo_receive_interval, bfd_peer_echo_receive_interval_cmd,
"[no] echo receive-interval ![<disabled$disabled|(10-60000)$interval>]",
"[no] echo receive-interval ![<disabled$disabled|(10-4294967)$interval>]",
NO_STR
"Configure peer echo intervals\n"
"Configure required receive interval\n"
Expand Down Expand Up @@ -577,19 +577,19 @@ void bfd_cli_show_profile(struct vty *vty, const struct lyd_node *dnode,
}

ALIAS_YANG(bfd_peer_mult, bfd_profile_mult_cmd,
"[no] detect-multiplier ![(2-255)$multiplier]",
"[no] detect-multiplier ![(1-255)$multiplier]",
NO_STR
"Configure peer detection multiplier\n"
"Configure peer detection multiplier value\n")

ALIAS_YANG(bfd_peer_tx, bfd_profile_tx_cmd,
"[no] transmit-interval ![(10-60000)$interval]",
"[no] transmit-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer transmit interval\n"
"Configure peer transmit interval value in milliseconds\n")

ALIAS_YANG(bfd_peer_rx, bfd_profile_rx_cmd,
"[no] receive-interval ![(10-60000)$interval]",
"[no] receive-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer receive interval\n"
"Configure peer receive interval value in milliseconds\n")
Expand Down Expand Up @@ -621,22 +621,22 @@ ALIAS_YANG(bfd_peer_echo, bfd_profile_echo_cmd,
"Configure echo mode\n")

ALIAS_YANG(bfd_peer_echo_interval, bfd_profile_echo_interval_cmd,
"[no] echo-interval ![(10-60000)$interval]",
"[no] echo-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer echo interval\n"
"Configure peer echo interval value in milliseconds\n")

ALIAS_YANG(
bfd_peer_echo_transmit_interval, bfd_profile_echo_transmit_interval_cmd,
"[no] echo transmit-interval ![(10-60000)$interval]",
"[no] echo transmit-interval ![(10-4294967)$interval]",
NO_STR
"Configure peer echo intervals\n"
"Configure desired transmit interval\n"
"Configure interval value in milliseconds\n")

ALIAS_YANG(
bfd_peer_echo_receive_interval, bfd_profile_echo_receive_interval_cmd,
"[no] echo receive-interval ![<disabled$disabled|(10-60000)$interval>]",
"[no] echo receive-interval ![<disabled$disabled|(10-4294967)$interval>]",
NO_STR
"Configure peer echo intervals\n"
"Configure required receive interval\n"
Expand Down
37 changes: 35 additions & 2 deletions bgpd/bgp_aspath.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ static struct aspath *aspath_new(enum asnotation_mode asnotation)

as = XCALLOC(MTYPE_AS_PATH, sizeof(struct aspath));
as->asnotation = asnotation;
as->count = 0;

return as;
}

Expand Down Expand Up @@ -399,6 +401,11 @@ unsigned int aspath_count_confeds(struct aspath *aspath)
}

unsigned int aspath_count_hops(const struct aspath *aspath)
{
return aspath->count;
}

static unsigned int aspath_count_hops_internal(const struct aspath *aspath)
{
int count = 0;
struct assegment *seg = aspath->segments;
Expand Down Expand Up @@ -708,6 +715,7 @@ struct aspath *aspath_dup(struct aspath *aspath)
else
new->str[0] = '\0';

new->count = aspath->count;
return new;
}

Expand All @@ -729,6 +737,7 @@ static void *aspath_hash_alloc(void *arg)
new->str_len = aspath->str_len;
new->json = aspath->json;
new->asnotation = aspath->asnotation;
new->count = aspath->count;

return new;
}
Expand Down Expand Up @@ -856,6 +865,8 @@ struct aspath *aspath_parse(struct stream *s, size_t length, int use32bit,
if (assegments_parse(s, length, &as.segments, use32bit) < 0)
return NULL;

as.count = aspath_count_hops_internal(&as);

/* If already same aspath exist then return it. */
find = hash_get(ashash, &as, aspath_hash_alloc);

Expand Down Expand Up @@ -1032,7 +1043,7 @@ static struct assegment *aspath_aggregate_as_set_add(struct aspath *aspath,
asset->as[asset->length - 1] = as;
}


aspath->count = aspath_count_hops_internal(aspath);
return asset;
}

Expand Down Expand Up @@ -1113,6 +1124,8 @@ struct aspath *aspath_aggregate(struct aspath *as1, struct aspath *as2)

assegment_normalise(aspath->segments);
aspath_str_update(aspath, false);
aspath->count = aspath_count_hops_internal(aspath);

return aspath;
}

Expand Down Expand Up @@ -1268,6 +1281,7 @@ struct aspath *aspath_replace_regex_asn(struct aspath *aspath,
}

aspath_str_update(new, false);
new->count = aspath_count_hops_internal(new);
return new;
}

Expand All @@ -1293,6 +1307,8 @@ struct aspath *aspath_replace_specific_asn(struct aspath *aspath,
}

aspath_str_update(new, false);
new->count = aspath_count_hops_internal(new);

return new;
}

Expand All @@ -1315,6 +1331,8 @@ struct aspath *aspath_replace_all_asn(struct aspath *aspath, as_t our_asn)
}

aspath_str_update(new, false);
new->count = aspath_count_hops_internal(new);

return new;
}

Expand All @@ -1341,6 +1359,8 @@ struct aspath *aspath_replace_private_asns(struct aspath *aspath, as_t asn,
}

aspath_str_update(new, false);
new->count = aspath_count_hops_internal(new);

return new;
}

Expand Down Expand Up @@ -1413,6 +1433,7 @@ struct aspath *aspath_remove_private_asns(struct aspath *aspath, as_t peer_asn)
if (!aspath->refcnt)
aspath_free(aspath);
aspath_str_update(new, false);
new->count = aspath_count_hops_internal(new);
return new;
}

Expand Down Expand Up @@ -1469,6 +1490,7 @@ static struct aspath *aspath_merge(struct aspath *as1, struct aspath *as2)
last->next = as2->segments;
as2->segments = new;
aspath_str_update(as2, false);
as2->count = aspath_count_hops_internal(as2);
return as2;
}

Expand All @@ -1486,6 +1508,7 @@ struct aspath *aspath_prepend(struct aspath *as1, struct aspath *as2)
if (as2->segments == NULL) {
as2->segments = assegment_dup_all(as1->segments);
aspath_str_update(as2, false);
as2->count = aspath_count_hops_internal(as2);
return as2;
}

Expand All @@ -1506,6 +1529,7 @@ struct aspath *aspath_prepend(struct aspath *as1, struct aspath *as2)
if (!as2->segments) {
as2->segments = assegment_dup_all(as1->segments);
aspath_str_update(as2, false);
as2->count = aspath_count_hops_internal(as2);
return as2;
}

Expand Down Expand Up @@ -1551,6 +1575,7 @@ struct aspath *aspath_prepend(struct aspath *as1, struct aspath *as2)
* the inbetween AS_SEQUENCE of seg2 in the process
*/
aspath_str_update(as2, false);
as2->count = aspath_count_hops_internal(as2);
return as2;
} else {
/* AS_SET merge code is needed at here. */
Expand Down Expand Up @@ -1662,6 +1687,7 @@ struct aspath *aspath_filter_exclude(struct aspath *source,
lastseg = newseg;
}
aspath_str_update(newpath, false);
newpath->count = aspath_count_hops_internal(newpath);
/* We are happy returning even an empty AS_PATH, because the
* administrator
* might expect this very behaviour. There's a mean to avoid this, if
Expand All @@ -1680,6 +1706,7 @@ struct aspath *aspath_filter_exclude_all(struct aspath *source)
newpath = aspath_new(source->asnotation);

aspath_str_update(newpath, false);
newpath->count = aspath_count_hops_internal(newpath);
/* We are happy returning even an empty AS_PATH, because the
* administrator
* might expect this very behaviour. There's a mean to avoid this, if
Expand Down Expand Up @@ -1767,6 +1794,7 @@ struct aspath *aspath_filter_exclude_acl(struct aspath *source,


aspath_str_update(source, false);
source->count = aspath_count_hops_internal(source);
/* We are happy returning even an empty AS_PATH, because the
* administrator
* might expect this very behaviour. There's a mean to avoid this, if
Expand Down Expand Up @@ -1805,6 +1833,7 @@ static struct aspath *aspath_add_asns(struct aspath *aspath, as_t asno,
}

aspath_str_update(aspath, false);
aspath->count = aspath_count_hops_internal(aspath);
return aspath;
}

Expand Down Expand Up @@ -1896,6 +1925,7 @@ struct aspath *aspath_reconcile_as4(struct aspath *aspath,
if (!hops) {
newpath = aspath_dup(as4path);
aspath_str_update(newpath, false);
/* dup sets the count properly */
return newpath;
}

Expand Down Expand Up @@ -1957,6 +1987,7 @@ struct aspath *aspath_reconcile_as4(struct aspath *aspath,
aspath_free(newpath);
mergedpath->segments = assegment_normalise(mergedpath->segments);
aspath_str_update(mergedpath, false);
mergedpath->count = aspath_count_hops_internal(mergedpath);

if (BGP_DEBUG(as4, AS4))
zlog_debug("[AS4] result of synthesizing is %s",
Expand Down Expand Up @@ -2027,8 +2058,10 @@ struct aspath *aspath_delete_confed_seq(struct aspath *aspath)
seg = next;
}

if (removed_confed_segment)
if (removed_confed_segment) {
aspath_str_update(aspath, false);
aspath->count = aspath_count_hops_internal(aspath);
}

return aspath;
}
Expand Down
1 change: 1 addition & 0 deletions bgpd/bgp_aspath.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ struct aspath {
and AS path regular expression match. */
char *str;
unsigned short str_len;
uint32_t count;

/* AS notation used by string expression of AS path */
enum asnotation_mode asnotation;
Expand Down
Loading

0 comments on commit f83fd05

Please sign in to comment.