strip down frr_init

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 9b05bb4fbf96828e733fb04809e39dbe03f1d0cd..bcbba42fc77a4203965ea3470ba07a9bc3a7f795 100644 (file)
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -785,6 +785,124 @@ struct thread_master *frr_init(void)
        return master;
 }
 
+static struct thread_master *master;
+struct thread_master *frr_init_fast(void)
+{
+#if 0
+       struct option_chain *oc;
+       struct frrmod_runtime *module;
+       char moderr[256];
+       const char *dir;
+       dir = di->module_path ? di->module_path : frr_moduledir;
+#endif
+       char p_instance[16] = "", p_pathspace[256] = "";
+
+       srandom(time(NULL));
+
+       if (di->instance) {
+               snprintf(frr_protonameinst, sizeof(frr_protonameinst), "%s[%u]",
+                        di->logname, di->instance);
+               snprintf(p_instance, sizeof(p_instance), "-%d", di->instance);
+       }
+       if (di->pathspace)
+               snprintf(p_pathspace, sizeof(p_pathspace), "%s/",
+                        di->pathspace);
+
+       snprintf(config_default, sizeof(config_default), "%s%s%s%s.conf",
+                frr_sysconfdir, p_pathspace, di->name, p_instance);
+       snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s%s.pid",
+                frr_vtydir, di->name, p_instance);
+#if 0
+#ifdef HAVE_SQLITE3
+       snprintf(dbfile_default, sizeof(dbfile_default), "%s/%s%s%s.db",
+                frr_dbdir, p_pathspace, di->name, p_instance);
+#endif
+#endif
+
+       zprivs_preinit(di->privs);
+
+       openzlog(di->progname, di->logname, di->instance,
+                LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
+
+       command_setup_early_logging(di->early_logging, di->early_loglevel);
+
+       if (!frr_zclient_addr(&zclient_addr, &zclient_addr_len,
+                             frr_zclientpath)) {
+               fprintf(stderr, "Invalid zserv socket path: %s\n",
+                       frr_zclientpath);
+               exit(1);
+       }
+
+       /* don't mkdir these as root... */
+       if (!(di->flags & FRR_NO_PRIVSEP)) {
+               if (!di->pid_file || !di->vty_path)
+                       frr_mkdir(frr_vtydir, false);
+               if (di->pid_file)
+                       frr_mkdir(di->pid_file, true);
+               if (di->vty_path)
+                       frr_mkdir(di->vty_path, true);
+       }
+
+#if 0
+       frrmod_init(di->module);
+       while (modules) {
+               modules = (oc = modules)->next;
+               module = frrmod_load(oc->arg, dir, moderr, sizeof(moderr));
+               if (!module) {
+                       fprintf(stderr, "%s\n", moderr);
+                       exit(1);
+               }
+               XFREE(MTYPE_TMP, oc);
+       }
+
+#endif
+
+       zprivs_init(di->privs);
+       master = thread_master_create(NULL);
+       signal_init(master, di->n_signals, di->signals);
+
+#if 0
+#ifdef HAVE_SQLITE3
+       if (!di->db_file)
+               di->db_file = dbfile_default;
+       db_init(di->db_file);
+#endif
+
+#endif
+       if (di->flags & FRR_LIMITED_CLI)
+               cmd_init(-1);
+       else
+               cmd_init(1);
+
+       vty_init(master, di->log_always);
+
+#if 0
+       log_filter_cmd_init();
+#endif
+
+#if 0
+       frr_pthread_init();
+#endif
+
+       log_ref_init();
+       log_ref_vty_init();
+       lib_error_init();
+
+#if 0
+       yang_init();
+
+       debug_init_cli();
+
+       nb_init(master, di->yang_modules, di->n_yang_modules);
+       if (nb_db_init() != NB_OK)
+               flog_warn(EC_LIB_NB_DATABASE,
+                         "%s: failed to initialize northbound database",
+                         __func__);
+#endif
+
+       return master;
+}
+
 const char *frr_get_progname(void)
 {
        return di ? di->progname : NULL;

diff --git a/lib/libfrr.h b/lib/libfrr.h
index ed7e9c099e3bbabca873e014fd9585fd65e7dc21..4f476156d0feabed707308b06a7ab74dc6da109e 100644 (file)
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -135,6 +135,9 @@ extern int frr_getopt(int argc, char *const argv[], int *longindex);
 
 extern __attribute__((__noreturn__)) void frr_help_exit(int status);
 
+/* FOR FUZZING */
+extern struct thread_master *frr_init_fast(void);
+
 extern struct thread_master *frr_init(void);
 extern const char *frr_get_progname(void);
 extern enum frr_cli_mode frr_get_cli_mode(void);

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 38e7273945f15612d7235feaedb9a5bdea7ac411..14c967e4176965d5ed8e2f8a6569dc164c57189e 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -87,7 +87,7 @@ void pim_router_init(void)
        router = XCALLOC(MTYPE_ROUTER, sizeof(*router));
 
        router->debugs = 0;
-       router->master = frr_init();
+       router->master = frr_init_fast();
        router->t_periodic = PIM_DEFAULT_T_PERIODIC;
 
        /*