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

diff --git a/daemon/bindings/net.c b/daemon/bindings/net.c
index 0d9d65c953c3634053fc6474cf63fd0b13455ed0..b84c095b4e9acc365825493a1d8b533b512fe21d 100644 (file)
--- 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 041ae69e4e214dcabe24bea058afc25707458da6..7fff3d1e5cc1b8f157d85e0f71081506c7dd9cc5 100644 (file)
--- 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