diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-12-16 19:53:16 +0100 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-12-16 19:53:16 +0100 |
commit | ee300afb79e9788f98d4c98d4535018f7fdbdcdd (patch) | |
tree | 440d42f6b785628e77a38ff5d4d04f50576bca0b | |
parent | 4475652054616ded16485341b081abf42cc6c08e (diff) | |
download | fastd-ee300afb79e9788f98d4c98d4535018f7fdbdcdd.tar fastd-ee300afb79e9788f98d4c98d4535018f7fdbdcdd.zip |
Revert "resolve: save a timestamp in the resolve return to ensure we don't confuse remotes before and after reconfiguration"
This reverts commit 4475652054616ded16485341b081abf42cc6c08e.
-rw-r--r-- | src/fastd.c | 2 | ||||
-rw-r--r-- | src/fastd.h | 5 | ||||
-rw-r--r-- | src/resolve.c | 5 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/fastd.c b/src/fastd.c index 31bb90a..a9cb0c4 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -516,7 +516,7 @@ static void handle_resolve_returns(fastd_context_t *ctx) { fastd_remote_t *remote; for (remote = peer->remotes; remote; remote = remote->next) { - if (remote == resolve_return.remote && timespec_equal(&remote->last_resolve, &resolve_return.resolve_time)) + if (remote == resolve_return.remote) break; } diff --git a/src/fastd.h b/src/fastd.h index 30e4bc4..b170bb5 100644 --- a/src/fastd.h +++ b/src/fastd.h @@ -80,7 +80,6 @@ union fastd_peer_address { struct fastd_resolve_return { fastd_remote_t *remote; - struct timespec resolve_time; fastd_peer_address_t addr; }; @@ -395,10 +394,6 @@ static inline bool timespec_after(const struct timespec *tp1, const struct times (tp1->tv_sec == tp2->tv_sec && tp1->tv_nsec > tp2->tv_nsec)); } -static inline bool timespec_equal(const struct timespec *tp1, const struct timespec *tp2) { - return (tp1->tv_sec == tp2->tv_sec && tp1->tv_nsec == tp2->tv_nsec); -} - /* returns (tp1 - tp2) in milliseconds */ static inline int timespec_diff(const struct timespec *tp1, const struct timespec *tp2) { return ((tp1->tv_sec - tp2->tv_sec))*1000 + (tp1->tv_nsec - tp2->tv_nsec)/1e6; diff --git a/src/resolve.c b/src/resolve.c index 8dcdb2d..9631c48 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -34,7 +34,6 @@ typedef struct resolv_arg { fastd_context_t *ctx; fastd_remote_t *remote; - struct timespec resolve_time; char *hostname; fastd_peer_address_t constraints; } resolv_arg_t; @@ -72,8 +71,7 @@ static void* resolve_peer(void *varg) { } fastd_resolve_return_t ret = { - .remote = arg->remote, - .resolve_time = arg->resolve_time, + .remote = arg->remote }; if (!error) { @@ -115,7 +113,6 @@ void fastd_resolve_peer(fastd_context_t *ctx, fastd_peer_t *peer, fastd_remote_t arg->ctx = ctx; arg->remote = remote; - arg->resolve_time = ctx->now; arg->hostname = strdup(remote->config->hostname); arg->constraints = remote->config->address; |