summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Zalamena <rzalamena@opensourcerouting.org>2019-06-24 16:46:29 +0200
committerRafael Zalamena <rzalamena@opensourcerouting.org>2019-06-24 16:46:29 +0200
commiteefca51eb32b9e1a4f12f309e6d7f0cf53ffd765 (patch)
tree0cd82dc51d724ec29253038ba1636c07a525e72a
parentbfdd: authorise multihop and interface setting (diff)
downloadfrr-eefca51eb32b9e1a4f12f309e6d7f0cf53ffd765.tar.xz
frr-eefca51eb32b9e1a4f12f309e6d7f0cf53ffd765.zip
bfdd: fix compilation warnings on OpenBSD
Build will fail with `Werror` enabled with: ``` bfdd/bfdd_northbound.c:876: warning: initialized field overwritten bfdd/bfdd_northbound.c:876: warning: (near initialization for 'frr_bfdd_info.nodes[0].cbs') ... cc1: error: unrecognized command line option "-Wno-unused-result" gmake[1]: *** [Makefile:6875: bfdd/bfdd_northbound.o] Error 1 ``` Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
-rw-r--r--bfdd/bfdd_northbound.c268
1 files changed, 188 insertions, 80 deletions
diff --git a/bfdd/bfdd_northbound.c b/bfdd/bfdd_northbound.c
index 24fdfa1ea..e8bde034a 100644
--- a/bfdd/bfdd_northbound.c
+++ b/bfdd/bfdd_northbound.c
@@ -871,245 +871,353 @@ const struct frr_yang_module_info frr_bfdd_info = {
.nodes = {
{
.xpath = "/frr-bfdd:bfdd/bfd",
- .cbs.create = bfdd_bfd_create,
- .cbs.destroy = bfdd_bfd_destroy,
- .cbs.cli_show = bfd_cli_show_header,
- .cbs.cli_show_end = bfd_cli_show_header_end,
+ .cbs = {
+ .create = bfdd_bfd_create,
+ .destroy = bfdd_bfd_destroy,
+ .cli_show = bfd_cli_show_header,
+ .cli_show_end = bfd_cli_show_header_end,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop",
- .cbs.create = bfdd_bfd_sessions_single_hop_create,
- .cbs.destroy = bfdd_bfd_sessions_single_hop_destroy,
- .cbs.get_next = bfdd_bfd_sessions_single_hop_get_next,
- .cbs.get_keys = bfdd_bfd_sessions_single_hop_get_keys,
- .cbs.lookup_entry = bfdd_bfd_sessions_single_hop_lookup_entry,
- .cbs.cli_show = bfd_cli_show_single_hop_peer,
- .cbs.cli_show_end = bfd_cli_show_peer_end,
+ .cbs = {
+ .create = bfdd_bfd_sessions_single_hop_create,
+ .destroy = bfdd_bfd_sessions_single_hop_destroy,
+ .get_next = bfdd_bfd_sessions_single_hop_get_next,
+ .get_keys = bfdd_bfd_sessions_single_hop_get_keys,
+ .lookup_entry = bfdd_bfd_sessions_single_hop_lookup_entry,
+ .cli_show = bfd_cli_show_single_hop_peer,
+ .cli_show_end = bfd_cli_show_peer_end,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/source-addr",
- .cbs.modify = bfdd_bfd_sessions_single_hop_source_addr_modify,
- .cbs.destroy = bfdd_bfd_sessions_single_hop_source_addr_destroy,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_source_addr_modify,
+ .destroy = bfdd_bfd_sessions_single_hop_source_addr_destroy,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/detection-multiplier",
- .cbs.modify = bfdd_bfd_sessions_single_hop_detection_multiplier_modify,
- .cbs.cli_show = bfd_cli_show_mult,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_detection_multiplier_modify,
+ .cli_show = bfd_cli_show_mult,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/desired-transmission-interval",
- .cbs.modify = bfdd_bfd_sessions_single_hop_desired_transmission_interval_modify,
- .cbs.cli_show = bfd_cli_show_tx,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_desired_transmission_interval_modify,
+ .cli_show = bfd_cli_show_tx,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/required-receive-interval",
- .cbs.modify = bfdd_bfd_sessions_single_hop_required_receive_interval_modify,
- .cbs.cli_show = bfd_cli_show_rx,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_required_receive_interval_modify,
+ .cli_show = bfd_cli_show_rx,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/administrative-down",
- .cbs.modify = bfdd_bfd_sessions_single_hop_administrative_down_modify,
- .cbs.cli_show = bfd_cli_show_shutdown,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_administrative_down_modify,
+ .cli_show = bfd_cli_show_shutdown,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/echo-mode",
- .cbs.modify = bfdd_bfd_sessions_single_hop_echo_mode_modify,
- .cbs.cli_show = bfd_cli_show_echo,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_echo_mode_modify,
+ .cli_show = bfd_cli_show_echo,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/desired-echo-transmission-interval",
- .cbs.modify = bfdd_bfd_sessions_single_hop_desired_echo_transmission_interval_modify,
- .cbs.cli_show = bfd_cli_show_echo_interval,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_desired_echo_transmission_interval_modify,
+ .cli_show = bfd_cli_show_echo_interval,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/local-discriminator",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_discriminator_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_discriminator_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/local-state",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_state_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_state_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/local-diagnostic",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_diagnostic_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_diagnostic_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/local-multiplier",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_multiplier_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_multiplier_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/remote-discriminator",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/remote-state",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_state_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_state_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/remote-diagnostic",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_diagnostic_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_diagnostic_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/remote-multiplier",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_multiplier_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_multiplier_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/negotiated-transmission-interval",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_transmission_interval_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_transmission_interval_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/negotiated-receive-interval",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_receive_interval_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_receive_interval_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/detection-mode",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/last-down-time",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_last_down_time_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_last_down_time_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/last-up-time",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_last_up_time_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_last_up_time_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/session-down-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_session_down_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_session_down_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/session-up-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_session_up_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_session_up_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/control-packet-input-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_input_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_input_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/control-packet-output-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_output_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_output_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/negotiated-echo-transmission-interval",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_echo_transmission_interval_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_echo_transmission_interval_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/echo-packet-input-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_input_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_input_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/single-hop/stats/echo-packet-output-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop",
- .cbs.create = bfdd_bfd_sessions_multi_hop_create,
- .cbs.destroy = bfdd_bfd_sessions_multi_hop_destroy,
- .cbs.get_next = bfdd_bfd_sessions_multi_hop_get_next,
- .cbs.get_keys = bfdd_bfd_sessions_multi_hop_get_keys,
- .cbs.lookup_entry = bfdd_bfd_sessions_multi_hop_lookup_entry,
- .cbs.cli_show = bfd_cli_show_multi_hop_peer,
- .cbs.cli_show_end = bfd_cli_show_peer_end,
+ .cbs = {
+ .create = bfdd_bfd_sessions_multi_hop_create,
+ .destroy = bfdd_bfd_sessions_multi_hop_destroy,
+ .get_next = bfdd_bfd_sessions_multi_hop_get_next,
+ .get_keys = bfdd_bfd_sessions_multi_hop_get_keys,
+ .lookup_entry = bfdd_bfd_sessions_multi_hop_lookup_entry,
+ .cli_show = bfd_cli_show_multi_hop_peer,
+ .cli_show_end = bfd_cli_show_peer_end,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/detection-multiplier",
- .cbs.modify = bfdd_bfd_sessions_single_hop_detection_multiplier_modify,
- .cbs.cli_show = bfd_cli_show_mult,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_detection_multiplier_modify,
+ .cli_show = bfd_cli_show_mult,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/desired-transmission-interval",
- .cbs.modify = bfdd_bfd_sessions_single_hop_desired_transmission_interval_modify,
- .cbs.cli_show = bfd_cli_show_tx,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_desired_transmission_interval_modify,
+ .cli_show = bfd_cli_show_tx,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/required-receive-interval",
- .cbs.modify = bfdd_bfd_sessions_single_hop_required_receive_interval_modify,
- .cbs.cli_show = bfd_cli_show_rx,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_required_receive_interval_modify,
+ .cli_show = bfd_cli_show_rx,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/administrative-down",
- .cbs.modify = bfdd_bfd_sessions_single_hop_administrative_down_modify,
- .cbs.cli_show = bfd_cli_show_shutdown,
+ .cbs = {
+ .modify = bfdd_bfd_sessions_single_hop_administrative_down_modify,
+ .cli_show = bfd_cli_show_shutdown,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/local-discriminator",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_discriminator_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_discriminator_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/local-state",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_state_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_state_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/local-diagnostic",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_diagnostic_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_diagnostic_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/local-multiplier",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_local_multiplier_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_local_multiplier_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/remote-discriminator",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_discriminator_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/remote-state",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_state_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_state_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/remote-diagnostic",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_diagnostic_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_diagnostic_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/remote-multiplier",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_remote_multiplier_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_remote_multiplier_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/negotiated-transmission-interval",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_transmission_interval_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_transmission_interval_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/negotiated-receive-interval",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_receive_interval_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_receive_interval_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/detection-mode",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_detection_mode_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/last-down-time",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_last_down_time_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_last_down_time_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/last-up-time",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_last_up_time_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_last_up_time_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/session-down-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_session_down_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_session_down_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/session-up-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_session_up_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_session_up_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/control-packet-input-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_input_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_input_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/control-packet-output-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_output_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_control_packet_output_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/negotiated-echo-transmission-interval",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_echo_transmission_interval_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_negotiated_echo_transmission_interval_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/echo-packet-input-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_input_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_input_count_get_elem,
+ }
},
{
.xpath = "/frr-bfdd:bfdd/bfd/sessions/multi-hop/stats/echo-packet-output-count",
- .cbs.get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
+ .cbs = {
+ .get_elem = bfdd_bfd_sessions_single_hop_stats_echo_packet_output_count_get_elem,
+ }
},
{
.xpath = NULL,