diff options
| -rw-r--r-- | pathd/path_pcep_pcc.c | 21 | ||||
| -rw-r--r-- | pathd/pathd.c | 9 | ||||
| -rw-r--r-- | pceplib/pcep_session_logic_states.c | 3 |
3 files changed, 11 insertions, 22 deletions
diff --git a/pathd/path_pcep_pcc.c b/pathd/path_pcep_pcc.c index 8c6824c1fb..899ce805fe 100644 --- a/pathd/path_pcep_pcc.c +++ b/pathd/path_pcep_pcc.c @@ -363,16 +363,14 @@ int pcep_pcc_enable(struct ctrl_state *ctrl_state, struct pcc_state *pcc_state) if (!CHECK_FLAG(pcc_state->flags, F_PCC_STATE_HAS_IPV4)) { if (pcc_state->retry_count < OTHER_FAMILY_MAX_RETRIES) { flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, - "skipping connection to PCE %pIA:%d due to " - "missing PCC IPv4 address", + "skipping connection to PCE %pIA:%d due to missing PCC IPv4 address", &pcc_state->pce_opts->addr, pcc_state->pce_opts->port); schedule_reconnect(ctrl_state, pcc_state); return 0; } else { flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, - "missing IPv4 PCC address, IPv4 candidate " - "paths will be ignored"); + "missing IPv4 PCC address, IPv4 candidate paths will be ignored"); } } @@ -381,16 +379,14 @@ int pcep_pcc_enable(struct ctrl_state *ctrl_state, struct pcc_state *pcc_state) if (!CHECK_FLAG(pcc_state->flags, F_PCC_STATE_HAS_IPV6)) { if (pcc_state->retry_count < OTHER_FAMILY_MAX_RETRIES) { flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, - "skipping connection to PCE %pIA:%d due to " - "missing PCC IPv6 address", + "skipping connection to PCE %pIA:%d due to missing PCC IPv6 address", &pcc_state->pce_opts->addr, pcc_state->pce_opts->port); schedule_reconnect(ctrl_state, pcc_state); return 0; } else { flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, - "missing IPv6 PCC address, IPv6 candidate " - "paths will be ignored"); + "missing IPv6 PCC address, IPv6 candidate paths will be ignored"); } } @@ -398,8 +394,7 @@ int pcep_pcc_enable(struct ctrl_state *ctrl_state, struct pcc_state *pcc_state) * have been spent, we still need the one for the transport familly */ if (pcc_state->pcc_addr_tr.ipa_type == IPADDR_NONE) { flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, - "skipping connection to PCE %pIA:%d due to missing " - "PCC address", + "skipping connection to PCE %pIA:%d due to missing PCC address", &pcc_state->pce_opts->addr, pcc_state->pce_opts->port); schedule_reconnect(ctrl_state, pcc_state); @@ -490,8 +485,7 @@ void pcep_pcc_sync_path(struct ctrl_state *ctrl_state, send_report(pcc_state, path); } else { PCEP_DEBUG( - "%s Skipping %s candidate path %s " - "synchronization", + "%s Skipping %s candidate path %s synchronization", pcc_state->tag, ipaddr_type_name(&path->nbkey.endpoint), path->name); @@ -1235,8 +1229,7 @@ void handle_pcep_comp_reply(struct ctrl_state *ctrl_state, * the connection if more that a given rate. */ PCEP_DEBUG( - "%s Received computation reply for unknown request " - "%d", + "%s Received computation reply for unknown request %d", pcc_state->tag, path->req_id); PCEP_DEBUG_PATH("%s", format_path(path)); send_pcep_error(pcc_state, PCEP_ERRT_UNKNOWN_REQ_REF, diff --git a/pathd/pathd.c b/pathd/pathd.c index e2c7c95728..14f5167bff 100644 --- a/pathd/pathd.c +++ b/pathd/pathd.c @@ -624,8 +624,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 +658,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 +979,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; } diff --git a/pceplib/pcep_session_logic_states.c b/pceplib/pcep_session_logic_states.c index 5fac667655..e2c3c29591 100644 --- a/pceplib/pcep_session_logic_states.c +++ b/pceplib/pcep_session_logic_states.c @@ -813,8 +813,7 @@ void handle_timer_event(pcep_session_event *event) pcep_log( LOG_INFO, - "%s: [%ld-%ld] pcep_session_logic handle_timer_event: session [%d] event timer_id [%d] " - "session timers [OKW, OKA, DT, KA] [%d, %d, %d, %d]", + "%s: [%ld-%ld] pcep_session_logic handle_timer_event: session [%d] event timer_id [%d] session timers [OKW, OKA, DT, KA] [%d, %d, %d, %d]", __func__, time(NULL), pthread_self(), session->session_id, event->expired_timer_id, session->timer_id_open_keep_wait, session->timer_id_open_keep_alive, session->timer_id_dead_timer, |