X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=site.c;h=8223fb3f81d678e228cd606aeb5d65aa7c92a609;hp=1a664ce30c0d6e52d5f3259e2579e746fb11bcd7;hb=8dea8d37a13fcc615daba3375809900f04a2e5a2;hpb=4efd681a66c15bc6f81eefc69396669e165e5e0f diff --git a/site.c b/site.c index 1a664ce..8223fb3 100644 --- a/site.c +++ b/site.c @@ -1,17 +1,22 @@ /* site.c - manage communication with a remote network site */ +#include "secnet.h" #include -#include +/* MBM asserts the next one is needed for compilation under BSD. */ +#include -#include "secnet.h" +#include #include "util.h" +#include "ipaddr.h" +#include "unaligned.h" #define SETUP_BUFFER_LEN 2048 -#define DEFAULT_KEY_LIFETIME 15000 +#define DEFAULT_KEY_LIFETIME 3600000 /* One hour */ +#define DEFAULT_KEY_RENEGOTIATE_GAP 300000 /* Five minutes */ #define DEFAULT_SETUP_RETRIES 5 -#define DEFAULT_SETUP_TIMEOUT 500 -#define DEFAULT_WAIT_TIME 10000 +#define DEFAULT_SETUP_TIMEOUT 1000 +#define DEFAULT_WAIT_TIME 20000 /* Each site can be in one of several possible states. */ @@ -63,15 +68,15 @@ static string_t state_name(uint32_t state) { switch (state) { - case 0: return "SITE_STOP"; - case 1: return "SITE_RUN"; - case 2: return "SITE_RESOLVE"; - case 3: return "SITE_SENTMSG1"; - case 4: return "SITE_SENTMSG2"; - case 5: return "SITE_SENTMSG3"; - case 6: return "SITE_SENTMSG4"; - case 7: return "SITE_SENTMSG5"; - case 8: return "SITE_WAIT"; + case 0: return "STOP"; + case 1: return "RUN"; + case 2: return "RESOLVE"; + case 3: return "SENTMSG1"; + case 4: return "SENTMSG2"; + case 5: return "SENTMSG3"; + case 6: return "SENTMSG4"; + case 7: return "SENTMSG5"; + case 8: return "WAIT"; default: return "*bad state*"; } } @@ -94,12 +99,33 @@ static string_t state_name(uint32_t state) #define LOG_SETUP_TIMEOUT 0x00000004 #define LOG_ACTIVATE_KEY 0x00000008 #define LOG_TIMEOUT_KEY 0x00000010 -#define LOG_SECURITY 0x00000020 +#define LOG_SEC 0x00000020 #define LOG_STATE 0x00000040 #define LOG_DROP 0x00000080 #define LOG_DUMP 0x00000100 #define LOG_ERROR 0x00000400 +static struct flagstr log_event_table[]={ + { "unexpected", LOG_UNEXPECTED }, + { "setup-init", LOG_SETUP_INIT }, + { "setup-timeout", LOG_SETUP_TIMEOUT }, + { "activate-key", LOG_ACTIVATE_KEY }, + { "timeout-key", LOG_TIMEOUT_KEY }, + { "security", LOG_SEC }, + { "state-change", LOG_STATE }, + { "packet-drop", LOG_DROP }, + { "dump-packets", LOG_DUMP }, + { "errors", LOG_ERROR }, + { "all", 0xffffffff }, + { NULL, 0 } +}; + +static struct flagstr netlink_option_table[]={ + { "soft", NETLINK_OPTION_SOFTROUTE }, + { "allow-route", NETLINK_OPTION_ALLOW_ROUTE }, + { NULL, 0} +}; + struct site { closure_t cl; struct site_if ops; @@ -120,12 +146,16 @@ struct site { struct transform_if *transform; struct dh_if *dh; struct hash_if *hash; - void *netlink_cid; 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) + after this time, initiate a new + key exchange */ + + bool_t keepalive; /* Always keep the tunnel up */ uint8_t *setupsig; /* Expected signature of incoming MSG1 packets */ uint32_t setupsiglen; /* Allows us to discard packets quickly if @@ -138,6 +168,8 @@ struct site { uint32_t state; uint64_t now; /* Most recently seen time */ + void *netlink_cid; + uint32_t remote_session_id; struct transform_inst_if *current_transform; bool_t current_valid; @@ -163,16 +195,33 @@ static void slog(struct site *st, uint32_t event, string_t msg, ...) { va_list ap; uint8_t buf[240]; + uint32_t class; va_start(ap,msg); if (event&st->log_events) { + switch(event) { + case LOG_UNEXPECTED: class=M_INFO; break; + case LOG_SETUP_INIT: class=M_INFO; break; + case LOG_SETUP_TIMEOUT: class=M_NOTICE; break; + case LOG_ACTIVATE_KEY: class=M_INFO; break; + case LOG_TIMEOUT_KEY: class=M_INFO; break; + case LOG_SEC: class=M_SECURITY; break; + case LOG_STATE: class=M_DEBUG; break; + case LOG_DROP: class=M_DEBUG; break; + case LOG_DUMP: class=M_DEBUG; break; + case LOG_ERROR: class=M_ERROR; break; + default: class=M_ERROR; break; + } + vsnprintf(buf,240,msg,ap); - st->log->log(st->log->st,0,"%s: %s",st->tunname,buf); + st->log->log(st->log->st,class,"%s: %s",st->tunname,buf); } va_end(ap); } +static void set_link_quality(struct site *st); +static bool_t initiate_key_setup(struct site *st); static void enter_state_run(struct site *st); static bool_t enter_state_resolve(struct site *st); static bool_t enter_state_sentmsg1(struct site *st); @@ -186,7 +235,7 @@ static void enter_state_wait(struct site *st); #define CHECK_EMPTY(b) do { if ((b)->size!=0) return False; } while(0) #define CHECK_TYPE(b,t) do { uint32_t type; \ CHECK_AVAIL((b),4); \ - type=*(uint32_t *)buf_unprepend((b),4); \ + type=buf_unprepend_uint32((b)); \ if (type!=(t)) return False; } while(0) struct msg { @@ -217,10 +266,10 @@ static bool_t generate_msg(struct site *st, uint32_t type, string_t what) st->retries=st->setup_retries; BUF_ALLOC(&st->buffer,what); buffer_init(&st->buffer,0); - *(uint32_t *)buf_append(&st->buffer,4)= - (type==LABEL_MSG1?0:st->setup_session_id); - *(uint32_t *)buf_append(&st->buffer,4)=(uint32_t)st; - *(uint32_t *)buf_append(&st->buffer,4)=type; + 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,type); buf_append_string(&st->buffer,st->localname); buf_append_string(&st->buffer,st->remotename); memcpy(buf_append(&st->buffer,NONCELEN),st->localN,NONCELEN); @@ -244,16 +293,16 @@ static bool_t unpick_msg(struct site *st, uint32_t type, { m->hashstart=msg->start; CHECK_AVAIL(msg,4); - m->dest=*(uint32_t *)buf_unprepend(msg,4); + m->dest=buf_unprepend_uint32(msg); CHECK_AVAIL(msg,4); - m->source=*(uint32_t *)buf_unprepend(msg,4); + m->source=buf_unprepend_uint32(msg); CHECK_TYPE(msg,type); CHECK_AVAIL(msg,2); - m->remlen=ntohs(*(uint16_t *)buf_unprepend(msg,2)); + m->remlen=buf_unprepend_uint16(msg); CHECK_AVAIL(msg,m->remlen); m->remote=buf_unprepend(msg,m->remlen); CHECK_AVAIL(msg,2); - m->loclen=ntohs(*(uint16_t *)buf_unprepend(msg,2)); + m->loclen=buf_unprepend_uint16(msg); CHECK_AVAIL(msg,m->loclen); m->local=buf_unprepend(msg,m->loclen); CHECK_AVAIL(msg,NONCELEN); @@ -269,12 +318,12 @@ static bool_t unpick_msg(struct site *st, uint32_t type, return True; } CHECK_AVAIL(msg,2); - m->pklen=ntohs(*(uint16_t *)buf_unprepend(msg,2)); + m->pklen=buf_unprepend_uint16(msg); CHECK_AVAIL(msg,m->pklen); m->pk=buf_unprepend(msg,m->pklen); m->hashlen=msg->start-m->hashstart; CHECK_AVAIL(msg,2); - m->siglen=ntohs(*(uint16_t *)buf_unprepend(msg,2)); + m->siglen=buf_unprepend_uint16(msg); CHECK_AVAIL(msg,m->siglen); m->sig=buf_unprepend(msg,m->siglen); CHECK_EMPTY(msg); @@ -322,15 +371,15 @@ static bool_t process_msg2(struct site *st, struct buffer_if *msg2, /* Check that the site names and our nonce have been sent back correctly, and then store our peer's nonce. */ if (memcmp(m.remote,st->remotename,strlen(st->remotename)!=0)) { - slog(st,LOG_SECURITY,"msg2: bad B (remote site name)"); + slog(st,LOG_SEC,"msg2: bad B (remote site name)"); return False; } if (memcmp(m.local,st->localname,strlen(st->localname)!=0)) { - slog(st,LOG_SECURITY,"msg2: bad A (local site name)"); + slog(st,LOG_SEC,"msg2: bad A (local site name)"); return False; } if (memcmp(m.nL,st->localN,NONCELEN)!=0) { - slog(st,LOG_SECURITY,"msg2: bad nA (locally generated nonce)"); + slog(st,LOG_SEC,"msg2: bad nA (locally generated nonce)"); return False; } st->setup_session_id=m.source; @@ -358,19 +407,19 @@ static bool_t process_msg3(struct site *st, struct buffer_if *msg3, /* Check that the site names and nonces have been sent back correctly */ if (memcmp(m.remote,st->remotename,strlen(st->remotename)!=0)) { - slog(st,LOG_SECURITY,"msg3: bad A (remote site name)"); + slog(st,LOG_SEC,"msg3: bad A (remote site name)"); return False; } if (memcmp(m.local,st->localname,strlen(st->localname)!=0)) { - slog(st,LOG_SECURITY,"msg3: bad B (local site name)"); + slog(st,LOG_SEC,"msg3: bad B (local site name)"); return False; } if (memcmp(m.nR,st->remoteN,NONCELEN)!=0) { - slog(st,LOG_SECURITY,"msg3: bad nA (remotely generated nonce)"); + slog(st,LOG_SEC,"msg3: bad nA (remotely generated nonce)"); return False; } if (memcmp(m.nL,st->localN,NONCELEN)!=0) { - slog(st,LOG_SECURITY,"msg3: bad nB (locally generated nonce)"); + slog(st,LOG_SEC,"msg3: bad nB (locally generated nonce)"); return False; } @@ -381,7 +430,7 @@ static bool_t process_msg3(struct site *st, struct buffer_if *msg3, /* Terminate signature with a '0' - cheating, but should be ok */ m.sig[m.siglen]=0; if (!st->pubkey->check(st->pubkey->st,hash,st->hash->len,m.sig)) { - slog(st,LOG_SECURITY,"msg3 signature failed check!"); + slog(st,LOG_SEC,"msg3 signature failed check!"); return False; } @@ -420,19 +469,19 @@ static bool_t process_msg4(struct site *st, struct buffer_if *msg4, /* Check that the site names and nonces have been sent back correctly */ if (memcmp(m.remote,st->remotename,strlen(st->remotename)!=0)) { - slog(st,LOG_SECURITY,"msg4: bad B (remote site name)"); + slog(st,LOG_SEC,"msg4: bad B (remote site name)"); return False; } if (memcmp(m.local,st->localname,strlen(st->localname)!=0)) { - slog(st,LOG_SECURITY,"msg4: bad A (local site name)"); + slog(st,LOG_SEC,"msg4: bad A (local site name)"); return False; } if (memcmp(m.nR,st->remoteN,NONCELEN)!=0) { - slog(st,LOG_SECURITY,"msg4: bad nB (remotely generated nonce)"); + slog(st,LOG_SEC,"msg4: bad nB (remotely generated nonce)"); return False; } if (memcmp(m.nL,st->localN,NONCELEN)!=0) { - slog(st,LOG_SECURITY,"msg4: bad nA (locally generated nonce)"); + slog(st,LOG_SEC,"msg4: bad nA (locally generated nonce)"); return False; } @@ -443,7 +492,7 @@ static bool_t process_msg4(struct site *st, struct buffer_if *msg4, /* Terminate signature with a '0' - cheating, but should be ok */ m.sig[m.siglen]=0; if (!st->pubkey->check(st->pubkey->st,hash,st->hash->len,m.sig)) { - slog(st,LOG_SECURITY,"msg4 signature failed check!"); + slog(st,LOG_SEC,"msg4 signature failed check!"); return False; } @@ -466,12 +515,12 @@ static bool_t generate_msg5(struct site *st) BUF_ALLOC(&st->buffer,"site:MSG5"); /* We are going to add three words to the transformed message */ buffer_init(&st->buffer,st->transform->max_start_pad+(4*3)); - *(uint32_t *)buf_append(&st->buffer,4)=LABEL_MSG5; + buf_append_uint32(&st->buffer,LABEL_MSG5); st->new_transform->forwards(st->new_transform->st,&st->buffer, &transform_err); - *(uint32_t *)buf_prepend(&st->buffer,4)=LABEL_MSG5; - *(uint32_t *)buf_prepend(&st->buffer,4)=(uint32_t)st; - *(uint32_t *)buf_prepend(&st->buffer,4)=st->setup_session_id; + buf_prepend_uint32(&st->buffer,LABEL_MSG5); + buf_prepend_uint32(&st->buffer,(uint32_t)st); + buf_prepend_uint32(&st->buffer,st->setup_session_id); st->retries=st->setup_retries; return True; @@ -487,11 +536,11 @@ static bool_t unpick_msg0(struct site *st, struct buffer_if *msg0, struct msg0 *m) { CHECK_AVAIL(msg0,4); - m->dest=*(uint32_t *)buf_unprepend(msg0,4); + m->dest=buf_unprepend_uint32(msg0); CHECK_AVAIL(msg0,4); - m->source=*(uint32_t *)buf_unprepend(msg0,4); + m->source=buf_unprepend_uint32(msg0); CHECK_AVAIL(msg0,4); - m->type=*(uint32_t *)buf_unprepend(msg0,4); + m->type=buf_unprepend_uint32(msg0); return True; /* Leaves transformed part of buffer untouched */ } @@ -507,13 +556,13 @@ static bool_t process_msg5(struct site *st, struct buffer_if *msg5, if (st->new_transform->reverse(st->new_transform->st, msg5,&transform_err)) { /* There's a problem */ - slog(st,LOG_SECURITY,"process_msg5: transform: %s",transform_err); + slog(st,LOG_SEC,"process_msg5: transform: %s",transform_err); return False; } /* Buffer should now contain untransformed PING packet data */ CHECK_AVAIL(msg5,4); - if ((*(uint32_t *)buf_unprepend(msg5,4))!=LABEL_MSG5) { - slog(st,LOG_SECURITY,"MSG5/PING packet contained invalid data"); + if (buf_unprepend_uint32(msg5)!=LABEL_MSG5) { + slog(st,LOG_SEC,"MSG5/PING packet contained invalid data"); return False; } CHECK_EMPTY(msg5); @@ -527,12 +576,12 @@ static bool_t generate_msg6(struct site *st) BUF_ALLOC(&st->buffer,"site:MSG6"); /* We are going to add three words to the transformed message */ buffer_init(&st->buffer,st->transform->max_start_pad+(4*3)); - *(uint32_t *)buf_append(&st->buffer,4)=LABEL_MSG6; + buf_append_uint32(&st->buffer,LABEL_MSG6); st->new_transform->forwards(st->new_transform->st,&st->buffer, &transform_err); - *(uint32_t *)buf_prepend(&st->buffer,4)=LABEL_MSG6; - *(uint32_t *)buf_prepend(&st->buffer,4)=(uint32_t)st; - *(uint32_t *)buf_prepend(&st->buffer,4)=st->setup_session_id; + buf_prepend_uint32(&st->buffer,LABEL_MSG6); + buf_prepend_uint32(&st->buffer,(uint32_t)st); + buf_prepend_uint32(&st->buffer,st->setup_session_id); st->retries=1; /* Peer will retransmit MSG5 if necessary */ return True; @@ -549,13 +598,13 @@ static bool_t process_msg6(struct site *st, struct buffer_if *msg6, if (st->new_transform->reverse(st->new_transform->st, msg6,&transform_err)) { /* There's a problem */ - slog(st,LOG_SECURITY,"process_msg6: transform: %s",transform_err); + slog(st,LOG_SEC,"process_msg6: transform: %s",transform_err); return False; } /* Buffer should now contain untransformed PING packet data */ CHECK_AVAIL(msg6,4); - if ((*(uint32_t *)buf_unprepend(msg6,4))!=LABEL_MSG6) { - slog(st,LOG_SECURITY,"MSG6/PONG packet contained invalid data"); + if (buf_unprepend_uint32(msg6)!=LABEL_MSG6) { + slog(st,LOG_SEC,"MSG6/PONG packet contained invalid data"); return False; } CHECK_EMPTY(msg6); @@ -571,12 +620,7 @@ static bool_t process_msg0(struct site *st, struct buffer_if *msg0, if (!st->current_valid) { slog(st,LOG_DROP,"incoming message but no current key -> dropping"); - if (st->state==SITE_RUN) { - slog(st,LOG_SETUP_INIT|LOG_STATE, - "now initiating setup of new key"); - return enter_state_resolve(st); - } - return False; + return initiate_key_setup(st); } if (!unpick_msg0(st,msg0,&m)) return False; @@ -584,11 +628,11 @@ static bool_t process_msg0(struct site *st, struct buffer_if *msg0, if (st->current_transform->reverse(st->current_transform->st, msg0,&transform_err)) { /* There's a problem */ - slog(st,LOG_SECURITY,"transform: %s",transform_err); - return False; + slog(st,LOG_SEC,"transform: %s",transform_err); + return initiate_key_setup(st); } CHECK_AVAIL(msg0,4); - type=*(uint32_t *)buf_unprepend(msg0,4); + type=buf_unprepend_uint32(msg0); switch(type) { case LABEL_MSG9: /* Deliver to netlink layer */ @@ -596,7 +640,7 @@ static bool_t process_msg0(struct site *st, struct buffer_if *msg0, return True; break; default: - slog(st,LOG_SECURITY,"incoming message of type %08x (unknown)",type); + slog(st,LOG_SEC,"incoming message of type %08x (unknown)",type); break; } return False; @@ -605,13 +649,13 @@ static bool_t process_msg0(struct site *st, struct buffer_if *msg0, static void dump_packet(struct site *st, struct buffer_if *buf, struct sockaddr_in *addr, bool_t incoming) { - uint32_t dest=*(uint32_t *)buf->start; - uint32_t source=*(uint32_t *)(buf->start+4); - uint32_t msgtype=*(uint32_t *)(buf->start+8); + uint32_t dest=ntohl(*(uint32_t *)buf->start); + uint32_t source=ntohl(*(uint32_t *)(buf->start+4)); + uint32_t msgtype=ntohl(*(uint32_t *)(buf->start+8)); if (st->log_events & LOG_DUMP) - log(st->log,0,"(%s,%s): %s: %08x<-%08x: %08x:", - st->localname,st->remotename,incoming?"incoming":"outgoing", + log(st->log,M_DEBUG,"%s: %s: %08x<-%08x: %08x:", + st->tunname,incoming?"incoming":"outgoing", dest,source,msgtype); } @@ -629,7 +673,8 @@ static bool_t send_msg(struct site *st) st->retries--; return True; } else { - slog(st,LOG_SETUP_TIMEOUT,"timed out sending key setup packet"); + slog(st,LOG_SETUP_TIMEOUT,"timed out sending key setup packet " + "(in state %s)",state_name(st->state)); enter_state_wait(st); return False; } @@ -656,6 +701,21 @@ static void site_resolve_callback(void *sst, struct in_addr *address) } } +static bool_t initiate_key_setup(struct site *st) +{ + if (st->state!=SITE_RUN) return False; + if (st->address) { + slog(st,LOG_SETUP_INIT,"initiating key exchange; resolving address"); + return enter_state_resolve(st); + } else if (st->peer_valid) { + slog(st,LOG_SETUP_INIT,"initiating key exchange using old " + "peer address"); + st->setup_peer=st->peer; + return enter_state_sentmsg1(st); + } + return False; +} + static void activate_new_key(struct site *st) { struct transform_inst_if *t; @@ -665,7 +725,6 @@ static void activate_new_key(struct site *st) st->new_transform=t; t->delkey(t->st); - st->state=SITE_RUN; st->timeout=0; st->current_valid=True; st->current_key_timeout=st->now+st->key_lifetime; @@ -674,6 +733,7 @@ static void activate_new_key(struct site *st) st->remote_session_id=st->setup_session_id; slog(st,LOG_ACTIVATE_KEY,"new key activated"); + enter_state_run(st); } static void state_assert(struct site *st, bool_t ok) @@ -690,16 +750,36 @@ static void enter_state_stop(struct site *st) st->current_key_timeout=0; st->peer_valid=False; + + set_link_quality(st); st->new_transform->delkey(st->new_transform->st); } +static void set_link_quality(struct site *st) +{ + uint32_t quality; + if (st->current_valid) + quality=LINK_QUALITY_UP; + else if (st->state==SITE_WAIT || st->state==SITE_STOP) + quality=LINK_QUALITY_DOWN; + else if (st->address) + quality=LINK_QUALITY_DOWN_CURRENT_ADDRESS; + else if (st->peer_valid) + quality=LINK_QUALITY_DOWN_STALE_ADDRESS; + else + quality=LINK_QUALITY_DOWN; + + st->netlink->set_quality(st->netlink->st,st->netlink_cid,quality); +} + static void enter_state_run(struct site *st) { slog(st,LOG_STATE,"entering state RUN"); st->state=SITE_RUN; st->timeout=0; - st->netlink->set_delivery(st->netlink->st,st->netlink_cid,True); + + set_link_quality(st); /* XXX get rid of key setup data */ } @@ -816,7 +896,7 @@ static void enter_state_wait(struct site *st) st->timeout=st->now+st->wait_timeout; st->state=SITE_WAIT; st->peer_valid=False; - st->netlink->set_delivery(st->netlink->st,st->netlink_cid,False); + set_link_quality(st); BUF_FREE(&st->buffer); /* will have had an outgoing packet in it */ /* XXX Erase keys etc. */ } @@ -867,6 +947,7 @@ static void site_afterpoll(void *sst, struct pollfd *fds, int nfds, st->current_valid=False; st->current_transform->delkey(st->current_transform->st); st->current_key_timeout=0; + set_link_quality(st); } } @@ -887,29 +968,22 @@ static void site_outgoing(void *sst, void *cid, struct buffer_if *buf) a valid key and a valid address to send it to. */ if (st->current_valid && st->peer_valid) { /* Transform it and send it */ - *(uint32_t *)buf_prepend(buf,4)=LABEL_MSG9; - st->current_transform->forwards(st->current_transform->st, - buf, &transform_err); - *(uint32_t *)buf_prepend(buf,4)=LABEL_MSG0; - *(uint32_t *)buf_prepend(buf,4)=(uint32_t)st; - *(uint32_t *)buf_prepend(buf,4)=st->remote_session_id; - st->comm->sendmsg(st->comm->st,buf,&st->peer); + if (buf->size>0) { + buf_prepend_uint32(buf,LABEL_MSG9); + 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->remote_session_id); + st->comm->sendmsg(st->comm->st,buf,&st->peer); + } BUF_FREE(buf); return; } - if (st->state==SITE_RUN) { - BUF_FREE(buf); /* We throw the outgoing packet away */ - slog(st,LOG_SETUP_INIT,"initiating key exchange"); - enter_state_resolve(st); - return; - } - - /* Otherwise we're in the middle of key setup or a wait - just - throw the outgoing packet away */ - slog(st,LOG_DROP,"discarding outgoing packet"); + slog(st,LOG_DROP,"discarding outgoing packet of size %d",buf->size); BUF_FREE(buf); - return; + initiate_key_setup(st); } /* This function is called by the communication device to deliver @@ -918,7 +992,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, struct sockaddr_in *source) { struct site *st=sst; - uint32_t dest=*(uint32_t *)buf->start; + uint32_t dest=ntohl(*(uint32_t *)buf->start); if (dest==0) { if (buf->size<(st->setupsiglen+8+NONCELEN)) return False; @@ -971,7 +1045,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, return False; /* Not for us. */ } if (dest==(uint32_t)st) { - uint32_t msgtype=*(uint32_t *)(buf->start+8); + uint32_t msgtype=ntohl(*(uint32_t *)(buf->start+8)); /* Explicitly addressed to us */ if (msgtype!=LABEL_MSG0) dump_packet(st,buf,source,True); switch (msgtype) { @@ -981,7 +1055,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, case LABEL_MSG1: /* Setup packet: should not have been explicitly addressed to us */ - slog(st,LOG_SECURITY,"incoming explicitly addressed msg1"); + slog(st,LOG_SEC,"incoming explicitly addressed msg1"); break; case LABEL_MSG2: /* Setup packet: expected only in state SENTMSG1 */ @@ -990,7 +1064,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, } else if (process_msg2(st,buf,source)) enter_state_sentmsg3(st); else { - slog(st,LOG_SECURITY,"invalid MSG2"); + slog(st,LOG_SEC,"invalid MSG2"); } break; case LABEL_MSG3: @@ -1000,7 +1074,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, } else if (process_msg3(st,buf,source)) enter_state_sentmsg4(st); else { - slog(st,LOG_SECURITY,"invalid MSG3"); + slog(st,LOG_SEC,"invalid MSG3"); } break; case LABEL_MSG4: @@ -1010,7 +1084,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, } else if (process_msg4(st,buf,source)) enter_state_sentmsg5(st); else { - slog(st,LOG_SECURITY,"invalid MSG4"); + slog(st,LOG_SEC,"invalid MSG4"); } break; case LABEL_MSG5: @@ -1025,7 +1099,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, } else if (process_msg5(st,buf,source)) { send_msg6(st); } else { - slog(st,LOG_SECURITY,"invalid MSG5"); + slog(st,LOG_SEC,"invalid MSG5"); } break; case LABEL_MSG6: @@ -1036,7 +1110,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, BUF_FREE(&st->buffer); /* Free message 5 */ activate_new_key(st); } else { - slog(st,LOG_SECURITY,"invalid MSG6"); + slog(st,LOG_SEC,"invalid MSG6"); } break; case LABEL_MSG8: @@ -1044,7 +1118,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf, slog(st,LOG_ERROR,"received a NAK"); break; default: - slog(st,LOG_SECURITY,"received message of unknown type 0x%08x", + slog(st,LOG_SEC,"received message of unknown type 0x%08x", msgtype); break; } @@ -1068,6 +1142,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, struct site *st; item_t *item; dict_t *dict; + uint32_t netlink_options; st=safe_malloc(sizeof(*st),"site_apply"); @@ -1085,18 +1160,28 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, cfgfatal(loc,"site","parameter must be a dictionary\n"); dict=item->data.dict; + st->localname=dict_read_string(dict, "local-name", True, "site", loc); + st->remotename=dict_read_string(dict, "name", True, "site", loc); + /* Sanity check (which also allows the 'sites' file to include + site() closures for all sites including our own): refuse to + talk to ourselves */ + if (strcmp(st->localname,st->remotename)==0) { + Message(M_DEBUG,"site %s: local-name==name -> ignoring this site\n", + st->localname); + free(st); + return NULL; + } st->netlink=find_cl_if(dict,"netlink",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); st->log=find_cl_if(dict,"log",CL_LOG,True,"site",loc); st->random=find_cl_if(dict,"random",CL_RANDOMSRC,True,"site",loc); - st->localname=dict_read_string(dict, "local-name", True, "site", loc); st->privkey=find_cl_if(dict,"local-key",CL_RSAPRIVKEY,True,"site",loc); - st->remoteport=dict_read_number(dict,"port",True,"site",loc,0); - - st->remotename=dict_read_string(dict, "name", True, "site", loc); st->address=dict_read_string(dict, "address", False, "site", loc); + if (st->address) + st->remoteport=dict_read_number(dict,"port",True,"site",loc,0); + else st->remoteport=0; dict_read_subnet_list(dict, "networks", True, "site", loc, &st->remotenets); st->pubkey=find_cl_if(dict,"key",CL_RSAPUBKEY,True,"site",loc); @@ -1107,17 +1192,32 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, st->dh=find_cl_if(dict,"dh",CL_DH,True,"site",loc); st->hash=find_cl_if(dict,"hash",CL_HASH,True,"site",loc); - st->key_lifetime=dict_read_number(dict,"key-lifetime", - False,"site",loc,DEFAULT_KEY_LIFETIME); - 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); - /* XXX should be configurable */ - st->log_events=LOG_SECURITY|LOG_ERROR| - LOG_ACTIVATE_KEY|LOG_TIMEOUT_KEY|LOG_SETUP_INIT|LOG_SETUP_TIMEOUT; + 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); + st->key_renegotiate_time=dict_read_number( + dict,"renegotiate-time",False,"site",loc,st->key_lifetime); + if (st->key_renegotiate_time > st->key_lifetime) { + cfgfatal(loc,"site", + "renegotiate-time must be less than key-lifetime\n"); + } + /* XXX keepalive will eventually default to True */ + st->keepalive=dict_read_bool(dict,"keepalive",False,"site",loc,False); + + st->log_events=string_list_to_word(dict_lookup(dict,"log-events"), + log_event_table,"site"); + + netlink_options=string_list_to_word(dict_lookup(dict,"netlink-options"), + netlink_option_table,"site"); st->tunname=safe_malloc(strlen(st->localname)+strlen(st->remotename)+5, "site_apply"); @@ -1126,11 +1226,10 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, /* The information we expect to see in incoming messages of type 1 */ st->setupsiglen=strlen(st->remotename)+strlen(st->localname)+8; st->setupsig=safe_malloc(st->setupsiglen,"site_apply"); - *(uint32_t *)&(st->setupsig[0])=LABEL_MSG1; - *(uint16_t *)&(st->setupsig[4])=htons(strlen(st->remotename)); + put_uint32(st->setupsig+0,LABEL_MSG1); + put_uint16(st->setupsig+4,strlen(st->remotename)); memcpy(&st->setupsig[6],st->remotename,strlen(st->remotename)); - *(uint16_t *)&(st->setupsig[6+strlen(st->remotename)])= - htons(strlen(st->localname)); + put_uint16(st->setupsig+(6+strlen(st->remotename)),strlen(st->localname)); memcpy(&st->setupsig[8+strlen(st->remotename)],st->localname, strlen(st->localname)); st->setup_priority=(strcmp(st->localname,st->remotename)>0); @@ -1154,7 +1253,13 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context, site_outgoing, st, st->transform->max_start_pad+(4*4), st->transform->max_end_pad, - st->tunname); + netlink_options, st->tunname); + if (!st->netlink_cid) { + Message(M_WARNING,"%s: netlink device did not let us register " + "our remote networks. This site will not start.\n", + st->tunname); + return NULL; /* XXX should free site first */ + } st->comm->request_notify(st->comm->st, st, site_incoming);