X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=site.c;h=bfca29466654bdcd2e6e0de88e46dcd610aa0922;hb=ca0a30fc297d17a19e82ca0f1c36ef5e11c752fa;hp=b14b8e8f60ee1987f07aa1822db693fd9d65af68;hpb=a96fda35655e11388dda789f83d4c04c751eb946;p=secnet.git

diff --git a/site.c b/site.c
index b14b8e8..bfca294 100644
--- a/site.c
+++ b/site.c
@@ -1630,7 +1630,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 	if (st->state==SITE_RUN || st->state==SITE_RESOLVE ||
 	    st->state==SITE_WAIT) {
 	    /* We should definitely process it */
-	    transport_record_peer(st,&st->setup_peers,source,"msg1");
+	    transport_compute_setupinit_peers(st,0,source);
 	    if (process_msg1(st,buf,source,&named_msg)) {
 		slog(st,LOG_SETUP_INIT,"key setup initiated by peer");
 		bool_t entered=enter_new_state(st,SITE_SENTMSG2);
@@ -1696,7 +1696,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 	       because our peer's forgotten the key */
 	    if (get_uint32(buf->start+4)==st->current.remote_session_id) {
 		bool_t initiated;
-		initiated = initiate_key_setup(st,"received a NAK",0);
+		initiated = initiate_key_setup(st,"received a NAK",source);
 		if (!initiated) generate_send_prod(st,source);
 	    } else {
 		slog(st,LOG_SEC,"bad incoming NAK");
@@ -1921,7 +1921,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->transport_peers_max= !st->peer_mobile ? 1 : dict_read_number(
 	dict,"mobile-peers-max",False,"site",loc,DEFAULT_MOBILE_PEERS_MAX);
     if (st->transport_peers_max<1 ||
-	st->transport_peers_max>=MAX_MOBILE_PEERS_MAX) {
+	st->transport_peers_max>MAX_MOBILE_PEERS_MAX) {
 	cfgfatal(loc,"site","mobile-peers-max must be in range 1.."
 		 STRING(MAX_MOBILE_PEERS_MAX) "\n");
     }