commit - 602b9b65961314087420e5a9775817ff78453c1d
commit + afbe8d84fc7bbb7c2893503880772d964533ea1a
blob - 04bb2c853d464ce5f3377121b5d15543643df7a0
blob + 85a6f65ab25c19830f18f161300c51503f4ea070
--- control.c
+++ control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.55 2017/01/09 14:04:31 krw Exp $	*/
+/*	$OpenBSD: control.c,v 1.56 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -387,7 +387,7 @@ control_dispatch_imsg(int fd, short event, void *arg)
 
 			memcpy(imsg.data, &verbose, sizeof(verbose));
 			control_imsg_forward(ps, &imsg);
-			log_verbose(verbose);
+			log_setverbose(verbose);
 			break;
 		default:
 			log_debug("%s: error handling imsg %d",
blob - 5d7c9bbccbac759aa3aed97e7d2ac3675d3fb864
blob + 03b23bec130f356d9333bd8ab977539ca8edb0c6
--- log.c
+++ log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.33 2017/01/08 20:31:03 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.34 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -24,13 +24,14 @@
 #include <errno.h>
 #include <time.h>
 
-int		 debug;
-int		 verbose;
+static int	 debug;
+static int	 verbose;
 const char	*log_procname;
 
 void	log_init(int, int);
 void	log_procinit(const char *);
-void	log_verbose(int);
+void	log_setverbose(int);
+int	log_getverbose(void);
 void	log_warn(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 void	log_warnx(const char *, ...)
@@ -71,11 +72,17 @@ log_procinit(const char *procname)
 }
 
 void
-log_verbose(int v)
+log_setverbose(int v)
 {
 	verbose = v;
 }
 
+int
+log_getverbose(void)
+{
+	return (verbose);
+}
+
 void
 logit(int pri, const char *fmt, ...)
 {
blob - 67550afbd0327afbf4de33266f1585387b890668
blob + 3f135d3e360da351db94a03ca1fe7199e3ee8bb7
--- proc.c
+++ proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.37 2016/11/24 21:01:18 reyk Exp $	*/
+/*	$OpenBSD: proc.c,v 1.38 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -662,7 +662,7 @@ proc_dispatch(int fd, short event, void *arg)
 		case IMSG_CTL_VERBOSE:
 			IMSG_SIZE_CHECK(&imsg, &verbose);
 			memcpy(&verbose, imsg.data, sizeof(verbose));
-			log_verbose(verbose);
+			log_setverbose(verbose);
 			break;
 		case IMSG_CTL_PROCFD:
 			IMSG_SIZE_CHECK(&imsg, &pf);
blob - e0a0a87483c9a4052ebd4bced161a0dbc055d136
blob + 116a01d61cb3534bb9f3008ef3d0af75f3686cf7
--- relay.c
+++ relay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay.c,v 1.217 2016/11/10 13:21:58 jca Exp $	*/
+/*	$OpenBSD: relay.c,v 1.218 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -287,11 +287,9 @@ relay_protodebug(struct relay *rlay)
 int
 relay_privinit(struct relay *rlay)
 {
-	extern int	 debug;
-
 	log_debug("%s: adding relay %s", __func__, rlay->rl_conf.name);
 
-	if (debug)
+	if (log_getverbose() > 1)
 		relay_protodebug(rlay);
 
 	switch (rlay->rl_proto->type) {
blob - 754bdf9f564f0dd7dbce1806d4e9a56d84aad35c
blob + 2589e51de797e41ad689b69f15a5a1c1a5c91c06
--- relay_udp.c
+++ relay_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_udp.c,v 1.44 2016/11/10 13:21:58 jca Exp $	*/
+/*	$OpenBSD: relay_udp.c,v 1.45 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2013 Reyk Floeter <reyk@openbsd.org>
@@ -39,7 +39,6 @@
 
 extern volatile sig_atomic_t relay_sessions;
 extern objid_t relay_conid;
-extern int debug;
 
 static struct relayd *env = NULL;
 struct shuffle relay_shuffle;
@@ -467,7 +466,7 @@ relay_dns_request(struct rsession *con)
 
 	if (buf == NULL || priv == NULL || len < 1)
 		return (-1);
-	if (debug)
+	if (log_getverbose() > 1)
 		relay_dns_log(con, buf, len);
 
 	getmonotime(&con->se_tv_start);
@@ -522,7 +521,7 @@ relay_dns_result(struct rsession *con, u_int8_t *buf, 
 	if (priv == NULL)
 		fatalx("relay_dns_result: response to invalid session");
 
-	if (debug)
+	if (log_getverbose() > 1)
 		relay_dns_log(con, buf, len);
 
 	/*
blob - 39d4b35d28e5dfbd57bad452da68881cf2036248
blob + 3a66500e60cb880cf89233c9e3466803eb7f6f02
--- relayd.c
+++ relayd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.c,v 1.163 2016/11/24 21:01:18 reyk Exp $	*/
+/*	$OpenBSD: relayd.c,v 1.164 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
 	ps->ps_csock.cs_name = RELAYD_SOCKET;
 
 	log_init(debug, LOG_DAEMON);
-	log_verbose(verbose);
+	log_setverbose(verbose);
 
 	if (env->sc_conf.opts & RELAYD_OPT_NOACTION)
 		ps->ps_noaction = 1;
blob - 2c0246df99cf8768eb5b891b1641c160618d3459
blob + 1a438bbc0c881a7b306b750f7cc4beac4f7212da
--- relayd.h
+++ relayd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relayd.h,v 1.236 2016/11/24 21:01:18 reyk Exp $	*/
+/*	$OpenBSD: relayd.h,v 1.237 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -1352,7 +1352,8 @@ u_int16_t	shuffle_generate16(struct shuffle *);
 /* log.c */
 void	log_init(int, int);
 void	log_procinit(const char *);
-void	log_verbose(int);
+void	log_setverbose(int);
+int	log_getverbose(void);
 void	log_warn(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 void	log_warnx(const char *, ...)
blob - dbc5f4469c52f5379e114bcaa939fbdb90784f59
blob + f5dad7e36f0166be4c10bba5d2bba1853e8a7e1b
--- ssl.c
+++ ssl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssl.c,v 1.30 2015/12/30 12:08:34 benno Exp $	*/
+/*	$OpenBSD: ssl.c,v 1.31 2017/01/09 14:49:21 reyk Exp $	*/
 
 /*
  * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -225,9 +225,8 @@ ssl_error(const char *where, const char *what)
 {
 	char		 errbuf[128];
 	unsigned long	 code;
-	extern int	 debug;
 
-	if (!debug)
+	if (log_getverbose() < 2)
 		return;
 	for (; (code = ERR_get_error()) != 0 ;) {
 		ERR_error_string_n(code, errbuf, sizeof(errbuf));