From 68b9f291318cf704fdad177751223443a83bec75 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 22 Nov 2015 15:30:27 +0000 Subject: util.ip: Improve comparison, == doesn't necessarily handle IPv6 addresses correctly if they aren't normalized (case, ::, etc.) --- util/ip.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/util/ip.lua b/util/ip.lua index d0ae07eb..7dcace5c 100644 --- a/util/ip.lua +++ b/util/ip.lua @@ -229,13 +229,10 @@ end local function match(ipA, ipB, bits) local common_bits = commonPrefixLength(ipA, ipB); - if not bits then - return ipA == ipB; - end if bits and ipB.proto == "IPv4" then common_bits = common_bits - 96; -- v6 mapped addresses always share these bits end - return common_bits >= bits; + return common_bits >= (bits or 128); end return {new_ip = new_ip, -- cgit v1.2.3 From c3b43754d587da5a1f8c474990ebcb3642deadab Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 22 Nov 2015 15:31:22 +0000 Subject: mod_admin_telnet: c2s:show(): Add flag to indicate remote sessions --- plugins/mod_admin_telnet.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 6a5f87d4..16bc786d 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -512,6 +512,9 @@ local function session_flags(session, line) if session.ip and session.ip:match(":") then line[#line+1] = "(IPv6)"; end + if session.remote then + line[#line+1] = "(remote)"; + end return table.concat(line, " "); end -- cgit v1.2.3