summaryrefslogtreecommitdiffstats
path: root/usr.sbin/httpd/proc.c
diff options
context:
space:
mode:
authorreyk <reyk@openbsd.org>2015-12-07 16:05:56 +0000
committerreyk <reyk@openbsd.org>2015-12-07 16:05:56 +0000
commit66094308c50bdd3f984e2f533449249ea32c98da (patch)
treea2b5798b9a1bc923a9f31e9b8db76c2d4b350a9f /usr.sbin/httpd/proc.c
parentForcibly remove the local vm reference on error. (diff)
downloadwireguard-openbsd-66094308c50bdd3f984e2f533449249ea32c98da.tar.xz
wireguard-openbsd-66094308c50bdd3f984e2f533449249ea32c98da.zip
Add imsg "peerid" to debug messages (only within -DDEBUG).
Diffstat (limited to 'usr.sbin/httpd/proc.c')
-rw-r--r--usr.sbin/httpd/proc.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c
index 646281a92d0..7a6124a302a 100644
--- a/usr.sbin/httpd/proc.c
+++ b/usr.sbin/httpd/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.14 2015/12/05 13:15:27 claudio Exp $ */
+/* $OpenBSD: proc.c,v 1.15 2015/12/07 16:05:56 reyk Exp $ */
/*
* Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -474,9 +474,9 @@ proc_dispatch(int fd, short event, void *arg)
break;
#if DEBUG > 1
- log_debug("%s: %s %d got imsg %d from %s %d",
+ log_debug("%s: %s %d got imsg %d peerid %d from %s %d",
__func__, title, ps->ps_instance + 1,
- imsg.hdr.type, p->p_title, p->p_instance);
+ imsg.hdr.type, imsg.hdr.peerid, p->p_title, p->p_instance);
#endif
/*
@@ -498,9 +498,11 @@ proc_dispatch(int fd, short event, void *arg)
log_verbose(verbose);
break;
default:
- log_warnx("%s: %s %d got invalid imsg %d from %s %d",
+ log_warnx("%s: %s %d got invalid imsg %d peerid %d "
+ "from %s %d",
__func__, title, ps->ps_instance + 1,
- imsg.hdr.type, p->p_title, p->p_instance);
+ imsg.hdr.type, imsg.hdr.peerid,
+ p->p_title, p->p_instance);
fatalx(__func__);
}
imsg_free(&imsg);