commit 6b5c4000434cc5dc67e202d8aede2f543b5b2bf3
from: rsadowski <rsadowski@openbsd.org>
date: Mon Mar  2 19:28:01 2026 UTC

Standardize logging with bgpd

OK claudio@

commit - 7d3002f34b21f1b776e623940190ca244b453503
commit + 6b5c4000434cc5dc67e202d8aede2f543b5b2bf3
blob - b5f75f20ce6e489825a88d8f6eb2bb865e67bfdf
blob + 68fb6768bd298d30d2624e965ab8523eca7d91bc
--- agentx_control.c
+++ agentx_control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agentx_control.c,v 1.7 2024/01/17 10:01:24 claudio Exp $	*/
+/*	$OpenBSD: agentx_control.c,v 1.8 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2020 Martijn van Duren <martijn@openbsd.org>
@@ -38,6 +38,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 #define RELAYD_MIB	"1.3.6.1.4.1.30155.3"
 #define SNMP_ELEMENT(x...)	do {				\
blob - 167fb1cf75628c63f321115879eb9d46a33befe5
blob + 43c9f5a1f58a2a31dc1e7636f028617785816c5a
--- ca.c
+++ ca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ca.c,v 1.47 2026/02/24 11:47:02 rsadowski Exp $	*/
+/*	$OpenBSD: ca.c,v 1.48 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -34,6 +34,7 @@
 #include <openssl/engine.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	 ca_init(struct privsep *, struct privsep_proc *p, void *);
 void	 ca_launch(void);
blob - fad0138773815e118c58858f329ae320960cdcd0
blob + 0cb7225224e52198c58d333fa7c776375ba15059
--- carp.c
+++ carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: carp.c,v 1.13 2026/01/01 08:30:33 rsadowski Exp $ */
+/*	$OpenBSD: carp.c,v 1.14 2026/03/02 19:28:01 rsadowski Exp $ */
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -29,6 +29,7 @@
 #include <unistd.h>
 
 #include "relayd.h"
