aboutsummaryrefslogtreecommitdiff
path: root/httpd/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'httpd/config.c')
-rw-r--r--httpd/config.c87
1 files changed, 39 insertions, 48 deletions
diff --git a/httpd/config.c b/httpd/config.c
index 8536028..4f8ef4c 100644
--- a/httpd/config.c
+++ b/httpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.43 2015/08/20 13:00:23 reyk Exp $ */
+/* $OpenBSD: config.c,v 1.47 2016/08/15 14:14:55 jsing Exp $ */
/*
* Copyright (c) 2011 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -113,7 +113,7 @@ config_setreset(struct httpd *env, unsigned int reset)
if ((reset & ps->ps_what[id]) == 0 ||
id == privsep_process)
continue;
- proc_compose_imsg(ps, id, -1, IMSG_CTL_RESET, -1,
+ proc_compose(ps, id, IMSG_CTL_RESET,
&reset, sizeof(reset));
}
@@ -151,8 +151,8 @@ config_getcfg(struct httpd *env, struct imsg *imsg)
what = ps->ps_what[privsep_process];
if (privsep_process != PROC_PARENT)
- proc_compose_imsg(env->sc_ps, PROC_PARENT, -1,
- IMSG_CFG_DONE, -1, NULL, 0);
+ proc_compose(env->sc_ps, PROC_PARENT,
+ IMSG_CFG_DONE, NULL, 0);
return (0);
}
@@ -205,7 +205,7 @@ config_setserver(struct httpd *env, struct server *srv)
else if ((fd = dup(srv->srv_s)) == -1)
return (-1);
if (proc_composev_imsg(ps, id, n,
- IMSG_CFG_SERVER, fd, iov, c) != 0) {
+ IMSG_CFG_SERVER, -1, fd, iov, c) != 0) {
log_warn("%s: failed to compose "
"IMSG_CFG_SERVER imsg for `%s'",
__func__, srv->srv_conf.name);
@@ -216,7 +216,7 @@ config_setserver(struct httpd *env, struct server *srv)
/* Configure TLS if necessary. */
config_settls(env, srv);
} else {
- if (proc_composev_imsg(ps, id, -1, IMSG_CFG_SERVER, -1,
+ if (proc_composev(ps, id, IMSG_CFG_SERVER,
iov, c) != 0) {
log_warn("%s: failed to compose "
"IMSG_CFG_SERVER imsg for `%s'",
@@ -233,61 +233,56 @@ int
config_settls(struct httpd *env, struct server *srv)
{
struct privsep *ps = env->sc_ps;
+ struct server_config *srv_conf = &srv->srv_conf;
struct tls_config tls;
struct iovec iov[2];
size_t c;
- if ((srv->srv_conf.flags & SRVFLAG_TLS) == 0)
+ if ((srv_conf->flags & SRVFLAG_TLS) == 0)
return (0);
- log_debug("%s: configuring TLS for %s", __func__, srv->srv_conf.name);
+ log_debug("%s: configuring tls for %s", __func__, srv_conf->name);
- if (srv->srv_conf.tls_cert_len != 0) {
- DPRINTF("%s: sending TLS cert \"%s[%u]\" to %s fd %d", __func__,
- srv->srv_conf.name, srv->srv_conf.id,
- ps->ps_title[PROC_SERVER], srv->srv_s);
+ if (srv_conf->tls_cert_len != 0) {
+ DPRINTF("%s: sending tls cert \"%s[%u]\" to %s fd %d", __func__,
+ srv_conf->name, srv_conf->id, ps->ps_title[PROC_SERVER],
+ srv->srv_s);
memset(&tls, 0, sizeof(tls));
- tls.id = srv->srv_conf.id;
- tls.port = srv->srv_conf.port;
- memcpy(&tls.ss, &srv->srv_conf.ss, sizeof(tls.ss));
- tls.tls_cert_len = srv->srv_conf.tls_cert_len;
+ tls.id = srv_conf->id;
+ tls.tls_cert_len = srv_conf->tls_cert_len;
c = 0;
iov[c].iov_base = &tls;
iov[c++].iov_len = sizeof(tls);
- iov[c].iov_base = srv->srv_conf.tls_cert;
- iov[c++].iov_len = srv->srv_conf.tls_cert_len;
+ iov[c].iov_base = srv_conf->tls_cert;
+ iov[c++].iov_len = srv_conf->tls_cert_len;
- if (proc_composev_imsg(ps, PROC_SERVER, -1, IMSG_CFG_TLS, -1,
- iov, c) != 0) {
+ if (proc_composev(ps, PROC_SERVER, IMSG_CFG_TLS, iov, c) != 0) {
log_warn("%s: failed to compose IMSG_CFG_TLS imsg for "
- "`%s'", __func__, srv->srv_conf.name);
+ "`%s'", __func__, srv_conf->name);
return (-1);
}
}
- if (srv->srv_conf.tls_key_len != 0) {
- DPRINTF("%s: sending TLS key \"%s[%u]\" to %s fd %d", __func__,
- srv->srv_conf.name, srv->srv_conf.id,
- ps->ps_title[PROC_SERVER], srv->srv_s);
+ if (srv_conf->tls_key_len != 0) {
+ DPRINTF("%s: sending tls key \"%s[%u]\" to %s fd %d", __func__,
+ srv_conf->name, srv_conf->id, ps->ps_title[PROC_SERVER],
+ srv->srv_s);
memset(&tls, 0, sizeof(tls));
- tls.id = srv->srv_conf.id;
- tls.port = srv->srv_conf.port;
- memcpy(&tls.ss, &srv->srv_conf.ss, sizeof(tls.ss));
- tls.tls_key_len = srv->srv_conf.tls_key_len;
+ tls.id = srv_conf->id;
+ tls.tls_key_len = srv_conf->tls_key_len;
c = 0;
iov[c].iov_base = &tls;
iov[c++].iov_len = sizeof(tls);
- iov[c].iov_base = srv->srv_conf.tls_key;
- iov[c++].iov_len = srv->srv_conf.tls_key_len;
+ iov[c].iov_base = srv_conf->tls_key;
+ iov[c++].iov_len = srv_conf->tls_key_len;
- if (proc_composev_imsg(ps, PROC_SERVER, -1, IMSG_CFG_TLS, -1,
- iov, c) != 0) {
+ if (proc_composev(ps, PROC_SERVER, IMSG_CFG_TLS, iov, c) != 0) {
log_warn("%s: failed to compose IMSG_CFG_TLS imsg for "
- "`%s'", __func__, srv->srv_conf.name);
+ "`%s'", __func__, srv_conf->name);
return (-1);
}
}
@@ -565,7 +560,7 @@ config_gettls(struct httpd *env, struct imsg *imsg)
#ifdef DEBUG
struct privsep *ps = env->sc_ps;
#endif
- struct server *srv = NULL;
+ struct server_config *srv_conf = NULL;
struct tls_config tls_conf;
uint8_t *p = imsg->data;
size_t s;
@@ -580,27 +575,25 @@ config_gettls(struct httpd *env, struct imsg *imsg)
goto fail;
}
- /* Find server with matching listening socket. */
- if ((srv = server_byaddr((struct sockaddr *)
- &tls_conf.ss, tls_conf.port)) == NULL) {
+ if ((srv_conf = serverconfig_byid(tls_conf.id)) == NULL) {
log_debug("%s: server not found", __func__);
goto fail;
}
- DPRINTF("%s: %s %d TLS configuration \"%s[%u]\"", __func__,
+ DPRINTF("%s: %s %d tls configuration \"%s[%u]\"", __func__,
ps->ps_title[privsep_process], ps->ps_instance,
- srv->srv_conf.name, srv->srv_conf.id);
+ srv_conf->name, srv_conf->id);
if (tls_conf.tls_cert_len != 0) {
- srv->srv_conf.tls_cert_len = tls_conf.tls_cert_len;
- if ((srv->srv_conf.tls_cert = get_data(p + s,
+ srv_conf->tls_cert_len = tls_conf.tls_cert_len;
+ if ((srv_conf->tls_cert = get_data(p + s,
tls_conf.tls_cert_len)) == NULL)
goto fail;
s += tls_conf.tls_cert_len;
}
if (tls_conf.tls_key_len != 0) {
- srv->srv_conf.tls_key_len = tls_conf.tls_key_len;
- if ((srv->srv_conf.tls_key = get_data(p + s,
+ srv_conf->tls_key_len = tls_conf.tls_key_len;
+ if ((srv_conf->tls_key = get_data(p + s,
tls_conf.tls_key_len)) == NULL)
goto fail;
s += tls_conf.tls_key_len;
@@ -628,8 +621,7 @@ config_setmedia(struct httpd *env, struct media_type *media)
DPRINTF("%s: sending media \"%s\" to %s", __func__,
media->media_name, ps->ps_title[id]);
- proc_compose_imsg(ps, id, -1, IMSG_CFG_MEDIA, -1,
- media, sizeof(*media));
+ proc_compose(ps, id, IMSG_CFG_MEDIA, media, sizeof(*media));
}
return (0);
@@ -676,8 +668,7 @@ config_setauth(struct httpd *env, struct auth *auth)
DPRINTF("%s: sending auth \"%s[%u]\" to %s", __func__,
auth->auth_htpasswd, auth->auth_id, ps->ps_title[id]);
- proc_compose_imsg(ps, id, -1, IMSG_CFG_AUTH, -1,
- auth, sizeof(*auth));
+ proc_compose(ps, id, IMSG_CFG_AUTH, auth, sizeof(*auth));
}
return (0);
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion