chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-example: Switch to testing IPv6 too
[secnet.git]
/
site.c
diff --git
a/site.c
b/site.c
index 204ddf5dce812bb66e1e1022a3c8580727a538fc..15dace88d3c74f0e22a35b891d91a061c311877e 100644
(file)
--- a/
site.c
+++ b/
site.c
@@
-143,9
+143,6
@@
static struct flagstr log_event_table[]={
/* Details of "mobile peer" semantics:
/* Details of "mobile peer" semantics:
- | Note: this comment is wishful thinking right now. It will be
- | implemented in subsequent commits.
-
- We use the same data structure for the different configurations,
but manage it with different algorithms.
- We use the same data structure for the different configurations,
but manage it with different algorithms.
@@
-1194,7
+1191,8
@@
static bool_t send_msg(struct site *st)
}
static void site_resolve_callback(void *sst, const struct comm_addr *addrs,
}
static void site_resolve_callback(void *sst, const struct comm_addr *addrs,
- int naddrs, int was_naddrs)
+ int naddrs, int was_naddrs,
+ const char *failwhy)
{
struct site *st=sst;
{
struct site *st=sst;
@@
-1209,7
+1207,7
@@
static void site_resolve_callback(void *sst, const struct comm_addr *addrs,
was_naddrs, naddrs);
}
} else {
was_naddrs, naddrs);
}
} else {
- slog(st,LOG_ERROR,"resolution of %s failed
",st->address
);
+ slog(st,LOG_ERROR,"resolution of %s failed
: %s",st->address,failwhy
);
}
switch (st->state) {
}
switch (st->state) {
@@
-2091,11
+2089,6
@@
static void transport_peers_debug(struct site *st, transport_peers *dst,
}
}
}
}
-static bool_t transport_addrs_equal(const struct comm_addr *a,
- const struct comm_addr *b) {
- return !memcmp(a,b,sizeof(*a));
-}
-
static void transport_peers_expire(struct site *st, transport_peers *peers) {
/* peers must be sorted first */
int previous_peers=peers->npeers;
static void transport_peers_expire(struct site *st, transport_peers *peers) {
/* peers must be sorted first */
int previous_peers=peers->npeers;
@@
-2119,7
+2112,7
@@
static bool_t transport_peer_record_one(struct site *st, transport_peers *peers,
return 0;
for (search=0; search<peers->npeers; search++)
return 0;
for (search=0; search<peers->npeers; search++)
- if (
transport_addrs
_equal(&peers->peers[search].addr, ca))
+ if (
comm_addr
_equal(&peers->peers[search].addr, ca))
return 1;
peers->peers[peers->npeers].addr = *ca;
return 1;
peers->peers[peers->npeers].addr = *ca;
@@
-2138,7
+2131,7
@@
static void transport_record_peers(struct site *st, transport_peers *peers,
* Caller must first call transport_peers_expire. */
if (naddrs==1 && peers->npeers>=1 &&
* Caller must first call transport_peers_expire. */
if (naddrs==1 && peers->npeers>=1 &&
-
transport_addrs
_equal(&addrs[0], &peers->peers[0].addr)) {
+
comm_addr
_equal(&addrs[0], &peers->peers[0].addr)) {
/* optimisation, also avoids debug for trivial updates */
peers->peers[0].last = *tv_now;
return;
/* optimisation, also avoids debug for trivial updates */
peers->peers[0].last = *tv_now;
return;