chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Move "starting" message earlier
[secnet.git]
/
site.c
diff --git
a/site.c
b/site.c
index ee4c3100e1345055ed9ebccefb88dbdc6e3e541f..a0715000285f5f65e4dd7a617726f2dcfe79922b 100644
(file)
--- a/
site.c
+++ b/
site.c
@@
-2283,11
+2283,10
@@
static bool_t site_incoming(void *sst, struct buffer_if *buf,
return False;
}
return False;
}
-static void site_
control(void *vst, bool_t run
)
+static void site_
startup(void *vst
)
{
struct site *st=vst;
{
struct site *st=vst;
- if (run) enter_state_run(st);
- else enter_state_stop(st);
+ enter_state_run(st);
}
static void site_phase_hook(void *sst, uint32_t newphase)
}
static void site_phase_hook(void *sst, uint32_t newphase)
@@
-2331,7
+2330,7
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.
control=site_control
;
+ st->ops.
startup=site_startup
;
st->ops.status=site_status;
st->peerkeys_path=0;
st->peerkeys_tmpl.buffer=0;
st->ops.status=site_status;
st->peerkeys_path=0;
st->peerkeys_tmpl.buffer=0;
@@
-2734,8
+2733,10
@@
static void transport_peers_init(struct site *st, transport_peers *peers) {
peers->npeers= 0;
}
static void transport_peers_clear(struct site *st, transport_peers *peers) {
peers->npeers= 0;
}
static void transport_peers_clear(struct site *st, transport_peers *peers) {
+ bool_t need_debug=!!peers->npeers;
peers->npeers= 0;
peers->npeers= 0;
- transport_peers_debug(st,peers,"clear",0,0,0);
+ if (need_debug)
+ transport_peers_debug(st,peers,"clear",0,0,0);
}
static void transport_peers_copy(struct site *st, transport_peers *dst,
const transport_peers *src) {
}
static void transport_peers_copy(struct site *st, transport_peers *dst,
const transport_peers *src) {