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@

2 files changed, 344 insertions, 0 deletions

diff --git a/usr.sbin/bgpd/logmsg.c b/usr.sbin/bgpd/logmsg.c
new file mode 100644
index 00000000000..0061cbdec16
--- /dev/null
+++ b/usr.sbin/bgpd/logmsg.c
@@ -0,0 +1,201 @@
+/*	$OpenBSD: logmsg.c,v 1.1 2016/09/02 14:04:51 benno Exp $ */
+
+/*
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <syslog.h>
+
+#include "bgpd.h"
+#include "session.h"
+
+char *
+log_fmt_peer(const struct peer_config *peer)
+{
+	const char	*ip;
+	char		*pfmt, *p;
+
+	ip = log_addr(&peer->remote_addr);
+	if ((peer->remote_addr.aid == AID_INET && peer->remote_masklen != 32) ||
+	    (peer->remote_addr.aid == AID_INET6 &&
+	    peer->remote_masklen != 128)) {
+		if (asprintf(&p, "%s/%u", ip, peer->remote_masklen) == -1)
+			fatal(NULL);
+	} else {
+		if ((p = strdup(ip)) == NULL)
+			fatal(NULL);
+	}
+
+	if (peer->descr[0]) {
+		if (asprintf(&pfmt, "neighbor %s (%s)", p, peer->descr) ==
+		    -1)
+			fatal(NULL);
+	} else {
+		if (asprintf(&pfmt, "neighbor %s", p) == -1)
+			fatal(NULL);
+	}
+	free(p);
+	return (pfmt);
+}
+
+void
+log_peer_warn(const struct peer_config *peer, const char *emsg, ...)
+{
+	char	*p, *nfmt;
+	va_list	 ap;
+
+	p = log_fmt_peer(peer);
+	if (emsg == NULL) {
+		if (asprintf(&nfmt, "%s: %s", p, strerror(errno)) == -1)
+			fatal(NULL);
+	} else {
+		if (asprintf(&nfmt, "%s: %s: %s", p, emsg, strerror(errno)) ==
+		    -1)
+			fatal(NULL);
+	}
+	va_start(ap, emsg);
+	vlog(LOG_CRIT, nfmt, ap);
+	va_end(ap);
+	free(p);
+	free(nfmt);
+}
+
+void
+log_peer_warnx(const struct peer_config *peer, const char *emsg, ...)
+{
+	char	*p, *nfmt;
+	va_list	 ap;
+
+	p = log_fmt_peer(peer);
+	if (asprintf(&nfmt, "%s: %s", p, emsg) == -1)
+		fatal(NULL);
+	va_start(ap, emsg);
+	vlog(LOG_CRIT, nfmt, ap);
+	va_end(ap);
+	free(p);
+	free(nfmt);
+}
+
+void
+log_statechange(struct peer *peer, enum session_state nstate,
+    enum session_events event)
+{
+	char	*p;
+
+	/* don't clutter the logs with constant Connect -> Active -> Connect */
+	if (nstate == STATE_CONNECT && peer->state == STATE_ACTIVE &&
+	    peer->prev_state == STATE_CONNECT)
+		return;
+	if (nstate == STATE_ACTIVE && peer->state == STATE_CONNECT &&
+	    peer->prev_state == STATE_ACTIVE)
+		return;
+
+	peer->lasterr = 0;
+	p = log_fmt_peer(&peer->conf);
+	logit(LOG_INFO, "%s: state change %s -> %s, reason: %s",
+	    p, statenames[peer->state], statenames[nstate], eventnames[event]);
+	free(p);
+}
+
+void
+log_notification(const struct peer *peer, u_int8_t errcode, u_int8_t subcode,
+    u_char *data, u_int16_t datalen, const char *dir)
+{
+	char		*p;
+	const char	*suberrname = NULL;
+	int		 uk = 0;
+
+	p = log_fmt_peer(&peer->conf);
+	switch (errcode) {
+	case ERR_HEADER:
+		if (subcode >= sizeof(suberr_header_names)/sizeof(char *))
+			uk = 1;
+		else
+			suberrname = suberr_header_names[subcode];
+		break;
+	case ERR_OPEN:
+		if (subcode >= sizeof(suberr_open_names)/sizeof(char *))
+			uk = 1;
+		else
+			suberrname = suberr_open_names[subcode];
+		break;
+	case ERR_UPDATE:
+		if (subcode >= sizeof(suberr_update_names)/sizeof(char *))
+			uk = 1;
+		else
+			suberrname = suberr_update_names[subcode];
+		break;
+	case ERR_CEASE:
+		if (subcode >= sizeof(suberr_cease_names)/sizeof(char *))
+			uk = 1;
+		else
+			suberrname = suberr_cease_names[subcode];
+		break;
+	case ERR_HOLDTIMEREXPIRED:
+		if (subcode != 0)
+			uk = 1;
+		break;
+	case ERR_FSM:
+		if (subcode >= sizeof(suberr_fsm_names)/sizeof(char *))
+			uk = 1;
+		else
+			suberrname = suberr_fsm_names[subcode];
+		break;
+	default:
+		logit(LOG_CRIT, "%s: %s notification, unknown errcode "
+		    "%u, subcode %u", p, dir, errcode, subcode);
+		free(p);
+		return;
+	}
+
+	if (uk)
+		logit(LOG_CRIT, "%s: %s notification: %s, unknown subcode %u",
+		    p, dir, errnames[errcode], subcode);
+	else {
+		if (suberrname == NULL)
+			logit(LOG_CRIT, "%s: %s notification: %s", p,
+			    dir, errnames[errcode]);
+		else
+			logit(LOG_CRIT, "%s: %s notification: %s, %s",
+			    p, dir, errnames[errcode], suberrname);
+	}
+	free(p);
+}
+
+void
+log_conn_attempt(const struct peer *peer, struct sockaddr *sa)
+{
+	char		*p;
+	const char	*b;
+
+	if (peer == NULL) {	/* connection from non-peer, drop */
+		b = log_sockaddr(sa);
+		logit(LOG_INFO, "connection from non-peer %s refused", b);
+	} else {
+		/* only log if there is a chance that the session may come up */
+		if (peer->conf.down && peer->state == STATE_IDLE)
+			return;
+		p = log_fmt_peer(&peer->conf);
+		logit(LOG_INFO, "Connection attempt from %s while session is "
+		    "in state %s", p, statenames[peer->state]);
+		free(p);
+	}
+}
diff --git a/usr.sbin/ospfd/logmsg.c b/usr.sbin/ospfd/logmsg.c
new file mode 100644
index 00000000000..8146ea44ac3
--- /dev/null
+++ b/usr.sbin/ospfd/logmsg.c
@@ -0,0 +1,143 @@
+/*	$OpenBSD: logmsg.c,v 1.1 2016/09/02 14:04:25 benno Exp $ */
+
+/*
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#include "ospfd.h"
+#include "log.h"
+
+/* 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");
+}