From 93ca479ba3da60e693464eb1948d18919691c0ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Vavru=C5=A1a?= Date: Wed, 3 Jun 2015 03:08:57 +0200 Subject: [PATCH] lib: cleanup, lowered default timeout to 3s --- lib/defines.h | 2 +- lib/layer/iterate.c | 4 ++-- lib/layer/rrcache.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/defines.h b/lib/defines.h index 773314a11..02fe002ab 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -32,7 +32,7 @@ * Connection limits. * @cond internal */ -#define KR_CONN_RTT_MAX 5000 /* Timeout for network activity */ +#define KR_CONN_RTT_MAX 3000 /* Timeout for network activity */ #define KR_ITER_LIMIT 50 /* Built-in iterator limit */ /* diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c index a4fef9481..e3d18669a 100644 --- a/lib/layer/iterate.c +++ b/lib/layer/iterate.c @@ -147,13 +147,13 @@ static int update_glue(const knot_rrset_t *rr, unsigned hint, struct kr_request return update_nsaddr(rr, kr_rplan_current(&req->rplan), hint); } -int rr_update_parent(const knot_rrset_t *rr, unsigned hint, struct kr_request *req) +static int rr_update_parent(const knot_rrset_t *rr, unsigned hint, struct kr_request *req) { struct kr_query *qry = kr_rplan_current(&req->rplan); return update_nsaddr(rr, qry->parent, hint); } -int rr_update_answer(const knot_rrset_t *rr, unsigned hint, struct kr_request *req) +static int rr_update_answer(const knot_rrset_t *rr, unsigned hint, struct kr_request *req) { knot_pkt_t *answer = req->answer; diff --git a/lib/layer/rrcache.c b/lib/layer/rrcache.c index 30b3dfc0e..1557bca36 100644 --- a/lib/layer/rrcache.c +++ b/lib/layer/rrcache.c @@ -120,7 +120,7 @@ static int merge_cache_rr(knot_rrset_t *cache_rr, const knot_rrset_t *rr, mm_ctx if (rr->type != cache_rr->type || !knot_dname_is_equal(rr->owner, cache_rr->owner)) { return KNOT_EOK; /* Ignore */ } - if (knot_rrset_ttl(rr) < 2) { + if (knot_rrset_ttl(rr) < KR_TTL_GRACE) { return KNOT_EINVAL; /* Cache busters */ } -- 2.47.3