From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 13 May 2014 23:18:38 +0000 (+0100)
Subject: site: Make local_mobile be a site state variable
X-Git-Tag: debian/0.3.2_beta1~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=0391d9ee80a1847381ad205b8f707e43707b90b0

site: Make local_mobile be a site state variable

We are going to want to know whether we are mobile to decide how to
handle certain name resolution failures.

Also fix a typo in a comment.

No functional change in this patch.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/site.c b/site.c
index f9c2f08..b04f3b3 100644
--- a/site.c
+++ b/site.c
@@ -229,7 +229,7 @@ struct site {
 /* configuration information */
     string_t localname;
     string_t remotename;
-    bool_t peer_mobile; /* Mobile client support */
+    bool_t local_mobile, peer_mobile; /* Mobile client support */
     int32_t transport_peers_max;
     string_t tunname; /* localname<->remotename by default, used in logs */
     string_t address; /* DNS name for bootstrapping, optional */
@@ -1785,7 +1785,7 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     st->remotename=dict_read_string(dict, "name", True, "site", loc);
 
     st->peer_mobile=dict_read_bool(dict,"mobile",False,"site",loc,False);
-    bool_t local_mobile=
+    st->local_mobile=
 	dict_read_bool(dict,"local-mobile",False,"site",loc,False);
 
     /* Sanity check (which also allows the 'sites' file to include
@@ -1794,14 +1794,14 @@ static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
     if (strcmp(st->localname,st->remotename)==0) {
 	Message(M_DEBUG,"site %s: local-name==name -> ignoring this site\n",
 		st->localname);
-	if (st->peer_mobile != local_mobile)
+	if (st->peer_mobile != st->local_mobile)
 	    cfgfatal(loc,"site","site %s's peer-mobile=%d"
 		    " but our local-mobile=%d\n",
-		    st->localname, st->peer_mobile, local_mobile);
+		    st->localname, st->peer_mobile, st->local_mobile);
 	free(st);
 	return NULL;
     }
-    if (st->peer_mobile && local_mobile) {
+    if (st->peer_mobile && st->local_mobile) {
 	Message(M_WARNING,"site %s: site is mobile but so are we"
 		" -> ignoring this site\n", st->remotename);
 	free(st);
@@ -1849,7 +1849,7 @@ 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);
 
-#define DEFAULT(D) (st->peer_mobile || local_mobile	\
+#define DEFAULT(D) (st->peer_mobile || st->local_mobile	\
                     ? DEFAULT_MOBILE_##D : DEFAULT_##D)
 #define CFG_NUMBER(k,D) dict_read_number(dict,(k),False,"site",loc,DEFAULT(D));
 
@@ -2050,7 +2050,7 @@ static bool_t transport_compute_setupinit_peers(struct site *st,
 	 prod_hint_addr ? " PROD hint address;" : "",
 	 st->peers.npeers);
 
-    /* Non-mobile peers havve st->peers.npeers==0 or ==1, since they
+    /* 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