diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2018-12-13 21:28:43 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2019-02-02 19:55:31 +0200 |
| commit | 369e3ddba0fd3abf5d0613aebf07975710c1837b (patch) | |
| tree | 04e16e521c239557cb39080910453764b565fc2d | |
| parent | 06c16f1444e264007a22f48ef1c9cfedab1383e5 (diff) | |
| download | awall-369e3ddba0fd3abf5d0613aebf07975710c1837b.tar.bz2 awall-369e3ddba0fd3abf5d0613aebf07975710c1837b.tar.xz | |
optfrag: rename constant: FAMILYFRAGS
| -rw-r--r-- | awall/model.lua | 2 | ||||
| -rw-r--r-- | awall/modules/mark.lua | 4 | ||||
| -rw-r--r-- | awall/modules/tproxy.lua | 4 | ||||
| -rw-r--r-- | awall/optfrag.lua | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/awall/model.lua b/awall/model.lua index 8daffa9..bf09402 100644 --- a/awall/model.lua +++ b/awall/model.lua @@ -591,7 +591,7 @@ function M.Rule:trules() end ofrags = filter( - combinations(ofrags, optfrag.FAMILYFRAGS), + combinations(ofrags, optfrag.FAMILIES), function(r) return self:trulefilter(r) end ) diff --git a/awall/modules/mark.lua b/awall/modules/mark.lua index ed6a417..4bcafb3 100644 --- a/awall/modules/mark.lua +++ b/awall/modules/mark.lua @@ -1,6 +1,6 @@ --[[ Packet marking module for Alpine Wall -Copyright (C) 2012-2017 Kaarle Ritvanen +Copyright (C) 2012-2019 Kaarle Ritvanen See LICENSE file for license details ]]-- @@ -40,7 +40,7 @@ end local function restoremark(config) if list(config['route-track'])[1] then return combinations( - optfrag.FAMILYFRAGS, + optfrag.FAMILIES, {{chain='OUTPUT'}, {chain='PREROUTING'}}, { { diff --git a/awall/modules/tproxy.lua b/awall/modules/tproxy.lua index 69ec9d6..601d116 100644 --- a/awall/modules/tproxy.lua +++ b/awall/modules/tproxy.lua @@ -1,6 +1,6 @@ --[[ Transparent proxy module for Alpine Wall -Copyright (C) 2012-2017 Kaarle Ritvanen +Copyright (C) 2012-2019 Kaarle Ritvanen See LICENSE file for license details ]]-- @@ -59,7 +59,7 @@ local function divert(config) ofrags, {chain='PREROUTING', match='-m socket', target='divert'} ) - return combinations(optfrag.FAMILYFRAGS, {{table='mangle'}}, ofrags) + return combinations(optfrag.FAMILIES, {{table='mangle'}}, ofrags) end end diff --git a/awall/optfrag.lua b/awall/optfrag.lua index 1ca4796..f63cb3f 100644 --- a/awall/optfrag.lua +++ b/awall/optfrag.lua @@ -16,7 +16,7 @@ local function ffrags(families) return map(families, function(f) return {family=f} end) end -M.FAMILYFRAGS = ffrags(FAMILIES) +M.FAMILIES = ffrags(FAMILIES) function M.combinations(of1, ...) local arg = {...} |