diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-04-02 18:49:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 18:49:34 -0400 |
| commit | 58bc3de3abeff806a9132dbe3e7da614f4627cfd (patch) | |
| tree | 93b03c47e1f42240e917b9f0c4583c804a186532 | |
| parent | 85775c536183fef1dedd9aac68128a2b0c3761e5 (diff) | |
| parent | 4c1458b595282bff6a6e0b20767bb5cb655d0b4c (diff) | |
Merge pull request #6141 from opensourcerouting/defaults-fix-bools
bgpd, ospfd, ospf6d: long is not bool :(
| -rw-r--r-- | bgpd/bgp_vty.c | 16 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 8cdb6b514d..9f4347e736 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -73,20 +73,20 @@ #endif FRR_CFG_DEFAULT_BOOL(BGP_IMPORT_CHECK, - { .val_long = true, .match_profile = "datacenter", }, - { .val_long = false }, + { .val_bool = true, .match_profile = "datacenter", }, + { .val_bool = false }, ) FRR_CFG_DEFAULT_BOOL(BGP_SHOW_HOSTNAME, - { .val_long = true, .match_profile = "datacenter", }, - { .val_long = false }, + { .val_bool = true, .match_profile = "datacenter", }, + { .val_bool = false }, ) FRR_CFG_DEFAULT_BOOL(BGP_LOG_NEIGHBOR_CHANGES, - { .val_long = true, .match_profile = "datacenter", }, - { .val_long = false }, + { .val_bool = true, .match_profile = "datacenter", }, + { .val_bool = false }, ) FRR_CFG_DEFAULT_BOOL(BGP_DETERMINISTIC_MED, - { .val_long = true, .match_profile = "datacenter", }, - { .val_long = false }, + { .val_bool = true, .match_profile = "datacenter", }, + { .val_bool = false }, ) FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY, { .val_ulong = 10, .match_profile = "datacenter", }, diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 96eee51929..dc10fa52cb 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -52,8 +52,8 @@ DEFINE_QOBJ_TYPE(ospf6) FRR_CFG_DEFAULT_BOOL(OSPF6_LOG_ADJACENCY_CHANGES, - { .val_long = true, .match_profile = "datacenter", }, - { .val_long = false }, + { .val_bool = true, .match_profile = "datacenter", }, + { .val_bool = false }, ) /* global ospf6d variable */ diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 75f556e39f..ea73834a66 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -54,8 +54,8 @@ #include "ospfd/ospf_bfd.h" FRR_CFG_DEFAULT_BOOL(OSPF_LOG_ADJACENCY_CHANGES, - { .val_long = true, .match_profile = "datacenter", }, - { .val_long = false }, + { .val_bool = true, .match_profile = "datacenter", }, + { .val_bool = false }, ) static const char *const ospf_network_type_str[] = { |