From 34556c69639eca2b84eb390d8fd380cefba6ae36 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 3 Jan 2016 17:19:14 +0100 Subject: server_select: Forward the actual TLS handshake error message --- net/server_select.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/server_select.lua b/net/server_select.lua index 87921df4..d9826c02 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -589,8 +589,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport coroutine_yield( ) -- handshake not finished end end - out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") ) - _ = handler and handler:force_close("ssl handshake failed") + err = "ssl handshake error: " .. ( err or "handshake too long" ); + out_put( "server.lua: ", err ); + _ = handler and handler:force_close(err) return false, err -- handshake failed end ) -- cgit v1.2.3 From 8cdb2d4f94348e89a2fda84f3ba877cd3d88d987 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 3 Jan 2016 17:22:58 +0100 Subject: mod_admin_adhoc: Remove extra ) that should not be there --- plugins/mod_admin_adhoc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua index fdbdf462..8349a383 100644 --- a/plugins/mod_admin_adhoc.lua +++ b/plugins/mod_admin_adhoc.lua @@ -390,7 +390,7 @@ local function session_flags(session, line) flags[#flags+1] = "encrypted"; end if session.compressed then - flags[#flags+1] = "compressed)"; + flags[#flags+1] = "compressed"; end if session.smacks then flags[#flags+1] = "sm"; -- cgit v1.2.3 From d0bf02ff6639f9cd0cea23848e74361bad19640d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 3 Jan 2016 17:48:36 +0100 Subject: mod_admin_adhoc: Show only connections to/from the host the command was run on --- plugins/mod_admin_adhoc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua index 8349a383..392e715e 100644 --- a/plugins/mod_admin_adhoc.lua +++ b/plugins/mod_admin_adhoc.lua @@ -422,7 +422,7 @@ local function list_s2s_this_handler(self, data, state) local sess_lines = { r = remotehost, session_flags(session, { "", direction, remotehost or "?" })}; - if remotehost:match(module_host) or localhost:match(module_host) then + if localhost == module_host then s2s_list[#s2s_list+1] = sess_lines; end end -- cgit v1.2.3