Remove the PROC_* enums and ripd_process, they are no longer needed.

Instead assign the process name directly to log_procname which was
the last user of ripd_process.

diff --git a/usr.sbin/ripd/rde.c b/usr.sbin/ripd/rde.c
index 73e15bf..e6ffda9 100644 (file)
--- a/usr.sbin/ripd/rde.c
+++ b/usr.sbin/ripd/rde.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde.c,v 1.22 2018/11/04 07:52:55 remi Exp $ */
+/*     $OpenBSD: rde.c,v 1.23 2021/01/19 10:18:56 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -101,8 +101,7 @@ rde(struct ripd_conf *xconf, int pipe_parent2rde[2], int pipe_ripe2rde[2],
                fatal("chdir(\"/\")");
 
        setproctitle("route decision engine");
-       ripd_process = PROC_RDE_ENGINE;
-       log_procname = log_procnames[ripd_process];
+       log_procname = "rde";
 
        if (setgroups(1, &pw->pw_gid) ||
            setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||

diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c
index 7a34e59..cce8262 100644 (file)
--- a/usr.sbin/ripd/ripd.c
+++ b/usr.sbin/ripd/ripd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ripd.c,v 1.33 2019/08/08 16:50:15 mestre Exp $ */
+/*     $OpenBSD: ripd.c,v 1.34 2021/01/19 10:18:56 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -109,8 +109,7 @@ main(int argc, char *argv[])
        size_t           len;
 
        conffile = CONF_FILE;
-       ripd_process = PROC_MAIN;
-       log_procname = log_procnames[ripd_process];
+       log_procname = "parent";
        sockname = RIPD_SOCKET;
 
        log_init(1);    /* log to stderr until daemonized */

diff --git a/usr.sbin/ripd/ripd.h b/usr.sbin/ripd/ripd.h
index 5534238..2ff9c73 100644 (file)
--- a/usr.sbin/ripd/ripd.h
+++ b/usr.sbin/ripd/ripd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ripd.h,v 1.26 2018/12/31 20:34:16 remi Exp $ */
+/*     $OpenBSD: ripd.h,v 1.27 2021/01/19 10:18:56 claudio Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -96,12 +96,6 @@ enum imsg_type {
        IMSG_DEMOTE
 };
 
-static const char * const log_procnames[] = {
-       "parent",
-       "ripe",
-       "rde"
-};
-
 struct imsgev {
        struct imsgbuf           ibuf;
        void                    (*handler)(int, short, void *);
@@ -207,12 +201,6 @@ struct packet_entry {
        struct rip_route                *rr;
 };
 
-enum {
-       PROC_MAIN,
-       PROC_RIP_ENGINE,
-       PROC_RDE_ENGINE
-} ripd_process;
-
 #define        REDIST_CONNECTED        0x01
 #define        REDIST_STATIC           0x02
 #define        REDIST_LABEL            0x04

diff --git a/usr.sbin/ripd/ripe.c b/usr.sbin/ripd/ripe.c
index 841beef..9f55efb 100644 (file)
--- a/usr.sbin/ripd/ripe.c
+++ b/usr.sbin/ripd/ripe.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ripe.c,v 1.28 2021/01/19 10:09:59 claudio Exp $ */
+/*     $OpenBSD: ripe.c,v 1.29 2021/01/19 10:18:56 claudio Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -127,8 +127,7 @@ ripe(struct ripd_conf *xconf, int pipe_parent2ripe[2], int pipe_ripe2rde[2],
                fatal("chdir(\"/\")");
 
        setproctitle("rip engine");
-       ripd_process = PROC_RIP_ENGINE;
-       log_procname = log_procnames[ripd_process];
+       log_procname = "ripe";
 
        if (setgroups(1, &pw->pw_gid) ||
            setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) ||