Software /
code /
prosody
Changeset
8469:52d48cea1f60
util.ip: Remove redundant caching of method output (supposed to be done in ab9ddfb03d4d but lost somehow)
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 09 Dec 2017 20:56:37 +0100 (2017-12-09) |
parents | 8468:5bfe58539b6c |
children | 8470:81f894d08b17 |
files | util/ip.lua |
diffstat | 1 files changed, 7 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/util/ip.lua Sat Dec 09 20:53:37 2017 +0100 +++ b/util/ip.lua Sat Dec 09 20:56:37 2017 +0100 @@ -172,36 +172,27 @@ end function ip_methods:label() - local value; if self.proto == "IPv4" then - value = label(self.toV4mapped); + return label(self.toV4mapped); else - value = label(self); + return label(self); end - self.label = value; - return value; end function ip_methods:precedence() - local value; if self.proto == "IPv4" then - value = precedence(self.toV4mapped); + return precedence(self.toV4mapped); else - value = precedence(self); + return precedence(self); end - self.precedence = value; - return value; end function ip_methods:scope() - local value; if self.proto == "IPv4" then - value = v4scope(self); + return v4scope(self); else - value = v6scope(self); + return v6scope(self); end - self.scope = value; - return value; end local rfc1918_8 = new_ip("10.0.0.0"); @@ -212,9 +203,8 @@ function ip_methods:private() local private = self.scope ~= 0xE; if not private and self.proto == "IPv4" then - private = match(self, rfc1918_8, 8) or match(self, rfc1918_12, 12) or match(self, rfc1918_16) or match(self, rfc6598, 10); + return match(self, rfc1918_8, 8) or match(self, rfc1918_12, 12) or match(self, rfc1918_16) or match(self, rfc6598, 10); end - self.private = private; return private; end