work on making log.c similar in all daemons:

move daemon-local functions into new logmsg.c, and reduce
the (mostly whitespace) differences so that log.c's can be diffed easily.

ok claudio@, feedback from henning@, deraadt@, reyk@

1 files changed, 9 insertions, 129 deletions

diff --git a/usr.sbin/ospfd/log.c b/usr.sbin/ospfd/log.c
index 8fe81b24af1..48d344ffb43 100644
--- a/usr.sbin/ospfd/log.c
+++ b/usr.sbin/ospfd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.8 2014/11/03 07:40:31 bluhm Exp $ */
+/*	$OpenBSD: log.c,v 1.9 2016/09/02 14:02:48 benno Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -22,19 +22,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#include <time.h>
 #include <unistd.h>
 
-#include "ospfd.h"
 #include "log.h"
+#include "ospfd.h"
 
-static const char * const procnames[] = {
-	"parent",
-	"ospfe",
-	"rde"
-};
-
-int	debug;
-int	verbose;
+int		 debug;
+int		 verbose;
+const char	*log_procname;
 
 void
 log_init(int n_debug)
@@ -144,15 +140,15 @@ void
 fatal(const char *emsg)
 {
 	if (emsg == NULL)
-		logit(LOG_CRIT, "fatal in %s: %s", procnames[ospfd_process],
+		logit(LOG_CRIT, "fatal in %s: %s", log_procname,
 		    strerror(errno));
 	else
 		if (errno)
 			logit(LOG_CRIT, "fatal in %s: %s: %s",
-			    procnames[ospfd_process], emsg, strerror(errno));
+			    log_procname, emsg, strerror(errno));
 		else
 			logit(LOG_CRIT, "fatal in %s: %s",
-			    procnames[ospfd_process], emsg);
+			    log_procname, emsg);
 
 	if (ospfd_process == PROC_MAIN)
 		exit(1);
@@ -166,119 +162,3 @@ fatalx(const char *emsg)
 	errno = 0;
 	fatal(emsg);
 }
-
-/* names */
-const char *
-nbr_state_name(int state)
-{
-	switch (state) {
-	case NBR_STA_DOWN:
-		return ("DOWN");
-	case NBR_STA_ATTEMPT:
-		return ("ATTMP");
-	case NBR_STA_INIT:
-		return ("INIT");
-	case NBR_STA_2_WAY:
-		return ("2-WAY");
-	case NBR_STA_XSTRT:
-		return ("EXSTA");
-	case NBR_STA_SNAP:
-		return ("SNAP");
-	case NBR_STA_XCHNG:
-		return ("EXCHG");
-	case NBR_STA_LOAD:
-		return ("LOAD");
-	case NBR_STA_FULL:
-		return ("FULL");
-	default:
-		return ("UNKNW");
-	}
-}
-
-const char *
-if_state_name(int state)
-{
-	switch (state) {
-	case IF_STA_DOWN:
-		return ("DOWN");
-	case IF_STA_LOOPBACK:
-		return ("LOOP");
-	case IF_STA_WAITING:
-		return ("WAIT");
-	case IF_STA_POINTTOPOINT:
-		return ("P2P");
-	case IF_STA_DROTHER:
-		return ("OTHER");
-	case IF_STA_BACKUP:
-		return ("BCKUP");
-	case IF_STA_DR:
-		return ("DR");
-	default:
-		return ("UNKNW");
-	}
-}
-
-const char *
-if_type_name(enum iface_type type)
-{
-	switch (type) {
-	case IF_TYPE_POINTOPOINT:
-		return ("POINTOPOINT");
-	case IF_TYPE_BROADCAST:
-		return ("BROADCAST");
-	case IF_TYPE_NBMA:
-		return ("NBMA");
-	case IF_TYPE_POINTOMULTIPOINT:
-		return ("POINTOMULTIPOINT");
-	case IF_TYPE_VIRTUALLINK:
-		return ("VIRTUALLINK");
-	}
-	/* NOTREACHED */
-	return ("UNKNOWN");
-}
-
-const char *
-if_auth_name(enum auth_type type)
-{
-	switch (type) {
-	case AUTH_NONE:
-		return ("none");
-	case AUTH_SIMPLE:
-		return ("simple");
-	case AUTH_CRYPT:
-		return ("crypt");
-	}
-	/* NOTREACHED */
-	return ("unknown");
-}
-
-const char *
-dst_type_name(enum dst_type type)
-{
-	switch (type) {
-	case DT_NET:
-		return ("Network");
-	case DT_RTR:
-		return ("Router");
-	}
-	/* NOTREACHED */
-	return ("unknown");
-}
-
-const char *
-path_type_name(enum path_type type)
-{
-	switch (type) {
-	case PT_INTRA_AREA:
-		return ("Intra-Area");
-	case PT_INTER_AREA:
-		return ("Inter-Area");
-	case PT_TYPE1_EXT:
-		return ("Type 1 ext");
-	case PT_TYPE2_EXT:
-		return ("Type 2 ext");
-	}
-	/* NOTREACHED */
-	return ("unknown");
-}
-