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

pathd: use a define to store the the length of endpoint string

Browse Source 
The endpoint string is a 46 byte length buffer. Use a single
place to store the length of that buffer.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2022-07-19 14:59:23 +02:00
parent 116f9b45ed
commit c1657d2669
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ipaddr.h
View File

@ -61,6 +61,8 @@ struct ipaddr {
#define IPADDRSZ(p) \ #define IPADDRSZ(p) \
(IS_IPADDR_V4((p)) ? sizeof(struct in_addr) : sizeof(struct in6_addr)) (IS_IPADDR_V4((p)) ? sizeof(struct in_addr) : sizeof(struct in6_addr))
#define IPADDR_STRING_SIZE 46
static inline int ipaddr_family(const struct ipaddr *ip) static inline int ipaddr_family(const struct ipaddr *ip)
{ {
switch (ip->ipa_type) { switch (ip->ipa_type) {

4
pathd/path_cli.c
View File

@ -126,7 +126,7 @@ DEFPY(show_srte_policy,
ttable_rowseps(tt, 0, BOTTOM, true, '-'); ttable_rowseps(tt, 0, BOTTOM, true, '-');
RB_FOREACH (policy, srte_policy_head, &srte_policies) { RB_FOREACH (policy, srte_policy_head, &srte_policies) {
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
char binding_sid[16] = "-"; char binding_sid[16] = "-";
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
@ -173,7 +173,7 @@ DEFPY(show_srte_policy_detail,
vty_out(vty, "\n"); vty_out(vty, "\n");
RB_FOREACH (policy, srte_policy_head, &srte_policies) { RB_FOREACH (policy, srte_policy_head, &srte_policies) {
struct srte_candidate *candidate; struct srte_candidate *candidate;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
char binding_sid[16] = "-"; char binding_sid[16] = "-";
char *segment_list_info; char *segment_list_info;
static char undefined_info[] = "(undefined)"; static char undefined_info[] = "(undefined)";

40
pathd/pathd.c
View File

@ -578,7 +578,7 @@ void srte_policy_apply_changes(struct srte_policy *policy)
struct srte_candidate *candidate, *safe; struct srte_candidate *candidate, *safe;
struct srte_candidate *old_best_candidate; struct srte_candidate *old_best_candidate;
struct srte_candidate *new_best_candidate; struct srte_candidate *new_best_candidate;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
@ -734,7 +734,7 @@ void srte_candidate_set_bandwidth(struct srte_candidate *candidate,
float bandwidth, bool required) float bandwidth, bool required)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG( PATH_POLICY_DEBUG(
@ -762,7 +762,8 @@ void srte_lsp_set_bandwidth(struct srte_lsp *lsp, float bandwidth,
{ {
struct srte_candidate *candidate = lsp->candidate; struct srte_candidate *candidate = lsp->candidate;
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG( PATH_POLICY_DEBUG(
"SR-TE(%s, %u): candidate %s %slsp bandwidth set to %f B/s", "SR-TE(%s, %u): candidate %s %slsp bandwidth set to %f B/s",
@ -783,7 +784,8 @@ void srte_lsp_set_bandwidth(struct srte_lsp *lsp, float bandwidth,
void srte_candidate_unset_bandwidth(struct srte_candidate *candidate) void srte_candidate_unset_bandwidth(struct srte_candidate *candidate)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG("SR-TE(%s, %u): candidate %s config bandwidth unset", PATH_POLICY_DEBUG("SR-TE(%s, %u): candidate %s config bandwidth unset",
endpoint, policy->color, candidate->name); endpoint, policy->color, candidate->name);
@ -805,7 +807,8 @@ void srte_lsp_unset_bandwidth(struct srte_lsp *lsp)
{ {
struct srte_candidate *candidate = lsp->candidate; struct srte_candidate *candidate = lsp->candidate;
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG("SR-TE(%s, %u): candidate %s lsp bandwidth unset", PATH_POLICY_DEBUG("SR-TE(%s, %u): candidate %s lsp bandwidth unset",
endpoint, policy->color, candidate->name); endpoint, policy->color, candidate->name);
@ -833,7 +836,8 @@ void srte_candidate_set_metric(struct srte_candidate *candidate,
bool is_computed) bool is_computed)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG( PATH_POLICY_DEBUG(
"SR-TE(%s, %u): candidate %s %sconfig metric %s (%u) set to %f (is-bound: %s; is_computed: %s)", "SR-TE(%s, %u): candidate %s %sconfig metric %s (%u) set to %f (is-bound: %s; is_computed: %s)",
@ -867,7 +871,8 @@ void srte_lsp_set_metric(struct srte_lsp *lsp,
{ {
struct srte_candidate *candidate = lsp->candidate; struct srte_candidate *candidate = lsp->candidate;
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG( PATH_POLICY_DEBUG(
"SR-TE(%s, %u): candidate %s %slsp metric %s (%u) set to %f (is-bound: %s; is_computed: %s)", "SR-TE(%s, %u): candidate %s %slsp metric %s (%u) set to %f (is-bound: %s; is_computed: %s)",
@ -902,7 +907,8 @@ void srte_candidate_unset_metric(struct srte_candidate *candidate,
enum srte_candidate_metric_type type) enum srte_candidate_metric_type type)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG( PATH_POLICY_DEBUG(
"SR-TE(%s, %u): candidate %s config metric %s (%u) unset", "SR-TE(%s, %u): candidate %s config metric %s (%u) unset",
@ -927,7 +933,8 @@ void srte_lsp_unset_metric(struct srte_lsp *lsp,
{ {
struct srte_candidate *candidate = lsp->candidate; struct srte_candidate *candidate = lsp->candidate;
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG( PATH_POLICY_DEBUG(
"SR-TE(%s, %u): candidate %s lsp metric %s (%u) unset", "SR-TE(%s, %u): candidate %s lsp metric %s (%u) unset",
@ -956,7 +963,8 @@ void srte_candidate_set_objfun(struct srte_candidate *candidate, bool required,
enum objfun_type type) enum objfun_type type)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
candidate->objfun = type; candidate->objfun = type;
@ -977,7 +985,8 @@ void srte_candidate_set_objfun(struct srte_candidate *candidate, bool required,
void srte_candidate_unset_objfun(struct srte_candidate *candidate) void srte_candidate_unset_objfun(struct srte_candidate *candidate)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
UNSET_FLAG(candidate->flags, F_CANDIDATE_HAS_OBJFUN); UNSET_FLAG(candidate->flags, F_CANDIDATE_HAS_OBJFUN);
@ -1029,7 +1038,8 @@ void srte_candidate_set_affinity_filter(struct srte_candidate *candidate,
uint32_t filter) uint32_t filter)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
assert(type > AFFINITY_FILTER_UNDEFINED); assert(type > AFFINITY_FILTER_UNDEFINED);
@ -1054,7 +1064,8 @@ void srte_candidate_unset_affinity_filter(struct srte_candidate *candidate,
enum affinity_filter_type type) enum affinity_filter_type type)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
assert(type > AFFINITY_FILTER_UNDEFINED); assert(type > AFFINITY_FILTER_UNDEFINED);
@ -1110,7 +1121,8 @@ srte_segment_entry_find(struct srte_segment_list *segment_list, uint32_t index)
void srte_candidate_status_update(struct srte_candidate *candidate, int status) void srte_candidate_status_update(struct srte_candidate *candidate, int status)
{ {
struct srte_policy *policy = candidate->policy; struct srte_policy *policy = candidate->policy;
char endpoint[46]; char endpoint[ENDPOINT_STR_LENGTH];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
PATH_POLICY_DEBUG("SR-TE(%s, %u): zebra updated status to %d", endpoint, PATH_POLICY_DEBUG("SR-TE(%s, %u): zebra updated status to %d", endpoint,
policy->color, status); policy->color, status);

2
pathd/pathd.h
View File

@ -330,6 +330,8 @@ struct srte_candidate {
RB_HEAD(srte_candidate_head, srte_candidate); RB_HEAD(srte_candidate_head, srte_candidate);
RB_PROTOTYPE(srte_candidate_head, srte_candidate, entry, srte_candidate_compare) RB_PROTOTYPE(srte_candidate_head, srte_candidate, entry, srte_candidate_compare)
#define ENDPOINT_STR_LENGTH IPADDR_STRING_SIZE
struct srte_policy { struct srte_policy {
RB_ENTRY(srte_policy) entry; RB_ENTRY(srte_policy) entry;