diff options
-rw-r--r-- | plugins/mod_admin_telnet.lua | 3 | ||||
-rw-r--r-- | util/ip.lua | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 16b16e88..e2aaa7bc 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 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, |