diff options
Diffstat (limited to 'pathd/pathd.c')
| -rw-r--r-- | pathd/pathd.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pathd/pathd.c b/pathd/pathd.c index e2c7c95728..ae82186315 100644 --- a/pathd/pathd.c +++ b/pathd/pathd.c @@ -24,22 +24,23 @@ #include "network.h" #include "pathd/pathd.h" -#include "pathd/path_memory.h" #include "pathd/path_zebra.h" #include "pathd/path_debug.h" #define HOOK_DELAY 3 -DEFINE_MTYPE_STATIC(PATHD, PATH_SEGMENT_LIST, "Segment List") -DEFINE_MTYPE_STATIC(PATHD, PATH_SR_POLICY, "SR Policy") -DEFINE_MTYPE_STATIC(PATHD, PATH_SR_CANDIDATE, "SR Policy candidate path") +DEFINE_MGROUP(PATHD, "pathd"); + +DEFINE_MTYPE_STATIC(PATHD, PATH_SEGMENT_LIST, "Segment List"); +DEFINE_MTYPE_STATIC(PATHD, PATH_SR_POLICY, "SR Policy"); +DEFINE_MTYPE_STATIC(PATHD, PATH_SR_CANDIDATE, "SR Policy candidate path"); DEFINE_HOOK(pathd_candidate_created, (struct srte_candidate * candidate), - (candidate)) + (candidate)); DEFINE_HOOK(pathd_candidate_updated, (struct srte_candidate * candidate), - (candidate)) + (candidate)); DEFINE_HOOK(pathd_candidate_removed, (struct srte_candidate * candidate), - (candidate)) + (candidate)); static void trigger_pathd_candidate_created(struct srte_candidate *candidate); static int trigger_pathd_candidate_created_timer(struct thread *thread); @@ -624,8 +625,7 @@ void srte_candidate_set_metric(struct srte_candidate *candidate, char endpoint[46]; ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); zlog_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)", endpoint, policy->color, candidate->name, required ? "required " : "", srte_candidate_metric_name(type), type, value, is_bound ? "true" : "false", @@ -659,8 +659,7 @@ void srte_lsp_set_metric(struct srte_lsp *lsp, char endpoint[46]; ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); zlog_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)", endpoint, policy->color, candidate->name, required ? "required " : "", srte_candidate_metric_name(type), type, value, is_bound ? "true" : "false", @@ -981,8 +980,7 @@ void srte_candidate_unset_segment_list(const char *originator, bool force) if (segment_list->protocol_origin == SRTE_ORIGIN_LOCAL) { zlog_warn( - "Cannot unset segment list %s because it " - "was created locally", + "Cannot unset segment list %s because it was created locally", segment_list->name); continue; } |