lib: cleanup, lowered default timeout to 3s

diff --git a/lib/defines.h b/lib/defines.h
index 773314a11b1de3cd81f89d36c2641f9ba8342022..02fe002ab41cd517ced50027dfbe4cfdde9657f7 100644 (file)
--- 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 a4fef948195e7abfd38a69af615ec6c2fd75ffa8..e3d18669a4ed06538fc5459458d94eca7a3ae443 100644 (file)
--- 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 30b3dfc0e4605161469eb968f7027dc2976b4106..1557bca36d3876ff8185e2984dd86d8b9024e616 100644 (file)
--- 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 */
        }