From 9be5cb3fbdffc7c19ade04d635501cbea1be3af7 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 25 Jun 2020 17:56:48 +0200
Subject: net.unbound: Strip support for legacy net.server APIs

These are not needed since the watchfd API is provided by all net.server
backends.
---
 net/unbound.lua | 40 +++-------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

(limited to 'net')

diff --git a/net/unbound.lua b/net/unbound.lua
index df26cd36..dbf010ea 100644
--- a/net/unbound.lua
+++ b/net/unbound.lua
@@ -12,8 +12,6 @@ local s_format = string.format;
 local s_lower = string.lower;
 local s_upper = string.upper;
 local noop = function() end;
-local zero = function() return 0 end;
-local truop = function() return true; end;
 
 local log = require "util.logger".init("unbound");
 local net_server = require "net.server";
@@ -47,41 +45,9 @@ end
 -- Note: libunbound will default to using root hints if resolvconf is unset
 
 local function connect_server(unbound, server)
-	if server.watchfd then
-		return server.watchfd(unbound, function ()
-			unbound:process()
-		end);
-	elseif server.event and server.addevent then
-		local EV_READ = server.event.EV_READ;
-		local function event_callback()
-			unbound:process();
-			return EV_READ;
-		end
-		return server.addevent(unbound:getfd(), EV_READ, event_callback)
-	elseif server.wrapclient then
-		local conn = {
-			getfd = function()
-				return unbound:getfd();
-			end,
-
-			send = zero,
-			receive = noop,
-			settimeout = noop,
-			close = truop,
-		}
-
-		local function process()
-			unbound:process();
-		end
-		local listener = {
-			onincoming = process,
-
-			onconnect = noop,
-			ondisconnect = noop,
-			onreadtimeout = truop,
-		};
-		return server.wrapclient(conn, "dns", 0, listener, "*a" );
-	end
+	return server.watchfd(unbound, function ()
+		unbound:process()
+	end);
 end
 
 local unbound = libunbound.new(unbound_config);
-- 
cgit v1.2.3