X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/4a8aed08c72d7ea444e430c4023960ab28e559cd..16f73fa6cc7426276bc4bd0cc8537d08c64cbc83:/site.c diff --git a/site.c b/site.c index f3312db..8a2d69a 100644 --- a/site.c +++ b/site.c @@ -932,8 +932,7 @@ static void enter_state_wait(struct site *st) /* XXX Erase keys etc. */ } -static inline void site_settimeout(uint64_t timeout, uint64_t *now, - int *timeout_io) +static inline void site_settimeout(uint64_t timeout, int *timeout_io) { if (timeout) { int64_t offset=timeout-*now; @@ -945,8 +944,7 @@ static inline void site_settimeout(uint64_t timeout, uint64_t *now, } static int site_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, - int *timeout_io, const struct timeval *tv_now, - uint64_t *now) + int *timeout_io) { struct site *st=sst; @@ -956,15 +954,14 @@ static int site_beforepoll(void *sst, struct pollfd *fds, int *nfds_io, /* Work out when our next timeout is. The earlier of 'timeout' or 'current_key_timeout'. A stored value of '0' indicates no timeout active. */ - site_settimeout(st->timeout, now, timeout_io); - site_settimeout(st->current_key_timeout, now, timeout_io); + site_settimeout(st->timeout, timeout_io); + site_settimeout(st->current_key_timeout, timeout_io); return 0; /* success */ } /* NB site_afterpoll will be called before site_beforepoll is ever called */ -static void site_afterpoll(void *sst, struct pollfd *fds, int nfds, - const struct timeval *tv_now, uint64_t *now) +static void site_afterpoll(void *sst, struct pollfd *fds, int nfds) { struct site *st=sst;