From 37f59b46ecac0d74b043025a107dac038555f826 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Fri, 7 Aug 2020 10:16:18 +0200 Subject: [PATCH] doh: adjust endpoint kinds Make "doh2" the DNS-over-HTTPS C implementation and remove plain HTTP until fully supported. --- daemon/bindings/net.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/daemon/bindings/net.c b/daemon/bindings/net.c index 1e6a992fb..1e9fbf87e 100644 --- a/daemon/bindings/net.c +++ b/daemon/bindings/net.c @@ -196,20 +196,12 @@ static int net_listen(lua_State *L) const char *k = lua_tostring(L, -1); if (k && strcasecmp(k, "dns") == 0) { tls = http = false; - } else - if (k && strcasecmp(k, "tls") == 0) { + } else if (k && strcasecmp(k, "tls") == 0) { tls = true; http = false; - } else - //TODO temporary moved HTTP (without TLS) here - if (k && strcasecmp(k, "http") == 0) { - tls = false; - http = true; - } else - if (k && strcasecmp(k, "doh") == 0) { + } else if (k && strcasecmp(k, "doh2") == 0) { tls = http = true; - } else - if (k) { + } else if (k) { kind = k; } } -- 2.47.2