chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site setup: Correct logic for DEFAULT_KEY_RENEGOTIATE_GAP
[secnet.git]
/
site.c
diff --git
a/site.c
b/site.c
index f3312db4e8e05f5c3b9e98e99dcf08f5c4b24099..835ccc80065a1e5709f3d7c5b890d859b8975468 100644
(file)
--- a/
site.c
+++ b/
site.c
@@
-932,8
+932,7
@@
static void enter_state_wait(struct site *st)
/* XXX Erase keys etc. */
}
/* 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;
{
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,
}
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;
{
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. */
/* 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 */
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;
{
struct site *st=sst;
@@
-1241,7
+1238,7
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
st->key_lifetime=dict_read_number(
dict,"key-lifetime",False,"site",loc,DEFAULT_KEY_LIFETIME);
st->key_lifetime=dict_read_number(
dict,"key-lifetime",False,"site",loc,DEFAULT_KEY_LIFETIME);
- if (st->key_lifetime < DEFAULT_KEY_RENEGOTIATE_GAP)
+ if (st->key_lifetime < DEFAULT_KEY_RENEGOTIATE_GAP
*2
)
st->key_renegotiate_time=st->key_lifetime/2;
else
st->key_renegotiate_time=st->key_lifetime-DEFAULT_KEY_RENEGOTIATE_GAP;
st->key_renegotiate_time=st->key_lifetime/2;
else
st->key_renegotiate_time=st->key_lifetime-DEFAULT_KEY_RENEGOTIATE_GAP;