static void enter_state_run(struct site *st)
{
- slog(st,LOG_STATE,"entering state RUN%s",
- current_valid(st) ? " (keyed)" : " (unkeyed)");
+ if (st->state!=SITE_STOP)
+ slog(st,LOG_STATE,"entering state RUN%s",
+ current_valid(st) ? " (keyed)" : " (unkeyed)");
st->state=SITE_RUN;
st->timeout=0;
send_msg7(st,"shutting down");
}
+static void site_phase_run_hook(void *sst, uint32_t newphase)
+{
+ struct site *st=sst;
+ slog(st,LOG_STATE,"entering phase RUN in state %s",
+ state_name(st->state));
+}
+
static void site_childpersist_clearkeys(void *sst, uint32_t newphase)
{
struct site *st=sst;
st->peerkeys_tmpl.buffer=0;
st->peerkeys_current=st->peerkeys_kex=0;
+ buffer_new(&st->scratch,SETUP_BUFFER_LEN);
+ BUF_ALLOC(&st->scratch,"site:scratch");
+
/* First parameter must be a dict */
item=list_elem(args,0);
if (!item || item->type!=t_dict)
cfgfatal(loc,"site","%s is not a closure\n",dictkey); \
closure_t *cl=item->data.closure; \
if (cl->type!=CL_TYPE) \
- cfgfatal(loc,"site","%s closure wrong type\n",dictkey); \
+ cfgfatal_cl_type(loc,"site",cl,CL_TYPE,dictkey); \
st->things[i]=cl->interface; \
} \
}while(0)
buffer_new(&st->buffer,SETUP_BUFFER_LEN);
- buffer_new(&st->scratch,SETUP_BUFFER_LEN);
- BUF_ALLOC(&st->scratch,"site:scratch");
-
/* We are interested in poll(), but only for timeouts. We don't have
any fds of our own. */
register_for_poll(st, site_beforepoll, site_afterpoll, "site");
enter_state_stop(st);
add_hook(PHASE_SHUTDOWN,site_phase_shutdown_hook,st);
+ add_hook(PHASE_RUN, site_phase_run_hook, st);
add_hook(PHASE_CHILDPERSIST,site_childpersist_clearkeys,st);
return new_closure(&st->cl);