magic: Introduce LABEL_NAK

[secnet.git] / site.c

diff --git a/site.c b/site.c
index 566b215d3bcc416fd4ff80d5b70213cf5b557cc8..a6fa9dafc2b13955b728932056fde6ea52f2ec3b 100644 (file)
--- a/site.c
+++ b/site.c
@@ -566,7 +566,7 @@ static bool_t process_msg3(struct site *st, struct buffer_if *msg3,
 
     /* Set up the transform */
     st->new_transform->setkey(st->new_transform->st,st->sharedsecret,
-                             st->sharedsecretlen);
+                             st->sharedsecretlen,st->setup_priority);
 
     return True;
 }
@@ -613,7 +613,7 @@ static bool_t process_msg4(struct site *st, struct buffer_if *msg4,
                       st->sharedsecret,st->sharedsecretlen);
     /* Set up the transform */
     st->new_transform->setkey(st->new_transform->st,st->sharedsecret,
-                             st->sharedsecretlen);
+                             st->sharedsecretlen,st->setup_priority);
 
     return True;
 }
@@ -1286,7 +1286,7 @@ static bool_t site_incoming(void *sst, struct buffer_if *buf,
        uint32_t msgtype=ntohl(get_uint32(buf->start+8));
        if (msgtype!=LABEL_MSG0) dump_packet(st,buf,source,True);
        switch (msgtype) {
-       case 0: /* NAK */
+       case LABEL_NAK:
            /* If the source is our current peer then initiate a key setup,
               because our peer's forgotten the key */
            if (get_uint32(buf->start+4)==st->current.remote_session_id) {