[SECNET PATCH 03/12] site: Rename setup_priority to our_name_later

[Ian Jackson]

This is also used for setting the transform direction - ie,
distinguishing us and them.  We are going to make the priority system
more subtle, don't want to mess with that bit.

No functional change.

Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
---
 site.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/site.c b/site.c
index 67edb2f..2a62293 100644
--- a/site.c
+++ b/site.c
@@ -328,8 +328,7 @@ struct site {
 				      after this time, initiate a new
 				      key exchange */
 
-    bool_t setup_priority; /* Do we have precedence if both sites emit
-			      message 1 simultaneously? */
+    bool_t our_name_later; /* our name > peer name */
     uint32_t log_events;
 
 /* runtime information */
@@ -554,7 +553,7 @@ static void set_new_transform(struct site *st, char *pk)
     struct transform_if *generator=st->chosen_transform;
     struct transform_inst_if *generated=generator->create(generator->st);
     generated->setkey(generated->st,st->sharedsecret,
-		      st->sharedsecretlen,st->setup_priority);
+		      st->sharedsecretlen,st->our_name_later);
     dispose_transform(&st->new_transform);
     st->new_transform=generated;
 
@@ -1783,7 +1782,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
 	    /* We've just sent a message 1! They may have crossed on
 	       the wire. If we have priority then we ignore the
 	       incoming one, otherwise we process it as usual. */
-	    if (st->setup_priority) {
+	    if (st->our_name_later) {
 		BUF_FREE(buf);
 		slog(st,LOG_DUMP,"crossed msg1s; we are higher "
 		     "priority => ignore incoming msg1");
@@ -2115,7 +2114,7 @@ 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 */
     /* fixme: lots of unchecked overflows here, but the results are only
        corrupted packets rather than undefined behaviour */
-    st->setup_priority=(strcmp(st->localname,st->remotename)>0);
+    st->our_name_later=(strcmp(st->localname,st->remotename)>0);
 
     buffer_new(&st->buffer,SETUP_BUFFER_LEN);
 
-- 
2.11.0