From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 11 Sep 2020 10:15:32 +0000 (+0200)
Subject: daemon/bindings: assign doh2 kind in net.list()
X-Git-Tag: v5.2.0~15^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22245367bb8acc9066816b9731560cd7abfcb42;p=thirdparty%2Fknot-resolver.git

daemon/bindings: assign doh2 kind in net.list()
---

diff --git a/daemon/bindings/net.c b/daemon/bindings/net.c
index 0d9d65c95..b84c095b4 100644
--- a/daemon/bindings/net.c
+++ b/daemon/bindings/net.c
@@ -22,6 +22,8 @@ static int net_list_add(const char *key, void *val, void *ext)
 
 		if (ep->flags.kind) {
 			lua_pushstring(L, ep->flags.kind);
+		} else if (ep->flags.http && ep->flags.tls) {
+			lua_pushliteral(L, "doh2");
 		} else if (ep->flags.tls) {
 			lua_pushliteral(L, "tls");
 		} else {
diff --git a/daemon/lua/postconfig.lua b/daemon/lua/postconfig.lua
index 041ae69e4..7fff3d1e5 100644
--- a/daemon/lua/postconfig.lua
+++ b/daemon/lua/postconfig.lua
@@ -9,7 +9,10 @@ local function count_sockets()
 	for _, socket in ipairs(net.list()) do
 		if socket.kind == 'control' then
 			control_socks = control_socks + 1
-		elseif socket.kind == 'dns' or socket.kind == 'tls' or socket.kind == 'doh' then
+		elseif (socket.kind == 'dns' or
+			socket.kind == 'tls' or
+			socket.kind == 'doh' or
+			socket.kind == 'doh2') then
 			dns_socks = dns_socks + 1
 		end
 	end