+#include "log.h"
 
 struct carpgroup {
 	TAILQ_ENTRY(carpgroup)	 entry;
blob - 3d251b28651f6cbfa5183991d274dc9c84269be4
blob + a8182cd469935b333c6531be3d799ae2a2cd1ab9
--- check_icmp.c
+++ check_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_icmp.c,v 1.48 2019/06/28 13:32:50 deraadt Exp $	*/
+/*	$OpenBSD: check_icmp.c,v 1.49 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	icmp_setup(struct relayd *, struct ctl_icmp_event *, int);
 void	check_icmp_add(struct ctl_icmp_event *, int, struct timeval *,
blob - d0cd1f6fc7ffbd0b7fb350f2ad0e3d9927840e83
blob + 6182b071b01cc8ee4a6f7bc2a32f5647dc14e1f3
--- check_script.c
+++ check_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_script.c,v 1.22 2021/02/22 01:24:59 jmatthew Exp $	*/
+/*	$OpenBSD: check_script.c,v 1.23 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -27,6 +27,7 @@
 #include <pwd.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	 script_sig_alarm(int);
 
blob - 4f6ded935072e5970b552bf37c6e27eb603f6bf6
blob + 05819a73891aefbc7c01a0421ad81c8db0cb145d
--- check_tcp.c
+++ check_tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_tcp.c,v 1.61 2023/07/03 09:38:08 claudio Exp $	*/
+/*	$OpenBSD: check_tcp.c,v 1.62 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -34,6 +34,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	tcp_write(int, short, void *);
 void	tcp_host_up(struct ctl_tcp_event *);
blob - 04df50308b0325705261d23d2f1c001f6ae5526a
blob + 3d56068625c379ce9b3142ff78b0eba409b6948c
--- check_tls.c
+++ check_tls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: check_tls.c,v 1.3 2023/07/03 09:38:08 claudio Exp $	*/
+/*	$OpenBSD: check_tls.c,v 1.4 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2017 Claudio Jeker <claudio@openbsd.org>
@@ -29,6 +29,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	check_tls_read(int, short, void *);
 void	check_tls_write(int, short, void *);
blob - ec7ec873547c0c9ce2f8bb150b8af6cd86c3603b
blob + 60bdb00b63babb44353e19f25009d86ba1a91a20
--- config.c
+++ config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.47 2024/10/31 13:37:44 claudio Exp $	*/
+/*	$OpenBSD: config.c,v 1.48 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2011 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -29,6 +29,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 int
 config_init(struct relayd *env)
blob - bd13efd1d9b723b2789de9fc9c43009781833929
blob + 279346120778ba9c608e14ecb483a94e9a78dfa3
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.64 2024/11/21 13:38:45 claudio Exp $	*/
+/*	$OpenBSD: control.c,v 1.65 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -31,6 +31,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 #define	CONTROL_BACKLOG	5
 
blob - e4db3c96c912cfb3a05104a3f3e50a2031ae537e
blob + 6598feaae66fdca444c631cb9f76da4cac363d46
--- hce.c
+++ hce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hce.c,v 1.82 2024/05/18 06:34:46 jsg Exp $	*/
+/*	$OpenBSD: hce.c,v 1.83 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -28,6 +28,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	 hce_init(struct privsep *, struct privsep_proc *p, void *);
 void	 hce_launch_checks(int, short, void *);
blob - b5e4308dbf4b9b7837976bcd695ffe24c280490f
blob + 532015dd0742e47b4c1f837f44b79495cb905dc8
--- log.c
+++ log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.35 2017/03/21 12:06:56 bluhm Exp $	*/
+/*	$OpenBSD: log.c,v 1.36 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -24,30 +24,11 @@
 #include <errno.h>
 #include <time.h>
 
-static int	 debug;
-static int	 verbose;
-const char	*log_procname;
+#include "log.h"
 
-void	log_init(int, int);
-void	log_procinit(const char *);
-void	log_setverbose(int);
-int	log_getverbose(void);
-void	log_warn(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_warnx(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_info(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_debug(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	logit(int, const char *, ...)
-	    __attribute__((__format__ (printf, 2, 3)));
-void	vlog(int, const char *, va_list)
-	    __attribute__((__format__ (printf, 2, 0)));
-__dead void fatal(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-__dead void fatalx(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
+static int		 debug;
+static int		 verbose;
+static const char	*log_procname;
 
 void
 log_init(int n_debug, int facility)
@@ -168,7 +149,7 @@ log_debug(const char *emsg, ...)
 {
 	va_list	 ap;
 
-	if (verbose > 1) {
+	if (verbose) {
 		va_start(ap, emsg);
 		vlog(LOG_DEBUG, emsg, ap);
 		va_end(ap);
@@ -189,10 +170,10 @@ vfatalc(int code, const char *emsg, va_list ap)
 		sep = "";
 	}
 	if (code)
-		logit(LOG_CRIT, "%s: %s%s%s",
+		logit(LOG_CRIT, "fatal in %s: %s%s%s",
 		    log_procname, s, sep, strerror(code));
 	else
-		logit(LOG_CRIT, "%s%s%s", log_procname, sep, s);
+		logit(LOG_CRIT, "fatal in %s%s%s", log_procname, sep, s);
 }
 
 void
blob - b4660f7f1efb3cd0b1b8cd1e3760826ffd2c7e56
blob + e8bb541236f24e166b3d10d7f6acfd47b1acf810
--- parse.y
+++ parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.259 2026/02/18 22:27:03 kirill Exp $	*/
+/*	$OpenBSD: parse.y,v 1.260 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -57,6 +57,7 @@
 
 #include "relayd.h"
 #include "http.h"
+#include "log.h"
 
 TAILQ_HEAD(files, file)		 files = TAILQ_HEAD_INITIALIZER(files);
 static struct file {
blob - 3aba811eed5a2ea200892cbe438c0afe2d611ec5
blob + 3d4b3634372b53e2f62540b740f2640d508738c3
--- pfe.c
+++ pfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe.c,v 1.91 2024/06/17 08:36:56 sashan Exp $	*/
+/*	$OpenBSD: pfe.c,v 1.92 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -33,6 +33,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	 pfe_init(struct privsep *, struct privsep_proc *p, void *);
 void	 pfe_shutdown(void);
blob - c1851260c6215b108458fb2d6c621f2bad936059
blob + df2297bd6c38b1be595d035e24ad2cac55931039
--- pfe_filter.c
+++ pfe_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_filter.c,v 1.66 2024/06/17 08:02:57 sashan Exp $	*/
+/*	$OpenBSD: pfe_filter.c,v 1.67 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -38,6 +38,7 @@
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
 
 #include "relayd.h"
+#include "log.h"
 
 int	 transaction_init(struct relayd *, const char *);
 int	 transaction_commit(struct relayd *);
blob - 4850aef9b0594e7e4b0910b8ed2a95f52dca4c00
blob + 27afb352eefa0a340c60b69db16612a175c7b5de
--- pfe_route.c
+++ pfe_route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfe_route.c,v 1.14 2023/06/29 16:24:53 claudio Exp $	*/
+/*	$OpenBSD: pfe_route.c,v 1.15 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2009 - 2011 Reyk Floeter <reyk@openbsd.org>
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void
 init_routes(struct relayd *env)
blob - 3eb00aa038150cbe68ef5a5c280d7fa6659e72db
blob + 361f05ae3829707b2903d215649f5cb9673fb476
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.52 2024/11/21 13:38:45 claudio Exp $	*/
+/*	$OpenBSD: proc.c,v 1.53 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -35,6 +35,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 void	 proc_exec(struct privsep *, struct privsep_proc *, unsigned int, int,
 	    char **);
blob - ff2a679650270ba73327fe9f1b16dcd60498a047
blob + e2aa06255720d8329334753d2c8600bd93f21bba
--- relay.c
+++ relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.261 2026/02/18 22:27:03 kirill Exp $	*/
+/*	$OpenBSD: relay.c,v 1.262 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -42,6 +42,7 @@
 #include <tls.h>
 
 #include "relayd.h"
+#include "log.h"
 
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
 
blob - e9b9c4449e58a48daf796bc06f1047edc8c157b3
blob + 3ac50286315790c65e921b9fa0049ae78d5661f9
--- relay_http.c
+++ relay_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_http.c,v 1.92 2026/01/01 14:32:41 rsadowski Exp $	*/
+/*	$OpenBSD: relay_http.c,v 1.93 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -39,6 +39,7 @@
 
 #include "relayd.h"
 #include "http.h"
+#include "log.h"
 
 static int	_relay_lookup_url(struct ctl_relay_event *, char *, char *,
 		    char *, struct kv *);
blob - 1a4751d0d739ac2efb86989624adeb1099159f43
blob + cac1059d930093bbe0c97ab44f8207ad12623aba
--- relay_udp.c
+++ relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.51 2024/05/18 06:34:46 jsg Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.52 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org>
@@ -36,6 +36,7 @@
 #include <imsg.h>
 
 #include "relayd.h"
+#include "log.h"
 
 extern volatile sig_atomic_t relay_sessions;
 extern objid_t relay_conid;
blob - 612dda5692019e647a35d7215ab4efc89165c253
blob + 9eb1b452d8122be2aaf05dd19dcb84e15b560d49
--- relayd.c
+++ relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.196 2026/01/01 14:34:57 rsadowski Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.197 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -48,6 +48,7 @@
 #include <tls.h>
 
 #include "relayd.h"
+#include "log.h"
 
 #define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
 
blob - 0832e799f107ffbfe4d9e3dc821175cdc3f52cbb
blob + a5363989f4b4cbcca6c899b12de4ccd3cdf4dfcb
--- relayd.h
+++ relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.277 2026/02/18 22:27:03 kirill Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.278 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -1399,28 +1399,6 @@ void	 snmp_hosttrap(struct relayd *, struct table *, s
 void		shuffle_init(struct shuffle *);
 u_int16_t	shuffle_generate16(struct shuffle *);
 
-/* log.c */
-void	log_init(int, int);
-void	log_procinit(const char *);
-void	log_setverbose(int);
-int	log_getverbose(void);
-void	log_warn(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_warnx(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_info(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	log_debug(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-void	logit(int, const char *, ...)
-	    __attribute__((__format__ (printf, 2, 3)));
-void	vlog(int, const char *, va_list)
-	    __attribute__((__format__ (printf, 2, 0)));
-__dead void fatal(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-__dead void fatalx(const char *, ...)
-	    __attribute__((__format__ (printf, 1, 2)));
-
 /* proc.c */
 enum privsep_procid
 	    proc_getid(struct privsep_proc *, unsigned int, const char *);
blob - 31eebee64e48fe97ae1834d0fdcbfd798b91e0d3
blob + 19950b89e56aec83e15bc9635293bd078f331e45
--- ssl.c
+++ ssl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.c,v 1.37 2023/06/25 08:07:39 op Exp $	*/
+/*	$OpenBSD: ssl.c,v 1.38 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -29,6 +29,7 @@
 #include <openssl/err.h>
 
 #include "relayd.h"
+#include "log.h"
 
 int	ssl_password_cb(char *, int, int, void *);
 
blob - 751e82c43c8cf0a9e1cf81f8edd369f28a7e1873
blob + 527891f6dd056f60580f1a1101fee1f62e5eda7c
--- util.c
+++ util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.5 2024/09/20 02:00:46 jsg Exp $	*/
+/*	$OpenBSD: util.c,v 1.6 2026/03/02 19:28:01 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -27,6 +27,7 @@
 #include <ctype.h>
 
 #include "relayd.h"
+#include "log.h"
 
 const char *
 host_error(enum host_error he)