Merge branch 'release-2-2-0' into 'master'

Release 2.2.0

See merge request !535

NEWS

+Knot Resolver 2.2.0 (2018-03-28)
+================================
+
+New features
+------------
+- cache server unavailability to prevent flooding unreachable servers
+  (Please note that caching algorithm needs further optimization
+   and will change in further versions but we need to gather operational
+   experience first.)
 
+Bugfixes
+--------
 - don't magically -D_FORTIFY_SOURCE=2 in some cases
+- allow large responses for outbound over TCP
+- fix crash with RR sets with over 255 records
+
 
 Knot Resolver 2.1.1 (2018-02-23)
 ================================

config.mk

 # Project
 MAJOR := 2
-MINOR := 1
-PATCH := 1
+MINOR := 2
+PATCH := 0
 EXTRA :=
-ABIVER := 6
+ABIVER := 7
 BUILDMODE := dynamic
 HARDENING := yes
 

daemon/lua/kres-gen.sh

@@ -84,7 +84,7 @@ printf "\t/* beware: hidden stub, to avoid hardcoding sockaddr lengths */\n};\n"
 
 genResType "struct kr_query"
 
-genResType "struct kr_context" | sed '/kr_nsrep_lru_t/,$ d'
+genResType "struct kr_context" | sed '/kr_nsrep_rtt_lru_t/,$ d'
 printf "\tchar _stub[];\n};\n"
 
 ## libknot API

distro/deb/debian/control

@@ -35,7 +35,7 @@ Architecture: any
 Depends:
  adduser,
  dns-root-data,
- libkres6 (= ${binary:Version}),
+ libkres7 (= ${binary:Version}),
  lua-sec,
  lua-socket,
  ${misc:Depends},
@@ -99,7 +99,7 @@ Description: Documentation for Knot Resolver
  .
  This package contains Knot Resolver Documentation.
 
-Package: libkres6
+Package: libkres7
 Architecture: any
 Section: libs
 Depends:
@@ -123,7 +123,7 @@ Package: libkres-dev
 Architecture: any
 Section: libdevel
 Depends:
- libkres6 (= ${binary:Version}),
+ libkres7 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:

distro/deb/debian/libkres6.symbols → distro/deb/debian/libkres7.symbols

-libkres.so.6 libkres6 #MINVER#
+libkres.so.7 libkres7 #MINVER#
  cache_api@Base 2.1.0
  iterate_api@Base 2.1.0
  kr_answer_write_cookie@Base 2.1.0
@@ -111,7 +111,6 @@ libkres.so.6 libkres6 #MINVER#
  map_contains@Base 2.1.0
  map_del@Base 2.1.0
  map_get@Base 2.1.0
- map_make@Base 2.1.0
  map_set@Base 2.1.0
  map_walk_prefixed@Base 2.1.0
  validate_api@Base 2.1.0

distro/deb/knot-resolver.dsc

 Format: 3.0 (quilt)
 Source: knot-resolver
-Binary: knot-resolver, knot-resolver-module-http, knot-resolver-doc, libkres6, libkres-dev
+Binary: knot-resolver, knot-resolver-module-http, knot-resolver-doc, libkres7, libkres-dev
 Architecture: any all
 Version: __VERSION__-1
 Maintainer: Knot Resolver <knot-resolver@labs.nic.cz>
@@ -14,5 +14,5 @@ Package-List:
  knot-resolver-doc deb doc optional arch=all
  knot-resolver-module-http deb net optional arch=all
  libkres-dev deb libdevel optional arch=any
- libkres6 deb libs optional arch=any
+ libkres7 deb libs optional arch=any
 Files:

lib/cache/nsec1.c

@@ -216,11 +216,13 @@ static const char * find_leq_NSEC1(struct kr_cache *cache, const struct kr_query
 	}
 	/* We know it starts before sname, so let's check the other end.
 	 * 1. construct the key for the next name - kwz_hi. */
-	const knot_dname_t *next = eh->data + 2 * KR_CACHE_RR_COUNT_SIZE; /* it's *full* name ATM */
+	/* it's *full* name ATM */
+	const knot_dname_t *next = eh->data + KR_CACHE_RR_COUNT_SIZE
+				 + 2 /* RDLENGTH from rfc1034 */;
 	if (!eh->data[0]) {
 		assert(false);
 		return "ERROR";
-		/* TODO: more checks?  Also, `data + 3` is kinda messy. */
+		/* TODO: more checks?  Also, `next` computation is kinda messy. */
 	}
 	/*
 	WITH_VERBOSE {