X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=site.c;h=29efb25f9bd36e6cd79b376d651f0cdbea836027;hp=8ef8f5a6e44cea77d7aeef4c0360d7888b5742bb;hb=090dbeef60c7e578950c3dbe807a9e2ea7e24875;hpb=59230b9b9fc44453f24c6b3cf33a0f4c570a3563 diff --git a/site.c b/site.c index 8ef8f5a..29efb25 100644 --- a/site.c +++ b/site.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -145,19 +146,20 @@ struct site { struct dh_if *dh; struct hash_if *hash; - uint32_t setup_retries; /* How many times to send setup packets */ - uint32_t setup_timeout; /* Initial timeout for setup packets */ - uint32_t wait_timeout; /* How long to wait if setup unsuccessful */ - uint32_t key_lifetime; /* How long a key lasts once set up */ - uint32_t key_renegotiate_time; /* If we see traffic (or a keepalive) + uint32_t index; /* Index of this site */ + int32_t setup_retries; /* How many times to send setup packets */ + int32_t setup_timeout; /* Initial timeout for setup packets */ + int32_t wait_timeout; /* How long to wait if setup unsuccessful */ + int32_t key_lifetime; /* How long a key lasts once set up */ + int32_t key_renegotiate_time; /* If we see traffic (or a keepalive) after this time, initiate a new key exchange */ bool_t keepalive; /* Send keepalives to detect peer failure (not yet implemented) */ uint8_t *setupsig; /* Expected signature of incoming MSG1 packets */ - uint32_t setupsiglen; /* Allows us to discard packets quickly if - they are not for us */ + int32_t setupsiglen; /* Allows us to discard packets quickly if + they are not for us */ bool_t setup_priority; /* Do we have precedence if both sites emit message 1 simultaneously? */ uint32_t log_events; @@ -187,7 +189,7 @@ struct site { uint8_t localN[NONCELEN]; /* Nonces for key exchange */ uint8_t remoteN[NONCELEN]; struct buffer_if buffer; /* Current outgoing key exchange packet */ - uint32_t retries; /* Number of retries remaining */ + int32_t retries; /* Number of retries remaining */ uint64_t timeout; /* Timeout for current state */ uint8_t *dhsecret; uint8_t *sharedsecret; @@ -217,7 +219,7 @@ static void slog(struct site *st, uint32_t event, cstring_t msg, ...) default: class=M_ERR; break; } - vsnprintf(buf,240,msg,ap); + vsnprintf(buf,sizeof(buf),msg,ap); st->log->log(st->log->st,class,"%s: %s",st->tunname,buf); } va_end(ap); @@ -242,17 +244,17 @@ struct msg { uint8_t *hashstart; uint32_t dest; uint32_t source; - uint32_t remlen; + int32_t remlen; uint8_t *remote; - uint32_t loclen; + int32_t loclen; uint8_t *local; uint8_t *nR; uint8_t *nL; - uint32_t pklen; - uint8_t *pk; - uint32_t hashlen; - uint32_t siglen; - uint8_t *sig; + int32_t pklen; + char *pk; + int32_t hashlen; + int32_t siglen; + char *sig; }; /* Build any of msg1 to msg4. msg5 and msg6 are built from the inside @@ -268,7 +270,7 @@ static bool_t generate_msg(struct site *st, uint32_t type, cstring_t what) buffer_init(&st->buffer,0); buf_append_uint32(&st->buffer, (type==LABEL_MSG1?0:st->setup_session_id)); - buf_append_uint32(&st->buffer,(uint32_t)st); + buf_append_uint32(&st->buffer,st->index); buf_append_uint32(&st->buffer,type); buf_append_string(&st->buffer,st->localname); buf_append_string(&st->buffer,st->remotename); @@ -542,7 +544,7 @@ static bool_t generate_msg5(struct site *st) st->new_transform->forwards(st->new_transform->st,&st->buffer, &transform_err); buf_prepend_uint32(&st->buffer,LABEL_MSG5); - buf_prepend_uint32(&st->buffer,(uint32_t)st); + buf_prepend_uint32(&st->buffer,st->index); buf_prepend_uint32(&st->buffer,st->setup_session_id); st->retries=st->setup_retries; @@ -591,7 +593,7 @@ static bool_t generate_msg6(struct site *st) st->new_transform->forwards(st->new_transform->st,&st->buffer, &transform_err); buf_prepend_uint32(&st->buffer,LABEL_MSG6); - buf_prepend_uint32(&st->buffer,(uint32_t)st); + buf_prepend_uint32(&st->buffer,st->index); buf_prepend_uint32(&st->buffer,st->setup_session_id); st->retries=1; /* Peer will retransmit MSG5 if this packet gets lost */ @@ -909,7 +911,7 @@ static bool_t send_msg7(struct site *st, cstring_t reason) st->current_transform->forwards(st->current_transform->st, &st->buffer, &transform_err); buf_prepend_uint32(&st->buffer,LABEL_MSG0); - buf_prepend_uint32(&st->buffer,(uint32_t)st); + buf_prepend_uint32(&st->buffer,st->index); buf_prepend_uint32(&st->buffer,st->remote_session_id); st->comm->sendmsg(st->comm->st,&st->buffer,&st->peer); BUF_FREE(&st->buffer); @@ -932,11 +934,11 @@ 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) { - uint64_t offset=timeout-*now; + int64_t offset=timeout-*now; + if (offset<0) offset=0; if (offset>INT_MAX) offset=INT_MAX; if (*timeout_io<0 || offset<*timeout_io) *timeout_io=offset; @@ -944,8 +946,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; @@ -955,15 +956,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; @@ -1007,7 +1007,7 @@ static void site_outgoing(void *sst, struct buffer_if *buf) st->current_transform->forwards(st->current_transform->st, buf, &transform_err); buf_prepend_uint32(buf,LABEL_MSG0); - buf_prepend_uint32(buf,(uint32_t)st); + buf_prepend_uint32(buf,st->index); buf_prepend_uint32(buf,st->remote_session_id); st->comm->sendmsg(st->comm->st,buf,&st->peer); } @@ -1080,7 +1080,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, } return False; /* Not for us. */ } - if (dest==(uint32_t)st) { + if (dest==st->index) { /* Explicitly addressed to us */ uint32_t msgtype=ntohl(get_uint32(buf->start+8)); if (msgtype!=LABEL_MSG0) dump_packet(st,buf,source,True); @@ -1188,6 +1188,7 @@ static void site_phase_hook(void *sst, uint32_t newphase) static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, list_t *args) { + static uint32_t index_sequence; struct site *st; item_t *item; dict_t *dict; @@ -1219,6 +1220,8 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, free(st); return NULL; } + assert(index_sequence < 0xffffffffUL); + st->index = ++index_sequence; st->netlink=find_cl_if(dict,"link",CL_NETLINK,True,"site",loc); st->comm=find_cl_if(dict,"comm",CL_COMM,True,"site",loc); st->resolver=find_cl_if(dict,"resolver",CL_RESOLVER,True,"site",loc); @@ -1240,18 +1243,19 @@ 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); - if (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; st->setup_retries=dict_read_number( dict,"setup-retries",False,"site",loc,DEFAULT_SETUP_RETRIES); st->setup_timeout=dict_read_number( dict,"setup-timeout",False,"site",loc,DEFAULT_SETUP_TIMEOUT); st->wait_timeout=dict_read_number( dict,"wait-time",False,"site",loc,DEFAULT_WAIT_TIME); + + 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=dict_read_number( - dict,"renegotiate-time",False,"site",loc,st->key_lifetime); + dict,"renegotiate-time",False,"site",loc,st->key_renegotiate_time); if (st->key_renegotiate_time > st->key_lifetime) { cfgfatal(loc,"site", "renegotiate-time must be less than key-lifetime\n");