proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 02:46:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: require semicolon after FRR_CFG_DEFAULT_*

Browse Source 
... again ...

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-02-21 07:09:53 +01:00
parent 80413c2073
commit 67b0f40c98
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_nb_config.c
View File

@ -37,15 +37,15 @@ DEFINE_HOOK(bgp_snmp_init_stats, (struct bgp *bgp), (bgp));
FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY, FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY,
{ .val_ulong = 10, .match_profile = "datacenter", }, { .val_ulong = 10, .match_profile = "datacenter", },
{ .val_ulong = 120 }, { .val_ulong = 120 },
) );
FRR_CFG_DEFAULT_ULONG(BGP_HOLDTIME, FRR_CFG_DEFAULT_ULONG(BGP_HOLDTIME,
{ .val_ulong = 9, .match_profile = "datacenter", }, { .val_ulong = 9, .match_profile = "datacenter", },
{ .val_ulong = 180 }, { .val_ulong = 180 },
) );
FRR_CFG_DEFAULT_ULONG(BGP_KEEPALIVE, FRR_CFG_DEFAULT_ULONG(BGP_KEEPALIVE,
{ .val_ulong = 3, .match_profile = "datacenter", }, { .val_ulong = 3, .match_profile = "datacenter", },
{ .val_ulong = 60 }, { .val_ulong = 60 },
) );
int routing_control_plane_protocols_name_validate( int routing_control_plane_protocols_name_validate(
struct nb_cb_create_args *args) struct nb_cb_create_args *args)

20
bgpd/bgp_vty.c
View File

@ -85,44 +85,44 @@ FRR_CFG_DEFAULT_BOOL(BGP_IMPORT_CHECK,
.match_version = "< 7.4", .match_version = "< 7.4",
}, },
{ .val_bool = true }, { .val_bool = true },
) );
FRR_CFG_DEFAULT_BOOL(BGP_SHOW_HOSTNAME, FRR_CFG_DEFAULT_BOOL(BGP_SHOW_HOSTNAME,
{ .val_bool = true, .match_profile = "datacenter", }, { .val_bool = true, .match_profile = "datacenter", },
{ .val_bool = false }, { .val_bool = false },
) );
FRR_CFG_DEFAULT_BOOL(BGP_SHOW_NEXTHOP_HOSTNAME, FRR_CFG_DEFAULT_BOOL(BGP_SHOW_NEXTHOP_HOSTNAME,
{ .val_bool = true, .match_profile = "datacenter", }, { .val_bool = true, .match_profile = "datacenter", },
{ .val_bool = false }, { .val_bool = false },
) );
FRR_CFG_DEFAULT_BOOL(BGP_LOG_NEIGHBOR_CHANGES, FRR_CFG_DEFAULT_BOOL(BGP_LOG_NEIGHBOR_CHANGES,
{ .val_bool = true, .match_profile = "datacenter", }, { .val_bool = true, .match_profile = "datacenter", },
{ .val_bool = false }, { .val_bool = false },
) );
FRR_CFG_DEFAULT_BOOL(BGP_DETERMINISTIC_MED, FRR_CFG_DEFAULT_BOOL(BGP_DETERMINISTIC_MED,
{ .val_bool = true, .match_profile = "datacenter", }, { .val_bool = true, .match_profile = "datacenter", },
{ .val_bool = false }, { .val_bool = false },
) );
FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY, FRR_CFG_DEFAULT_ULONG(BGP_CONNECT_RETRY,
{ .val_ulong = 10, .match_profile = "datacenter", }, { .val_ulong = 10, .match_profile = "datacenter", },
{ .val_ulong = 120 }, { .val_ulong = 120 },
) );
FRR_CFG_DEFAULT_ULONG(BGP_HOLDTIME, FRR_CFG_DEFAULT_ULONG(BGP_HOLDTIME,
{ .val_ulong = 9, .match_profile = "datacenter", }, { .val_ulong = 9, .match_profile = "datacenter", },
{ .val_ulong = 180 }, { .val_ulong = 180 },
) );
FRR_CFG_DEFAULT_ULONG(BGP_KEEPALIVE, FRR_CFG_DEFAULT_ULONG(BGP_KEEPALIVE,
{ .val_ulong = 3, .match_profile = "datacenter", }, { .val_ulong = 3, .match_profile = "datacenter", },
{ .val_ulong = 60 }, { .val_ulong = 60 },
) );
FRR_CFG_DEFAULT_BOOL(BGP_EBGP_REQUIRES_POLICY, FRR_CFG_DEFAULT_BOOL(BGP_EBGP_REQUIRES_POLICY,
{ .val_bool = false, .match_profile = "datacenter", }, { .val_bool = false, .match_profile = "datacenter", },
{ .val_bool = false, .match_version = "< 7.4", }, { .val_bool = false, .match_version = "< 7.4", },
{ .val_bool = true }, { .val_bool = true },
) );
FRR_CFG_DEFAULT_BOOL(BGP_SUPPRESS_DUPLICATES, FRR_CFG_DEFAULT_BOOL(BGP_SUPPRESS_DUPLICATES,
{ .val_bool = false, .match_version = "< 7.6", }, { .val_bool = false, .match_version = "< 7.6", },
{ .val_bool = true }, { .val_bool = true },
) );
DEFINE_HOOK(bgp_inst_config_write, DEFINE_HOOK(bgp_inst_config_write,
(struct bgp *bgp, struct vty *vty), (struct bgp *bgp, struct vty *vty),

3
lib/defaults.h
View File

@ -98,7 +98,8 @@ struct frr_default {
static void _dfltinit_##varname(void) \ static void _dfltinit_##varname(void) \
{ \ { \
frr_default_add(&_dflt_##varname); \ frr_default_add(&_dflt_##varname); \
} } \
MACRO_REQUIRE_SEMICOLON() /* end */
/* use: /* use:
* FRR_CFG_DEFAULT_LONG(SHARP_BLUNTNESS, * FRR_CFG_DEFAULT_LONG(SHARP_BLUNTNESS,

2
ospf6d/ospf6_top.c
View File

@ -58,7 +58,7 @@ DEFINE_QOBJ_TYPE(ospf6);
FRR_CFG_DEFAULT_BOOL(OSPF6_LOG_ADJACENCY_CHANGES, FRR_CFG_DEFAULT_BOOL(OSPF6_LOG_ADJACENCY_CHANGES,
{ .val_bool = true, .match_profile = "datacenter", }, { .val_bool = true, .match_profile = "datacenter", },
{ .val_bool = false }, { .val_bool = false },
) );
/* global ospf6d variable */ /* global ospf6d variable */
static struct ospf6_master ospf6_master; static struct ospf6_master ospf6_master;

2
ospfd/ospf_vty.c
View File

@ -60,7 +60,7 @@
FRR_CFG_DEFAULT_BOOL(OSPF_LOG_ADJACENCY_CHANGES, FRR_CFG_DEFAULT_BOOL(OSPF_LOG_ADJACENCY_CHANGES,
{ .val_bool = true, .match_profile = "datacenter", }, { .val_bool = true, .match_profile = "datacenter", },
{ .val_bool = false }, { .val_bool = false },
) );
static const char *const ospf_network_type_str[] = { static const char *const ospf_network_type_str[] = {
"Null", "POINTOPOINT", "BROADCAST", "NBMA", "POINTOMULTIPOINT", "Null", "POINTOPOINT", "BROADCAST", "NBMA", "POINTOMULTIPOINT",