chiark
/
gitweb
/
~ian
/
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 b81f9104dbe1470eb5ceb59a8b162ff1c6fcda6a..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;
@@
-955,8
+954,8
@@
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 */
}
return 0; /* success */
}
@@
-1239,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;