bp->detection_multiplier = BFD_DEFDETECTMULT;
bp->echo_mode = false;
bp->passive = false;
+ bp->log_session_changes = false;
bp->minimum_ttl = BFD_DEF_MHOP_TTL;
bp->min_echo_rx = BFD_DEF_REQ_MIN_ECHO_RX;
bp->min_echo_tx = BFD_DEF_DES_MIN_ECHO_TX;
else
bfd_set_shutdown(bs, bs->peer_profile.admin_shutdown);
+ /* Toggle 'no log-session-changes' if default value. */
+ if (bs->peer_profile.log_session_changes == false)
+ bfd_set_log_session_changes(bs, bp->log_session_changes);
+ else
+ bfd_set_log_session_changes(bs, bs->peer_profile.log_session_changes);
+
/* If session interval changed negotiate new timers. */
if (bs->ses_state == PTM_BFD_UP
&& (bs->timers.desired_min_tx != min_tx
zlog_debug("state-change: [%s] %s -> %s",
bs_to_string(bfd), state_list[old_state].str,
state_list[bfd->ses_state].str);
+ if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES))
+ zlog_notice("Session-Change: [%s] %s -> %s", bs_to_string(bfd),
+ state_list[old_state].str, state_list[bfd->ses_state].str);
}
}
bs_to_string(bfd), state_list[old_state].str,
state_list[bfd->ses_state].str,
get_diag_str(bfd->local_diag));
+ if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES) &&
+ old_state == PTM_BFD_UP)
+ zlog_notice("Session-Change: [%s] %s -> %s reason:%s", bs_to_string(bfd),
+ state_list[old_state].str, state_list[bfd->ses_state].str,
+ get_diag_str(bfd->local_diag));
}
/* clear peer's mac address */
if (bglobal.debug_peer_event)
zlog_info("state-change: [%s] %s -> %s", bs_to_string(bfd),
state_list[old_state].str, state_list[bfd->ses_state].str);
+ if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES))
+ zlog_notice("Session-Change: [%s] %s -> %s", bs_to_string(bfd),
+ state_list[old_state].str, state_list[bfd->ses_state].str);
}
}
zlog_debug("state-change: [%s] %s -> %s reason:%s", bs_to_string(bfd),
state_list[old_state].str, state_list[bfd->ses_state].str,
get_diag_str(bfd->local_diag));
+ if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES) &&
+ old_state == PTM_BFD_UP)
+ zlog_notice("Session-Change: [%s] %s -> %s reason:%s", bs_to_string(bfd),
+ state_list[old_state].str, state_list[bfd->ses_state].str,
+ get_diag_str(bfd->local_diag));
}
/* reset local address ,it might has been be changed after bfd is up*/
//memset(&bfd->local_address, 0, sizeof(bfd->local_address));
zlog_warn("state-change: [%s] %s -> %s reason:%s", bs_to_string(bfd),
state_list[old_state].str, state_list[bfd->ses_state].str,
get_diag_str(bfd->local_diag));
+ if (CHECK_FLAG(bfd->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES) &&
+ old_state == PTM_BFD_UP)
+ zlog_notice("Session-Change: [%s] %s -> %s reason:%s", bs_to_string(bfd),
+ state_list[old_state].str, state_list[bfd->ses_state].str,
+ get_diag_str(bfd->local_diag));
}
}
bs->peer_profile.echo_mode = bpc->bpc_echo;
bfd_set_echo(bs, bpc->bpc_echo);
+ if (bpc->bpc_log_session_changes)
+ SET_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES);
+ else
+ UNSET_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES);
+
/*
* Shutdown needs to be the last in order to avoid timers enable when
* the session is disabled.
}
}
+void bfd_set_log_session_changes(struct bfd_session *bs, bool log_session_changes)
+{
+ if (log_session_changes)
+ SET_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES);
+ else
+ UNSET_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES);
+}
+
/*
* Helper functions.
*/
bool bpc_cbit;
bool bpc_passive;
+ bool bpc_log_session_changes;
bool bpc_has_profile;
char bpc_profile[64];
/* BFD session flags */
enum bfd_session_flags {
BFD_SESS_FLAG_NONE = 0,
- BFD_SESS_FLAG_ECHO = 1 << 0, /* BFD Echo functionality */
- BFD_SESS_FLAG_ECHO_ACTIVE = 1 << 1, /* BFD Echo Packets are being sent
+ BFD_SESS_FLAG_ECHO = 1 << 0, /* BFD Echo functionality */
+ BFD_SESS_FLAG_ECHO_ACTIVE = 1 << 1, /* BFD Echo Packets are being sent
* actively
*/
- BFD_SESS_FLAG_MH = 1 << 2, /* BFD Multi-hop session */
- BFD_SESS_FLAG_IPV6 = 1 << 4, /* BFD IPv6 session */
- BFD_SESS_FLAG_SEND_EVT_ACTIVE = 1 << 5, /* send event timer active */
- BFD_SESS_FLAG_SEND_EVT_IGNORE = 1 << 6, /* ignore send event when timer
+ BFD_SESS_FLAG_MH = 1 << 2, /* BFD Multi-hop session */
+ BFD_SESS_FLAG_IPV6 = 1 << 4, /* BFD IPv6 session */
+ BFD_SESS_FLAG_SEND_EVT_ACTIVE = 1 << 5, /* send event timer active */
+ BFD_SESS_FLAG_SEND_EVT_IGNORE = 1 << 6, /* ignore send event when timer
* expires
*/
- BFD_SESS_FLAG_SHUTDOWN = 1 << 7, /* disable BGP peer function */
- BFD_SESS_FLAG_CONFIG = 1 << 8, /* Session configured with bfd NB API */
- BFD_SESS_FLAG_CBIT = 1 << 9, /* CBIT is set */
- BFD_SESS_FLAG_PASSIVE = 1 << 10, /* Passive mode */
- BFD_SESS_FLAG_MAC_SET = 1 << 11, /* MAC of peer known */
+ BFD_SESS_FLAG_SHUTDOWN = 1 << 7, /* disable BGP peer function */
+ BFD_SESS_FLAG_CONFIG = 1 << 8, /* Session configured with bfd NB API */
+ BFD_SESS_FLAG_CBIT = 1 << 9, /* CBIT is set */
+ BFD_SESS_FLAG_PASSIVE = 1 << 10, /* Passive mode */
+ BFD_SESS_FLAG_MAC_SET = 1 << 11, /* MAC of peer known */
+ BFD_SESS_FLAG_LOG_SESSION_CHANGES = 1 << 12, /* Log session changes */
};
enum bfd_mode_type {
bool admin_shutdown;
/** Passive mode. */
bool passive;
+ /** Log session changes. */
+ bool log_session_changes;
/** Minimum expected TTL value. */
uint8_t minimum_ttl;
*/
void bfd_set_passive_mode(struct bfd_session *bs, bool passive);
+/**
+ * Set the BFD session to log or not log session changes.
+ *
+ * \param bs the BFD session.
+ * \param log_session indicates whether or not to log session changes.
+ */
+void bfd_set_log_session_changes(struct bfd_session *bs, bool log_session);
+
/**
* Picks the BFD session configuration from the appropriated source:
* if using the default peer configuration prefer profile (if it exists),
yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
}
+DEFPY_YANG(bfd_peer_log_session_changes, bfd_peer_log_session_changes_cmd,
+ "[no] log-session-changes",
+ NO_STR
+ "Log Up/Down changes for the session\n")
+{
+ nb_cli_enqueue_change(vty, "./log-session-changes", NB_OP_MODIFY, no ? "false" : "true");
+ return nb_cli_apply_changes(vty, NULL);
+}
+
+void bfd_cli_show_log_session_changes(struct vty *vty, const struct lyd_node *dnode,
+ bool show_defaults)
+{
+ vty_out(vty, " %slog-session-changes\n", yang_dnode_get_bool(dnode, NULL) ? "" : "no ");
+}
+
DEFPY_YANG(
bfd_peer_minimum_ttl, bfd_peer_minimum_ttl_cmd,
"[no] minimum-ttl (1-254)$ttl",
NO_STR
"Don't attempt to start sessions\n")
+ALIAS_YANG(bfd_peer_log_session_changes, bfd_profile_log_session_changes_cmd,
+ "[no] log-session-changes", NO_STR "Log Up/Down session changes in the profile\n")
+
ALIAS_YANG(bfd_peer_minimum_ttl, bfd_profile_minimum_ttl_cmd,
"[no] minimum-ttl (1-254)$ttl",
NO_STR
install_element(BFD_PEER_NODE, &bfd_peer_echo_receive_interval_cmd);
install_element(BFD_PEER_NODE, &bfd_peer_profile_cmd);
install_element(BFD_PEER_NODE, &bfd_peer_passive_cmd);
+ install_element(BFD_PEER_NODE, &bfd_peer_log_session_changes_cmd);
install_element(BFD_PEER_NODE, &bfd_peer_minimum_ttl_cmd);
install_element(BFD_PEER_NODE, &no_bfd_peer_minimum_ttl_cmd);
install_element(BFD_PROFILE_NODE, &bfd_profile_echo_transmit_interval_cmd);
install_element(BFD_PROFILE_NODE, &bfd_profile_echo_receive_interval_cmd);
install_element(BFD_PROFILE_NODE, &bfd_profile_passive_cmd);
+ install_element(BFD_PROFILE_NODE, &bfd_profile_log_session_changes_cmd);
install_element(BFD_PROFILE_NODE, &bfd_profile_minimum_ttl_cmd);
install_element(BFD_PROFILE_NODE, &no_bfd_profile_minimum_ttl_cmd);
}
.cli_show = bfd_cli_show_passive,
}
},
+ {
+ .xpath = "/frr-bfdd:bfdd/bfd/profile/log-session-changes",
+ .cbs = {
+ .modify = bfdd_bfd_profile_log_session_changes_modify,
+ .cli_show = bfd_cli_show_log_session_changes,
+ }
+ },
{
.xpath = "/frr-bfdd:bfdd/bfd/profile/minimum-ttl",
.cbs = {
.cli_show = bfd_cli_show_passive,
}
},
+ {
+ .xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/log-session-changes",
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_log_session_changes_modify,
+ .cli_show = bfd_cli_show_log_session_changes,
+ }
+ },
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/echo-mode",
.cbs = {
.cli_show = bfd_cli_show_passive,
}
},
+ {
+ .xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/log-session-changes",
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_log_session_changes_modify,
+ .cli_show = bfd_cli_show_log_session_changes,
+ }
+ },
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/minimum-ttl",
.cbs = {
.cli_show = bfd_cli_show_passive,
}
},
+ {
+ .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/log-session-changes",
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_log_session_changes_modify,
+ .cli_show = bfd_cli_show_log_session_changes,
+ }
+ },
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-echo/bfd-mode",
.cbs = {
.cli_show = bfd_cli_show_passive,
}
},
+ {
+ .xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/log-session-changes",
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_log_session_changes_modify,
+ .cli_show = bfd_cli_show_log_session_changes,
+ }
+ },
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/sbfd-init/bfd-mode",
.cbs = {
struct nb_cb_modify_args *args);
int bfdd_bfd_profile_administrative_down_modify(struct nb_cb_modify_args *args);
int bfdd_bfd_profile_passive_mode_modify(struct nb_cb_modify_args *args);
+int bfdd_bfd_profile_log_session_changes_modify(struct nb_cb_modify_args *args);
int bfdd_bfd_profile_minimum_ttl_modify(struct nb_cb_modify_args *args);
int bfdd_bfd_profile_echo_mode_modify(struct nb_cb_modify_args *args);
int bfdd_bfd_profile_desired_echo_transmission_interval_modify(
struct nb_cb_modify_args *args);
int bfdd_bfd_sessions_single_hop_passive_mode_modify(
struct nb_cb_modify_args *args);
+int bfdd_bfd_sessions_single_hop_log_session_changes_modify(struct nb_cb_modify_args *args);
int bfdd_bfd_sessions_single_hop_echo_mode_modify(
struct nb_cb_modify_args *args);
int bfdd_bfd_sessions_single_hop_desired_echo_transmission_interval_modify(
bool show_defaults);
void bfd_cli_show_passive(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults);
+void bfd_cli_show_log_session_changes(struct vty *vty, const struct lyd_node *dnode,
+ bool show_defaults);
void bfd_cli_show_minimum_ttl(struct vty *vty, const struct lyd_node *dnode,
bool show_defaults);
return NB_OK;
}
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/profile/log-session-changes
+ */
+int bfdd_bfd_profile_log_session_changes_modify(struct nb_cb_modify_args *args)
+{
+ struct bfd_profile *bp;
+
+ if (args->event != NB_EV_APPLY)
+ return NB_OK;
+
+ bp = nb_running_get_entry(args->dnode, NULL, true);
+ bp->log_session_changes = yang_dnode_get_bool(args->dnode, NULL);
+ bfd_profile_update(bp);
+
+ return NB_OK;
+}
+
/*
* XPath: /frr-bfdd:bfdd/bfd/profile/minimum-ttl
*/
return NB_OK;
}
+/*
+ * XPath: /frr-bfdd:bfdd/bfd/sessions/single-hop/log-session-changes
+ * /frr-bfdd:bfdd/bfd/sessions/multi-hop/log-session-changes
+ * /frr-bfdd:bfdd/bfd/sessions/sbfd_echo/log-session-changes
+ * /frr-bfdd:bfdd/bfd/sessions/sbfd_init/log-session-changes
+ */
+int bfdd_bfd_sessions_single_hop_log_session_changes_modify(struct nb_cb_modify_args *args)
+{
+ struct bfd_session *bs;
+ bool log_session_changes;
+
+ switch (args->event) {
+ case NB_EV_VALIDATE:
+ case NB_EV_PREPARE:
+ return NB_OK;
+
+ case NB_EV_APPLY:
+ break;
+
+ case NB_EV_ABORT:
+ return NB_OK;
+ }
+
+ log_session_changes = yang_dnode_get_bool(args->dnode, NULL);
+
+ bs = nb_running_get_entry(args->dnode, NULL, true);
+ bs->peer_profile.log_session_changes = log_session_changes;
+ bfd_session_apply(bs);
+
+ return NB_OK;
+}
+
/*
* XPath: /frr-bfdd:bfdd/bfd/sessions/sbfd-init/bfd-mode
* /frr-bfdd:bfdd/bfd/sessions/sbfd-echo/bfd-mode
vty_out(vty, "\t\tPassive mode\n");
else
vty_out(vty, "\t\tActive mode\n");
+ if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES))
+ vty_out(vty, "\t\tLog session changes\n");
if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
vty_out(vty, "\t\tMinimum TTL: %d\n", bs->mh_ttl);
-
vty_out(vty, "\t\tStatus: ");
switch (bs->ses_state) {
case PTM_BFD_ADM_DOWN:
json_object_int_add(jo, "remote-id", bs->discrs.remote_discr);
json_object_boolean_add(jo, "passive-mode",
CHECK_FLAG(bs->flags, BFD_SESS_FLAG_PASSIVE));
+ json_object_boolean_add(jo, "log-session-changes",
+ CHECK_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES));
if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH))
json_object_int_add(jo, "minimum-ttl", bs->mh_ttl);
/* Defaults */
bpc->bpc_shutdown = false;
+ bpc->bpc_log_session_changes = false;
bpc->bpc_detectmultiplier = BPC_DEF_DETECTMULTIPLIER;
bpc->bpc_recvinterval = BPC_DEF_RECEIVEINTERVAL;
bpc->bpc_txinterval = BPC_DEF_TRANSMITINTERVAL;
break;
}
- if (bglobal.debug_peer_event)
+ if (bglobal.debug_peer_event) {
zlog_debug("state-change: [data plane: %s] %s -> %s",
bs_to_string(bs), state_list[old_state].str,
state_list[bs->ses_state].str);
+ if (CHECK_FLAG(bs->flags, BFD_SESS_FLAG_LOG_SESSION_CHANGES) &&
+ old_state != bs->ses_state)
+ zlog_notice("Session-Change: [data plane: %s] %s -> %s", bs_to_string(bs),
+ state_list[old_state].str, state_list[bs->ses_state].str);
+ }
}
/**