From bc13ed0bfab98e8ff4f210dc7c7f9d5667670fe4 Mon Sep 17 00:00:00 2001 From: pjd Date: Fri, 28 Jan 2011 21:48:15 +0000 Subject: Add function to close all unneeded descriptors after fork(2). MFC after: 1 week --- sbin/hastd/hastd.c | 28 +++++++++++++++++++++++++++- sbin/hastd/hastd.h | 2 ++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c index c2064e7..ad91131 100644 --- a/sbin/hastd/hastd.c +++ b/sbin/hastd/hastd.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2009-2010 The FreeBSD Foundation - * Copyright (c) 2010 Pawel Jakub Dawidek + * Copyright (c) 2010-2011 Pawel Jakub Dawidek * All rights reserved. * * This software was developed by Pawel Jakub Dawidek under sponsorship from @@ -93,6 +93,32 @@ g_gate_load(void) } } +void +descriptors_cleanup(struct hast_resource *res) +{ + struct hast_resource *tres; + + TAILQ_FOREACH(tres, &cfg->hc_resources, hr_next) { + if (tres == res) { + PJDLOG_VERIFY(res->hr_role == HAST_ROLE_SECONDARY || + (res->hr_remotein == NULL && + res->hr_remoteout == NULL)); + continue; + } + if (tres->hr_remotein != NULL) + proto_close(tres->hr_remotein); + if (tres->hr_remoteout != NULL) + proto_close(tres->hr_remoteout); + } + if (cfg->hc_controlin != NULL) + proto_close(cfg->hc_controlin); + proto_close(cfg->hc_controlconn); + proto_close(cfg->hc_listenconn); + (void)pidfile_close(pfh); + hook_fini(); + pjdlog_fini(); +} + static void child_exit_log(unsigned int pid, int status) { diff --git a/sbin/hastd/hastd.h b/sbin/hastd/hastd.h index 1157f92..b0a4037 100644 --- a/sbin/hastd/hastd.h +++ b/sbin/hastd/hastd.h @@ -43,6 +43,8 @@ extern const char *cfgpath; extern bool sigexit_received; extern struct pidfh *pfh; +void descriptors_cleanup(struct hast_resource *res); + void hastd_primary(struct hast_resource *res); void hastd_secondary(struct hast_resource *res, struct nv *nvin); -- cgit v1.1