diff options
| -rw-r--r-- | babeld/babel_main.c | 7 | ||||
| -rw-r--r-- | bgpd/bgp_main.c | 6 | ||||
| -rw-r--r-- | eigrpd/eigrp_main.c | 6 | ||||
| -rw-r--r-- | isisd/isis_main.c | 6 | ||||
| -rw-r--r-- | ldpd/ldpd.c | 6 | ||||
| -rw-r--r-- | nhrpd/nhrp_main.c | 6 | ||||
| -rw-r--r-- | ospf6d/ospf6_main.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_main.c | 6 | ||||
| -rw-r--r-- | pbrd/pbr_main.c | 8 | ||||
| -rw-r--r-- | pimd/pim_main.c | 6 | ||||
| -rw-r--r-- | ripd/rip_main.c | 6 | ||||
| -rw-r--r-- | ripngd/ripng_main.c | 8 | ||||
| -rw-r--r-- | sharpd/sharp_main.c | 6 | ||||
| -rw-r--r-- | staticd/static_main.c | 6 | ||||
| -rw-r--r-- | zebra/main.c | 8 |
15 files changed, 84 insertions, 13 deletions
diff --git a/babeld/babel_main.c b/babeld/babel_main.c index f26d3a887..c92d46354 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -136,6 +136,10 @@ struct option longopts[] = { 0 } }; +static const struct frr_yang_module_info *babeld_yang_modules[] = + { + }; + FRR_DAEMON_INFO(babeld, BABELD, .vty_port = BABEL_VTY_PORT, .proghelp = "Implementation of the BABEL routing protocol.", @@ -144,6 +148,9 @@ FRR_DAEMON_INFO(babeld, BABELD, .n_signals = array_size(babel_signals), .privs = &babeld_privs, + + .yang_modules = babeld_yang_modules, + .n_yang_modules = array_size(babeld_yang_modules), ) int diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index bf0c6a42e..bee885cff 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -348,13 +348,17 @@ static void bgp_vrf_terminate(void) vrf_terminate(); } +static const struct frr_yang_module_info *bgpd_yang_modules[] = { +}; + FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT, .proghelp = "Implementation of the BGP routing protocol.", .signals = bgp_signals, .n_signals = array_size(bgp_signals), - .privs = &bgpd_privs, ) + .privs = &bgpd_privs, .yang_modules = bgpd_yang_modules, + .n_yang_modules = array_size(bgpd_yang_modules), ) #if CONFDATE > 20190521 CPP_NOTICE("-r / --retain has reached deprecation EOL, remove") diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 9e9c4649f..3c0491fc5 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -130,6 +130,9 @@ struct quagga_signal_t eigrp_signals[] = { }, }; +static const struct frr_yang_module_info *eigrpd_yang_modules[] = { +}; + FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT, .proghelp = "Implementation of the EIGRP routing protocol.", @@ -137,7 +140,8 @@ FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT, .signals = eigrp_signals, .n_signals = array_size(eigrp_signals), - .privs = &eigrpd_privs, ) + .privs = &eigrpd_privs, .yang_modules = eigrpd_yang_modules, + .n_yang_modules = array_size(eigrpd_yang_modules), ) /* EIGRPd main routine. */ int main(int argc, char **argv, char **envp) diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 7956ddeaf..bf0bd6ee6 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -150,6 +150,9 @@ struct quagga_signal_t isisd_signals[] = { }, }; +static const struct frr_yang_module_info *isisd_yang_modules[] = { +}; + #ifdef FABRICD FRR_DAEMON_INFO(fabricd, OPEN_FABRIC, .vty_port = FABRICD_VTY_PORT, @@ -166,7 +169,8 @@ FRR_DAEMON_INFO(isisd, ISIS, .vty_port = ISISD_VTY_PORT, .signals = isisd_signals, .n_signals = array_size(isisd_signals), - .privs = &isisd_privs, ) + .privs = &isisd_privs, .yang_modules = isisd_yang_modules, + .n_yang_modules = array_size(isisd_yang_modules), ) /* * Main routine of isisd. Parse arguments and handle IS-IS state machine. diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index c611ec12a..1280567f8 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -177,6 +177,9 @@ static struct quagga_signal_t ldp_signals[] = } }; +static const struct frr_yang_module_info *ldpd_yang_modules[] = { +}; + FRR_DAEMON_INFO(ldpd, LDP, .vty_port = LDP_VTY_PORT, @@ -186,6 +189,9 @@ FRR_DAEMON_INFO(ldpd, LDP, .n_signals = array_size(ldp_signals), .privs = &ldpd_privs, + + .yang_modules = ldpd_yang_modules, + .n_yang_modules = array_size(ldpd_yang_modules), ) static int ldp_config_fork_apply(struct thread *t) diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index f99e56639..e6ffa2f75 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -116,13 +116,17 @@ static struct quagga_signal_t sighandlers[] = { }, }; +static const struct frr_yang_module_info *nhrpd_yang_modules[] = { +}; + FRR_DAEMON_INFO(nhrpd, NHRP, .vty_port = NHRP_VTY_PORT, .proghelp = "Implementation of the NHRP routing protocol.", .signals = sighandlers, .n_signals = array_size(sighandlers), - .privs = &nhrpd_privs, ) + .privs = &nhrpd_privs, .yang_modules = nhrpd_yang_modules, + .n_yang_modules = array_size(nhrpd_yang_modules), ) int main(int argc, char **argv) { diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index eadc856ca..17dd334e0 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -162,6 +162,9 @@ struct quagga_signal_t ospf6_signals[] = { }, }; +static const struct frr_yang_module_info *ospf6d_yang_modules[] = { +}; + FRR_DAEMON_INFO(ospf6d, OSPF6, .vty_port = OSPF6_VTY_PORT, .proghelp = "Implementation of the OSPFv3 routing protocol.", @@ -169,7 +172,8 @@ FRR_DAEMON_INFO(ospf6d, OSPF6, .vty_port = OSPF6_VTY_PORT, .signals = ospf6_signals, .n_signals = array_size(ospf6_signals), - .privs = &ospf6d_privs, ) + .privs = &ospf6d_privs, .yang_modules = ospf6d_yang_modules, + .n_yang_modules = array_size(ospf6d_yang_modules), ) /* Main routine of ospf6d. Treatment of argument and starting ospf finite state machine is handled here. */ diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 20632f284..6085c91b9 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -123,13 +123,17 @@ struct quagga_signal_t ospf_signals[] = { }, }; +static const struct frr_yang_module_info *ospfd_yang_modules[] = { +}; + FRR_DAEMON_INFO(ospfd, OSPF, .vty_port = OSPF_VTY_PORT, .proghelp = "Implementation of the OSPFv2 routing protocol.", .signals = ospf_signals, .n_signals = array_size(ospf_signals), - .privs = &ospfd_privs, ) + .privs = &ospfd_privs, .yang_modules = ospfd_yang_modules, + .n_yang_modules = array_size(ospfd_yang_modules), ) /* OSPFd main routine. */ int main(int argc, char **argv) diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index f555ccc05..f02cb5384 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -111,6 +111,9 @@ struct quagga_signal_t pbr_signals[] = { #define PBR_VTY_PORT 2615 +static const struct frr_yang_module_info *pbrd_yang_modules[] = { +}; + FRR_DAEMON_INFO(pbrd, PBR, .vty_port = PBR_VTY_PORT, .proghelp = "Implementation of PBR.", @@ -118,7 +121,10 @@ FRR_DAEMON_INFO(pbrd, PBR, .vty_port = PBR_VTY_PORT, .signals = pbr_signals, .n_signals = array_size(pbr_signals), - .privs = &pbr_privs,) + .privs = &pbr_privs, + + .yang_modules = pbrd_yang_modules, + .n_yang_modules = array_size(pbrd_yang_modules), ) int main(int argc, char **argv, char **envp) { diff --git a/pimd/pim_main.c b/pimd/pim_main.c index 578794086..41c385e38 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -71,6 +71,9 @@ struct zebra_privs_t pimd_privs = { .cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]), .cap_num_i = 0}; +static const struct frr_yang_module_info *pimd_yang_modules[] = { +}; + FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT, .proghelp = "Implementation of the PIM routing protocol.", @@ -78,7 +81,8 @@ FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT, .signals = pimd_signals, .n_signals = 4 /* XXX array_size(pimd_signals) XXX*/, - .privs = &pimd_privs, ) + .privs = &pimd_privs, .yang_modules = pimd_yang_modules, + .n_yang_modules = array_size(pimd_yang_modules), ) int main(int argc, char **argv, char **envp) diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 4602cfcd6..79d1cca4a 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -119,13 +119,17 @@ static struct quagga_signal_t ripd_signals[] = { }, }; +static const struct frr_yang_module_info *ripd_yang_modules[] = { +}; + FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT, .proghelp = "Implementation of the RIP routing protocol.", .signals = ripd_signals, .n_signals = array_size(ripd_signals), - .privs = &ripd_privs, ) + .privs = &ripd_privs, .yang_modules = ripd_yang_modules, + .n_yang_modules = array_size(ripd_yang_modules), ) #if CONFDATE > 20190521 CPP_NOTICE("-r / --retain has reached deprecation EOL, remove") diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index b416b2fd0..d62df04ee 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -118,6 +118,9 @@ struct quagga_signal_t ripng_signals[] = { }, }; +static const struct frr_yang_module_info *ripngd_yang_modules[] = { +}; + FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT, .proghelp = "Implementation of the RIPng routing protocol.", @@ -125,7 +128,10 @@ FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT, .signals = ripng_signals, .n_signals = array_size(ripng_signals), - .privs = &ripngd_privs, ) + .privs = &ripngd_privs, + + .yang_modules = ripngd_yang_modules, + .n_yang_modules = array_size(ripngd_yang_modules), ) #if CONFDATE > 20190521 CPP_NOTICE("-r / --retain has reached deprecation EOL, remove") diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index 65b1837f6..20cdd21e7 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -111,6 +111,9 @@ struct quagga_signal_t sharp_signals[] = { #define SHARP_VTY_PORT 2614 +static const struct frr_yang_module_info *sharpd_yang_modules[] = { +}; + FRR_DAEMON_INFO(sharpd, SHARP, .vty_port = SHARP_VTY_PORT, .proghelp = "Implementation of a Sharp of routes daemon.", @@ -118,7 +121,8 @@ FRR_DAEMON_INFO(sharpd, SHARP, .vty_port = SHARP_VTY_PORT, .signals = sharp_signals, .n_signals = array_size(sharp_signals), - .privs = &sharp_privs, ) + .privs = &sharp_privs, .yang_modules = sharpd_yang_modules, + .n_yang_modules = array_size(sharpd_yang_modules), ) extern void sharp_vty_init(void); diff --git a/staticd/static_main.c b/staticd/static_main.c index b7c51312d..77243994e 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -100,6 +100,9 @@ struct quagga_signal_t static_signals[] = { }, }; +static const struct frr_yang_module_info *staticd_yang_modules[] = { +}; + #define STATIC_VTY_PORT 2616 FRR_DAEMON_INFO(staticd, STATIC, .vty_port = STATIC_VTY_PORT, @@ -109,7 +112,8 @@ FRR_DAEMON_INFO(staticd, STATIC, .vty_port = STATIC_VTY_PORT, .signals = static_signals, .n_signals = array_size(static_signals), - .privs = &static_privs, + .privs = &static_privs, .yang_modules = staticd_yang_modules, + .n_yang_modules = array_size(staticd_yang_modules), ) int main(int argc, char **argv, char **envp) diff --git a/zebra/main.c b/zebra/main.c index d8952a7b2..250ad902a 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -206,6 +206,9 @@ struct quagga_signal_t zebra_signals[] = { }, }; +static const struct frr_yang_module_info *zebra_yang_modules[] = { +}; + FRR_DAEMON_INFO( zebra, ZEBRA, .vty_port = ZEBRA_VTY_PORT, .flags = FRR_NO_ZCLIENT, @@ -215,7 +218,10 @@ FRR_DAEMON_INFO( .signals = zebra_signals, .n_signals = array_size(zebra_signals), - .privs = &zserv_privs, ) + .privs = &zserv_privs, + + .yang_modules = zebra_yang_modules, + .n_yang_modules = array_size(zebra_yang_modules), ) /* Main startup routine. */ int main(int argc, char **argv) |