Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/libs: fixed contains() in luci.ip

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-08-08 12:38:21 +00:00
parent e080fcebd2
commit 069ac1115d
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libs/core/luasrc/ip.lua
View file

@ -322,17 +322,20 @@ function cidr.prefix( self, mask )
return prefix return prefix
end end
function cidr.network( self ) function cidr.network( self, bits )
local data = { } local data = { }
bits = bits or self[3]
for i = 1, math.floor( self[3] / 16 ) do for i = 1, math.floor( bits / 16 ) do
table.insert( data, self[2][i] ) table.insert( data, self[2][i] )
end end
table.insert( data, bit.band( self[2][1+#data], __mask16(self[3]) ) ) if #data < #self[2] then
table.insert( data, bit.band( self[2][1+#data], __mask16(bits) ) )
for i = #data, #self[2] do for i = #data, #self[2] do
table.insert( data, 0 ) table.insert( data, 0 )
end
end end
return __bless({ self[1], data, __length(self[1]) }) return __bless({ self[1], data, __length(self[1]) })
@ -350,10 +353,12 @@ function cidr.mask( self, bits )
table.insert( data, 0xFFFF ) table.insert( data, 0xFFFF )
end end
table.insert( data, __mask16(bits) ) if #data < #self[2] then
table.insert( data, __mask16(bits) )
for i = #data + 1, #self[2] do for i = #data + 1, #self[2] do
table.insert( data, 0 ) table.insert( data, 0 )
end
end end
return __bless({ self[1], data, __length(self[1]) }) return __bless({ self[1], data, __length(self[1]) })
@ -361,10 +366,9 @@ end
function cidr.contains( self, addr ) function cidr.contains( self, addr )
assert( self[1] == addr[1], "Can't compare IPv4 and IPv6 addresses" ) assert( self[1] == addr[1], "Can't compare IPv4 and IPv6 addresses" )
local mask1 = self:prefix()
local mask2 = addr:prefix() if self:prefix() <= addr:prefix() then
if mask1 <= mask2 then return self:network() == addr:network(self:prefix())
return self:mask(addr:prefix()) == mask2
end end
return false return false