Merge pull request #1290 from qlyoung/doc-commit-msgs

[mirror_frr.git] / ldpd / ldpd.c

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 80af2b14e5da6accde082303f01eae3427835f10..12aeb1fff32afaa46f01a6b685fe9833e5dc4c0e 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -206,7 +206,7 @@ main(int argc, char *argv[])
        frr_preinit(&ldpd_di, argc, argv);
        frr_opt_add("LEn:", longopts,
                "      --ctl_socket   Override ctl socket path\n"
-               "-n,   --instance     Instance id\n");
+               "  -n, --instance     Instance id\n");
 
        while (1) {
                int opt;
@@ -260,7 +260,6 @@ main(int argc, char *argv[])
            sizeof(init.zclient_serv_path));
 
        argc -= optind;
-       argv += optind;
        if (argc > 0 || (lflag && eflag))
                frr_help_exit(1);
 
@@ -370,9 +369,9 @@ main(int argc, char *argv[])
 
        if (main_imsg_send_ipc_sockets(&iev_ldpe->ibuf, &iev_lde->ibuf))
                fatal("could not establish imsg links");
-       main_imsg_compose_both(IMSG_INIT, &init, sizeof(init));
        main_imsg_compose_both(IMSG_DEBUG_UPDATE, &ldp_debug,
            sizeof(ldp_debug));
+       main_imsg_compose_both(IMSG_INIT, &init, sizeof(init));
        main_imsg_send_config(ldpd_conf);
 
        if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED)
@@ -392,6 +391,8 @@ ldpd_shutdown(void)
        pid_t            pid;
        int              status;
 
+       frr_early_fini();
+
        /* close pipes */
        msgbuf_clear(&iev_ldpe->ibuf.w);
        close(iev_ldpe->ibuf.fd);
@@ -423,13 +424,9 @@ ldpd_shutdown(void)
 
        vrf_terminate();
        access_list_reset();
-       cmd_terminate();
-       vty_terminate();
        ldp_zebra_destroy();
-       zprivs_terminate(&ldpd_privs);
-       thread_master_free(master);
-       closezlog();
 
+       frr_fini();
        exit(0);
 }
 
@@ -437,7 +434,7 @@ static pid_t
 start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)
 {
        char    *argv[3];
-       int      argc = 0;
+       int      argc = 0, nullfd;
        pid_t    pid;
 
        switch (pid = fork()) {
@@ -451,6 +448,17 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)
                return (pid);
        }
 
+       nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
+       if (nullfd == -1) {
+               zlog_err("%s: failed to open /dev/null: %s", __func__,
+                        safe_strerror(errno));
+       } else {
+               dup2(nullfd, 0);
+               dup2(nullfd, 1);
+               dup2(nullfd, 2);
+               close(nullfd);
+       }
+
        if (dup2(fd_async, LDPD_FD_ASYNC) == -1)
                fatal("cannot setup imsg async fd");
        if (dup2(fd_sync, LDPD_FD_SYNC) == -1)