From 10aa52c30b50b964230c8f494c2d12d3710de882 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 29 Sep 2019 23:26:41 +0100 Subject: [PATCH] site: hex_init: Call from enter_new_state This seems more logical. It also more clearly separates it from the hacky_par system. Signed-off-by: Ian Jackson --- site.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.c b/site.c index 88953de..eb146e1 100644 --- a/site.c +++ b/site.c @@ -815,7 +815,6 @@ static bool_t kex_init(struct site *st) static bool_t generate_msg1(struct site *st, const struct msg *prompt_maybe_0) { return - kex_init(st) && generate_msg(st,LABEL_MSG1,"site:MSG1",prompt_maybe_0); } @@ -837,7 +836,6 @@ static bool_t generate_msg2(struct site *st, const struct msg *prompt_may_be_null) { return - kex_init(st) && generate_msg(st,LABEL_MSG2,"site:MSG2",prompt_may_be_null); } @@ -1601,12 +1599,14 @@ static bool_t enter_new_state(struct site *st, uint32_t next, switch(next) { case SITE_SENTMSG1: state_assert(st,st->state==SITE_RUN || st->state==SITE_RESOLVE); + if (!kex_init(st)) return False; gen=generate_msg1; st->msg1_crossed_logged = False; break; case SITE_SENTMSG2: state_assert(st,st->state==SITE_RUN || st->state==SITE_RESOLVE || st->state==SITE_SENTMSG1 || st->state==SITE_WAIT); + if (!kex_init(st)) return False; gen=generate_msg2; break; case SITE_SENTMSG3: -- 2.30.2