From 9f1af0be2e0f546ef10601df189988c069107963 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 21 Jan 2022 17:57:47 +0100 Subject: net.connect: Allow passing TLS context from resolver Only allowing it to be passed directly makes it hard to combine plain (i.e. starttls) and Direct TLS connections in the same connection resolution procedure. But now we can, using chained resolvers! --- net/connect.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'net') diff --git a/net/connect.lua b/net/connect.lua index dbdd3ce6..4b602be4 100644 --- a/net/connect.lua +++ b/net/connect.lua @@ -42,7 +42,8 @@ local function attempt_connection(p) return; end p:log("debug", "Next target to try is %s:%d", ip, port); - local conn, err = server.addclient(ip, port, pending_connection_listeners, p.options.pattern or "*a", p.options.sslctx, conn_type, extra); + local conn, err = server.addclient(ip, port, pending_connection_listeners, p.options.pattern or "*a", + extra and extra.sslctx or p.options.sslctx, conn_type, extra); if not conn then log("debug", "Connection attempt failed immediately: %s", err); p.last_error = err or "unknown reason"; -- cgit v1.2.3