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

pathd: remove mid-string line breaks

Browse Source 
cf. workflow.rst ("lines over 80 characters are allowed for text strings
to make it possible to search the code for them"), matching Linux kernel
coding style.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-03-17 06:39:34 +01:00
parent 84b3eb42a9
commit d85bf6f1eb
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pathd/path_pcep_pcc.c
View File

@ -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 (!CHECK_FLAG(pcc_state->flags, F_PCC_STATE_HAS_IPV4)) {
if (pcc_state->retry_count < OTHER_FAMILY_MAX_RETRIES) { if (pcc_state->retry_count < OTHER_FAMILY_MAX_RETRIES) {
flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS,
"skipping connection to PCE %pIA:%d due to " "skipping connection to PCE %pIA:%d due to missing PCC IPv4 address",
"missing PCC IPv4 address",
&pcc_state->pce_opts->addr, &pcc_state->pce_opts->addr,
pcc_state->pce_opts->port); pcc_state->pce_opts->port);
schedule_reconnect(ctrl_state, pcc_state); schedule_reconnect(ctrl_state, pcc_state);
return 0; return 0;
} else { } else {
flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS,
"missing IPv4 PCC address, IPv4 candidate " "missing IPv4 PCC address, IPv4 candidate paths will be ignored");
"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 (!CHECK_FLAG(pcc_state->flags, F_PCC_STATE_HAS_IPV6)) {
if (pcc_state->retry_count < OTHER_FAMILY_MAX_RETRIES) { if (pcc_state->retry_count < OTHER_FAMILY_MAX_RETRIES) {
flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS,
"skipping connection to PCE %pIA:%d due to " "skipping connection to PCE %pIA:%d due to missing PCC IPv6 address",
"missing PCC IPv6 address",
&pcc_state->pce_opts->addr, &pcc_state->pce_opts->addr,
pcc_state->pce_opts->port); pcc_state->pce_opts->port);
schedule_reconnect(ctrl_state, pcc_state); schedule_reconnect(ctrl_state, pcc_state);
return 0; return 0;
} else { } else {
flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS,
"missing IPv6 PCC address, IPv6 candidate " "missing IPv6 PCC address, IPv6 candidate paths will be ignored");
"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 */ * have been spent, we still need the one for the transport familly */
if (pcc_state->pcc_addr_tr.ipa_type == IPADDR_NONE) { if (pcc_state->pcc_addr_tr.ipa_type == IPADDR_NONE) {
flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS, flog_warn(EC_PATH_PCEP_MISSING_SOURCE_ADDRESS,
"skipping connection to PCE %pIA:%d due to missing " "skipping connection to PCE %pIA:%d due to missing PCC address",
"PCC address",
&pcc_state->pce_opts->addr, &pcc_state->pce_opts->addr,
pcc_state->pce_opts->port); pcc_state->pce_opts->port);
schedule_reconnect(ctrl_state, pcc_state); 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); send_report(pcc_state, path);
} else { } else {
PCEP_DEBUG( PCEP_DEBUG(
"%s Skipping %s candidate path %s " "%s Skipping %s candidate path %s synchronization",
"synchronization",
pcc_state->tag, pcc_state->tag,
ipaddr_type_name(&path->nbkey.endpoint), ipaddr_type_name(&path->nbkey.endpoint),
path->name); path->name);
@ -1235,8 +1229,7 @@ void handle_pcep_comp_reply(struct ctrl_state *ctrl_state,
* the connection if more that a given rate. * the connection if more that a given rate.
*/ */
PCEP_DEBUG( PCEP_DEBUG(
"%s Received computation reply for unknown request " "%s Received computation reply for unknown request %d",
"%d",
pcc_state->tag, path->req_id); pcc_state->tag, path->req_id);
PCEP_DEBUG_PATH("%s", format_path(path)); PCEP_DEBUG_PATH("%s", format_path(path));
send_pcep_error(pcc_state, PCEP_ERRT_UNKNOWN_REQ_REF, send_pcep_error(pcc_state, PCEP_ERRT_UNKNOWN_REQ_REF,

9
pathd/pathd.c
View File

@ -624,8 +624,7 @@ void srte_candidate_set_metric(struct srte_candidate *candidate,
char endpoint[46]; char endpoint[46];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
zlog_debug( zlog_debug(
"SR-TE(%s, %u): candidate %s %sconfig metric %s (%u) set to %f " "SR-TE(%s, %u): candidate %s %sconfig metric %s (%u) set to %f (is-bound: %s; is_computed: %s)",
"(is-bound: %s; is_computed: %s)",
endpoint, policy->color, candidate->name, endpoint, policy->color, candidate->name,
required ? "required " : "", srte_candidate_metric_name(type), required ? "required " : "", srte_candidate_metric_name(type),
type, value, is_bound ? "true" : "false", type, value, is_bound ? "true" : "false",
@ -659,8 +658,7 @@ void srte_lsp_set_metric(struct srte_lsp *lsp,
char endpoint[46]; char endpoint[46];
ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint)); ipaddr2str(&policy->endpoint, endpoint, sizeof(endpoint));
zlog_debug( zlog_debug(
"SR-TE(%s, %u): candidate %s %slsp metric %s (%u) set to %f " "SR-TE(%s, %u): candidate %s %slsp metric %s (%u) set to %f (is-bound: %s; is_computed: %s)",
"(is-bound: %s; is_computed: %s)",
endpoint, policy->color, candidate->name, endpoint, policy->color, candidate->name,
required ? "required " : "", srte_candidate_metric_name(type), required ? "required " : "", srte_candidate_metric_name(type),
type, value, is_bound ? "true" : "false", 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 if (segment_list->protocol_origin
== SRTE_ORIGIN_LOCAL) { == SRTE_ORIGIN_LOCAL) {
zlog_warn( zlog_warn(
"Cannot unset segment list %s because it " "Cannot unset segment list %s because it was created locally",
"was created locally",
segment_list->name); segment_list->name);
continue; continue;
} }

3
pceplib/pcep_session_logic_states.c
View File

@ -813,8 +813,7 @@ void handle_timer_event(pcep_session_event *event)
pcep_log( pcep_log(
LOG_INFO, LOG_INFO,
"%s: [%ld-%ld] pcep_session_logic handle_timer_event: session [%d] event timer_id [%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]",
"session timers [OKW, OKA, DT, KA] [%d, %d, %d, %d]",
__func__, time(NULL), pthread_self(), session->session_id, __func__, time(NULL), pthread_self(), session->session_id,
event->expired_timer_id, session->timer_id_open_keep_wait, event->expired_timer_id, session->timer_id_open_keep_wait,
session->timer_id_open_keep_alive, session->timer_id_dead_timer, session->timer_id_open_keep_alive, session->timer_id_dead_timer,