X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=secnet.c;h=2ebcddc1ae94491bbf5ad90edb1f12e3a84049dd;hb=147b444d6faa9a621e33d653b7a72c29724203c3;hp=7fabb1b50f473292f64a681d38b7fa43d0c4a59d;hpb=6a06198cde5b96686304a9814dd7aa241adcb448;p=secnet.git diff --git a/secnet.c b/secnet.c index 7fabb1b..2ebcddc 100644 --- a/secnet.c +++ b/secnet.c @@ -1,3 +1,22 @@ +/* + * This file is part of secnet. + * See README for full list of copyright holders. + * + * secnet is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * secnet is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * version 3 along with secnet; if not, see + * https://www.gnu.org/licenses/gpl.html. + */ + #include "secnet.h" #include #include @@ -36,16 +55,19 @@ static pid_t secnet_pid; /* Structures dealing with poll() call */ struct poll_interest { - beforepoll_fn *before; + beforepoll_fn *before; /* 0 if deregistered and waiting to be deleted */ afterpoll_fn *after; void *state; - int32_t max_nfds; int32_t nfds; cstring_t desc; - struct poll_interest *next; + LIST_ENTRY(poll_interest) entry; }; -static struct poll_interest *reg=NULL; -static int32_t total_nfds=10; +static LIST_HEAD(, poll_interest) reg = LIST_HEAD_INITIALIZER(®); + +static bool_t interest_isregistered(const struct poll_interest *i) +{ + return !!i->before; +} static bool_t finished=False; @@ -105,6 +127,9 @@ static void parse_options(int argc, char **argv) exit(0); break; + case 'd': + message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG; + /* fall through */ case 'v': message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY| M_FATAL; @@ -114,10 +139,6 @@ static void parse_options(int argc, char **argv) message_level&=(~M_WARNING); break; - case 'd': - message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG; - break; - case 'f': message_level=M_FATAL; break; @@ -166,11 +187,9 @@ static void parse_options(int argc, char **argv) static void setup(dict_t *config) { list_t *l; - item_t *site; dict_t *system; struct passwd *pw; struct cloc loc; - int i; l=dict_lookup(config,"system"); @@ -205,6 +224,12 @@ static void setup(dict_t *config) "that secnet retain root privileges while running.", require_root_privileges_explanation); } +} + +static void start_sites(dict_t *config) { + int i; + list_t *l; + item_t *site; /* Go along site list, starting sites */ l=dict_lookup(config,sites_key); @@ -222,28 +247,32 @@ static void setup(dict_t *config) cfgfatal(site->loc,"system","non-site closure in site list"); } s=site->data.closure->interface; - s->control(s->st,True); + s->startup(s->st); } } } -void register_for_poll(void *st, beforepoll_fn *before, - afterpoll_fn *after, int32_t max_nfds, cstring_t desc) +struct poll_interest *register_for_poll(void *st, beforepoll_fn *before, + afterpoll_fn *after, cstring_t desc) { struct poll_interest *i; - i=safe_malloc(sizeof(*i),"register_for_poll"); + NEW(i); i->before=before; i->after=after; i->state=st; - i->max_nfds=max_nfds; i->nfds=0; i->desc=desc; - assert(total_nfds < INT_MAX - max_nfds); - total_nfds+=max_nfds; - i->next=reg; - reg=i; - return; + LIST_INSERT_HEAD(®, i, entry); + return i; +} + +void deregister_for_poll(struct poll_interest *i) +{ + /* We cannot simply throw this away because we're reentrantly + * inside the main loop, which needs to remember which range of + * fds corresponds to this now-obsolete interest */ + i->before=0; } static void system_phase_hook(void *sst, uint32_t newphase) @@ -294,14 +323,11 @@ uint64_t now_global; static void run(void) { - struct poll_interest *i; - int rv, nfds, remain, idx; + struct poll_interest *i, *itmp; + int rv, nfds, idx; int timeout; - struct pollfd *fds; - - fds=safe_malloc(sizeof(*fds)*total_nfds, "run"); - - Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid); + struct pollfd *fds=0; + int allocdfds=0, shortfall=0; do { if (gettimeofday(&tv_now_global, NULL)!=0) { @@ -310,33 +336,54 @@ static void run(void) now_global=((uint64_t)tv_now_global.tv_sec*(uint64_t)1000)+ ((uint64_t)tv_now_global.tv_usec/(uint64_t)1000); idx=0; - for (i=reg; i; i=i->next) { + LIST_FOREACH(i, ®, entry) { int check; - for (check=0; checknfds; check++) { - if(fds[idx+check].revents & POLLNVAL) { - fatal("run: poll (%s#%d) set POLLNVAL", i->desc, check); + if (interest_isregistered(i)) { + for (check=0; checknfds; check++) { + if(fds[idx+check].revents & POLLNVAL) { + fatal("run: poll (%s#%d) set POLLNVAL", i->desc, check); + } } + i->after(i->state, fds+idx, i->nfds); } - i->after(i->state, fds+idx, i->nfds); idx+=i->nfds; } - remain=total_nfds; + if (shortfall) { + allocdfds *= 2; + allocdfds += shortfall; + REALLOC_ARY(fds,allocdfds); + } + shortfall=0; idx=0; timeout=-1; - for (i=reg; i; i=i->next) { + LIST_FOREACH_SAFE(i, ®, entry, itmp) { + int remain=allocdfds-idx; nfds=remain; - rv=i->before(i->state, fds+idx, &nfds, &timeout); - if (rv!=0) { - /* XXX we need to handle this properly: increase the - nfds available */ - fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv); + if (interest_isregistered(i)) { + rv=i->before(i->state, fds+idx, &nfds, &timeout); + if (rv!=0) { + if (rv!=ERANGE) + fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv); + assert(nfds < INT_MAX/4 - shortfall); + shortfall += nfds-remain; + nfds=0; + timeout=0; + } + } else { + nfds=0; } if (timeout<-1) { fatal("run: beforepoll_fn (%s) set timeout to %d", i->desc,timeout); } + if (!interest_isregistered(i)) { + /* check this here, rather than earlier, so that we + handle the case where i->before() calls deregister */ + LIST_REMOVE(i, entry); + free(i); + continue; + } idx+=nfds; - remain-=nfds; i->nfds=nfds; } do { @@ -356,6 +403,12 @@ static void run(void) free(fds); } +bool_t will_droppriv(void) +{ + assert(current_phase >= PHASE_SETUP); + return !!uid; +} + /* Surrender privileges, if necessary */ static void droppriv(void) { @@ -442,6 +495,9 @@ int main(int argc, char **argv) { dict_t *config; + log_early_init(); + phase_hooks_init(); + enter_phase(PHASE_GETOPTS); parse_options(argc,argv); @@ -450,6 +506,7 @@ int main(int argc, char **argv) enter_phase(PHASE_SETUP); setup(config); + start_sites(config); if (just_check_config) { Message(M_INFO,"configuration file check complete\n"); @@ -458,6 +515,7 @@ int main(int argc, char **argv) enter_phase(PHASE_DAEMONIZE); become_daemon(); + Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid); enter_phase(PHASE_GETRESOURCES); /* Appropriate phase hooks will have been run */