*: add empty array of YANG modules

FRR_DAEMON_INFO should now contain an array of 'frr_yang_module_info'
structures describing the YANG modules implemented by the daemon.

This array will be used by frr_init() function to load all YANG modules
and initialize the northbound callbacks during the daemon initialization.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index f26d3a8872a3695de40774b204a9355ae198ff18..c92d4635472c99ee52d0f35d03c176d923dfbbbc 100644 (file)
--- 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 bf0c6a42e64b82c45a7416e103ff23eea1a09b00..bee885cff237686680a3010fdd9f6aeb184130e8 100644 (file)
--- 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 9e9c4649fcb2f3166668a062b07092b39d9c7955..3c0491fc52542d7ba95f3a686d9a20c7e962440e 100644 (file)
--- 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 7956ddeaf1aead13f3de7d048f84555f4ae1751f..bf0bd6ee6b1656c94f78a277e3eca3253303fbd5 100644 (file)
--- 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 c611ec12adf18670d6d727d32693f2a1faca9c31..1280567f830eca937d4c125246feab2566fdf577 100644 (file)
--- 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 f99e566399b571f4a59faa195b31bbfdaf1f1006..e6ffa2f75dc6fe8ba93d7d63488a59c6a710c853 100644 (file)
--- 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 eadc856cac25bc344effb7e440fd463d4bb96a0c..17dd334e0713551f226d1f1567515f9529bf2466 100644 (file)
--- 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 20632f2840ca44d16ed378431a51b5a7559a7138..6085c91b9ab7b825c3ebfe088f729d0a4d0b5a53 100644 (file)
--- 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 f555ccc056bd5ddf69a4ec0d77ddf5f402ab1fb8..f02cb538491b9a4e4ea1f5f9fe755781e8c1ea40 100644 (file)
--- 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 578794086d5eb4c1b3ac3edf11868b1324571a04..41c385e3885ccfc4d86dc7f80b86088c3c6c4f34 100644 (file)
--- 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 4602cfcd61e78b2ac11cde6f23c424972580d8d7..79d1cca4a184cc0f7cdb07c4a34fed3fc6eafad6 100644 (file)
--- 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 b416b2fd07d658d87e05a2dfbad8bbdee6748765..d62df04ee06349efa45bb9c1eec53b41f274bbe5 100644 (file)
--- 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 65b1837f68f14a50c1075822a22e91443456b2a4..20cdd21e7d23498af780700ddf7535b4fe65b7a7 100644 (file)
--- 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 b7c51312d637c27eb2ee12c6af41aa2164c909ba..77243994e2078bf2dd42dea755f620614b8623b3 100644 (file)
--- 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 d8952a7b2813914663921cea7364c60f8c04dabe..250ad902a8d60be6dde2d511058db3131920b3a2 100644 (file)
--- 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)