chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 0.6.8
[secnet.git]
/
site.c
diff --git
a/site.c
b/site.c
index 72cee24fc8d094d791a5ed8dab4b17ae71224671..89837964b757ec5b7759fbfbfeec213c4a2df0f0 100644
(file)
--- a/
site.c
+++ b/
site.c
@@
-257,6
+257,7
@@
typedef struct {
} transport_peers;
/* Basic operations on transport peer address sets */
} transport_peers;
/* Basic operations on transport peer address sets */
+static void transport_peers_init(struct site *st, transport_peers *peers);
static void transport_peers_clear(struct site *st, transport_peers *peers);
static int transport_peers_valid(transport_peers *peers);
static void transport_peers_copy(struct site *st, transport_peers *dst,
static void transport_peers_clear(struct site *st, transport_peers *peers);
static int transport_peers_valid(transport_peers *peers);
static void transport_peers_copy(struct site *st, transport_peers *dst,
@@
-1711,8
+1712,9
@@
static void set_link_quality(struct site *st)
static void enter_state_run(struct site *st)
{
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;
st->state=SITE_RUN;
st->timeout=0;
@@
-2282,14
+2284,13
@@
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_
shutdown_
hook(void *sst, uint32_t newphase)
{
struct site *st=sst;
{
struct site *st=sst;
@@
-2297,6
+2298,13
@@
static void site_phase_hook(void *sst, uint32_t newphase)
send_msg7(st,"shutting down");
}
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;
static void site_childpersist_clearkeys(void *sst, uint32_t newphase)
{
struct site *st=sst;
@@
-2330,12
+2338,15
@@
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->peerkeys_current=st->peerkeys_kex=0;
st->ops.status=site_status;
st->peerkeys_path=0;
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)
/* First parameter must be a dict */
item=list_elem(args,0);
if (!item || item->type!=t_dict)
@@
-2400,7
+2411,7
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
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 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)
st->things[i]=cl->interface; \
} \
}while(0)
@@
-2500,9
+2511,6
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
buffer_new(&st->buffer,SETUP_BUFFER_LEN);
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");
/* 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");
@@
-2512,8
+2520,8
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
st->chosen_transform=0;
st->current.key_timeout=0;
st->auxiliary_key.key_timeout=0;
st->chosen_transform=0;
st->current.key_timeout=0;
st->auxiliary_key.key_timeout=0;
- transport_peers_
clear
(st,&st->peers);
- transport_peers_
clear
(st,&st->setup_peers);
+ transport_peers_
init
(st,&st->peers);
+ transport_peers_
init
(st,&st->setup_peers);
/* XXX mlock these */
st->dhsecret=safe_malloc(st->dh->len,"site:dhsecret");
st->sharedsecretlen=st->sharedsecretallocd=0;
/* XXX mlock these */
st->dhsecret=safe_malloc(st->dh->len,"site:dhsecret");
st->sharedsecretlen=st->sharedsecretallocd=0;
@@
-2551,7
+2559,8
@@
static list_t *site_apply(closure_t *self, struct cloc loc, dict_t *context,
enter_state_stop(st);
enter_state_stop(st);
- add_hook(PHASE_SHUTDOWN,site_phase_hook,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);
add_hook(PHASE_CHILDPERSIST,site_childpersist_clearkeys,st);
return new_closure(&st->cl);
@@
-2729,9
+2738,14
@@
static void transport_data_msgok(struct site *st, const struct comm_addr *a) {
static int transport_peers_valid(transport_peers *peers) {
return peers->npeers;
}
static int transport_peers_valid(transport_peers *peers) {
return peers->npeers;
}
+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) {
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) {