X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=site.c;h=31900cf44420d44bc2fa8bb5398bf107bd44da79;hp=c964faee004067373eb9ad7c1011cf52de47b052;hb=16f21d687de8d4f071df36aa7c2fd4b57ed53f88;hpb=6c65723d1c01a7640fd7e6ba6f85e6d29e9845df

diff --git a/site.c b/site.c
index c964fae..31900cf 100644
--- a/site.c
+++ b/site.c
@@ -41,6 +41,7 @@
 
 #define DEFAULT_MOBILE_PEER_EXPIRY            (2*60)      /* [s] */
 #define DEFAULT_MOBILE_PEERS_MAX 3 /* send at most this many copies (default) */
+#define DEFAULT_STATIC_PEERS_MAX 3 /* retain at most this many peer addresses */
 
 /* Each site can be in one of several possible states. */
 
@@ -144,9 +145,6 @@ static struct flagstr log_event_table[]={
 
 /* Details of "mobile peer" semantics:
 
- | Note: this comment is wishful thinking right now.  It will be
- | implemented in subsequent commits.
-
    - We use the same data structure for the different configurations,
      but manage it with different algorithms.
    
@@ -220,8 +218,6 @@ static struct flagstr log_event_table[]={
 
    */
 
-#define MAX_MOBILE_PEERS_MAX 5 /* send at most this many copies, compiled max */
-
 typedef struct {
     struct timeval last;
     struct comm_addr addr;
@@ -231,7 +227,7 @@ typedef struct {
 /* configuration information */
 /* runtime information */
     int npeers;
-    transport_peer peers[MAX_MOBILE_PEERS_MAX];
+    transport_peer peers[MAX_PEER_ADDRS];
 } transport_peers;
 
 /* Basic operations on transport peer address sets */
@@ -1196,29 +1192,18 @@ static bool_t send_msg(struct site *st)
     }
 }
 
-static void site_resolve_callback(void *sst, struct in_addr *address)
+static void site_resolve_callback(void *sst, const struct comm_addr *addrs,
+				  int naddrs)
 {
     struct site *st=sst;
-    struct comm_addr ca_buf;
-    const struct comm_addr *addrs;
-    int naddrs;
 
     st->resolving=False;
 
-    if (address) {
-	FILLZERO(ca_buf);
-	ca_buf.comm=st->comms[0];
-	ca_buf.sin.sin_family=AF_INET;
-	ca_buf.sin.sin_port=htons(st->remoteport);
-	ca_buf.sin.sin_addr=*address;
-	addrs=&ca_buf;
-	naddrs=1;
-	slog(st,LOG_STATE,"resolution of %s completed: %s",
-	     st->address, comm_addr_to_string(&addrs[0]));;
+    if (naddrs) {
+	slog(st,LOG_STATE,"resolution of %s completed, %d addrs, eg: %s",
+	     st->address, naddrs, comm_addr_to_string(&addrs[0]));;
     } else {
 	slog(st,LOG_ERROR,"resolution of %s failed",st->address);
-	addrs=0;
-	naddrs=0;
     }
 
     switch (st->state) {
@@ -1405,6 +1390,7 @@ static bool_t ensure_resolving(struct site *st)
      * case we have to clear ->resolving again. */
     st->resolving=True;
     bool_t ok = st->resolver->request(st->resolver->st,st->address,
+				      st->remoteport,st->comms[0],
 				      site_resolve_callback,st);
     if (!ok)
 	st->resolving=False;
@@ -1972,12 +1958,14 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->mobile_peer_expiry= dict_read_number(
        dict,"mobile-peer-expiry",False,"site",loc,DEFAULT_MOBILE_PEER_EXPIRY);
 
-    st->transport_peers_max= !st->peer_mobile ? 1 : dict_read_number(
-	dict,"mobile-peers-max",False,"site",loc,DEFAULT_MOBILE_PEERS_MAX);
+    const char *peerskey= st->peer_mobile
+	? "mobile-peers-max" : "static-peers-max";
+    st->transport_peers_max= dict_read_number(
+	dict,peerskey,False,"site",loc,DEFAULT_MOBILE_PEERS_MAX);
     if (st->transport_peers_max<1 ||
-	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");
+	st->transport_peers_max>=MAX_PEER_ADDRS) {
+	cfgfatal(loc,"site", "%s must be in range 1.."
+		 STRING(MAX_PEER_ADDRS) "\n", peerskey);
     }
 
     if (st->key_lifetime < DEFAULT(KEY_RENEGOTIATE_GAP)*2)
@@ -2182,11 +2170,11 @@ static bool_t transport_compute_setupinit_peers(struct site *st,
 	 incoming_packet_addr ? " incoming packet address;" : "",
 	 st->peers.npeers);
 
-    /* Non-mobile peers have st->peers.npeers==0 or ==1, since they
-     * have transport_peers_max==1.  The effect is that this code
-     * always uses the configured address if supplied, or otherwise
-     * the address of the incoming PROD, or the existing data peer if
-     * one exists; this is as desired. */
+    /* Non-mobile peers try addresses until one is plausible.  The
+     * effect is that this code always tries first the configured
+     * address if supplied, or otherwise the address of the incoming
+     * PROD, or finally the existing data peer if one exists; this is
+     * as desired. */
 
     transport_peers_copy(st,&st->setup_peers,&st->peers);
     transport_peers_expire(st,&st->setup_peers);
@@ -2267,7 +2255,7 @@ void transport_xmit(struct site *st, transport_peers *peers,
     int slot;
     transport_peers_expire(st, peers);
     unsigned failed=0; /* bitmask */
-    assert(MAX_MOBILE_PEERS_MAX < sizeof(unsigned)*CHAR_BIT);
+    assert(MAX_PEER_ADDRS < sizeof(unsigned)*CHAR_BIT);
 
     int nfailed=0;
     for (slot=0; slot<peers->npeers; slot++) {