From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: httpd: use imsg_get_type
To: tech@openbsd.org
Date: Fri, 18 Sep 2026 18:00:05 +0200

OK?

commit 41e273ca68bf4d546d98dc6c6314bbe920eca100
Author: Rafael Sadowski <rafael@sizeofvoid.org>
Date:   Fri Sep 18 17:40:15 2026 +0200

    httpd: use imsg_get_type

diff --git a/httpd.c b/httpd.c
index 4b2303b..af74ffb 100644
--- a/httpd.c
+++ b/httpd.c
@@ -409,7 +409,7 @@ parent_dispatch_server(int fd, struct privsep_proc *p, struct imsg *imsg)
 	struct privsep		*ps = p->p_ps;
 	struct httpd		*env = ps->ps_env;
 
-	switch (imsg->hdr.type) {
+	switch (imsg_get_type(imsg)) {
 	case IMSG_CFG_DONE:
 		parent_configure_done(env);
 		break;
@@ -428,7 +428,7 @@ parent_dispatch_logger(int fd, struct privsep_proc *p, struct imsg *imsg)
 	unsigned int		 v;
 	char			*str = NULL;
 
-	switch (imsg->hdr.type) {
+	switch (imsg_get_type(imsg)) {
 	case IMSG_CTL_RESET:
 		if (imsg_get_data(imsg, &v, sizeof(v)) == -1)
 			fatalx("%s: imsg_get_data", __func__);
diff --git a/logger.c b/logger.c
index 049a5b1..0dd3ce9 100644
--- a/logger.c
+++ b/logger.c
@@ -279,7 +279,7 @@ logger_log(struct imsg *imsg)
 	if ((srv_conf = serverconfig_byid(id)) == NULL)
 		fatalx("invalid logging requestr");
 
-	if (imsg->hdr.type == IMSG_LOG_ACCESS)
+	if (imsg_get_type(imsg) == IMSG_LOG_ACCESS)
 		log = srv_conf->logaccess;
 	else
 		log = srv_conf->logerror;
@@ -306,7 +306,7 @@ logger_log(struct imsg *imsg)
 int
 logger_dispatch_parent(int fd, struct privsep_proc *p, struct imsg *imsg)
 {
-	switch (imsg->hdr.type) {
+	switch (imsg_get_type(imsg)) {
 	case IMSG_CFG_SERVER:
 		config_getserver(httpd_env, imsg);
 		break;
@@ -332,7 +332,7 @@ logger_dispatch_parent(int fd, struct privsep_proc *p, struct imsg *imsg)
 int
 logger_dispatch_server(int fd, struct privsep_proc *p, struct imsg *imsg)
 {
-	switch (imsg->hdr.type) {
+	switch (imsg_get_type(imsg)) {
 	case IMSG_LOG_ACCESS:
 	case IMSG_LOG_ERROR:
 		logger_log(imsg);
diff --git a/server.c b/server.c
index f3cbb7c..b36de62 100644
--- a/server.c
+++ b/server.c
@@ -1370,7 +1370,7 @@ server_dispatch_parent(int fd, struct privsep_proc *p, struct imsg *imsg)
 	struct server			*srv;
 	struct server_tls_ticket	 key;
 
-	switch (imsg->hdr.type) {
+	switch (imsg_get_type(imsg)) {
 	case IMSG_CFG_MEDIA:
 		if (config_getmedia(httpd_env, imsg) != 0)
 			return (-1);
@@ -1431,7 +1431,7 @@ server_dispatch_parent(int fd, struct privsep_proc *p, struct imsg *imsg)
 int
 server_dispatch_logger(int fd, struct privsep_proc *p, struct imsg *imsg)
 {
-	switch (imsg->hdr.type) {
+	switch (imsg_get_type(imsg)) {
 	default:
 		return (-1);
 	}