Commit 6ff7a43e authored by Kaarle Ritvanen's avatar Kaarle Ritvanen

Log: allow spaces in prefix

parent 5a4cb73b
...@@ -551,8 +551,7 @@ function M.Rule:trules() ...@@ -551,8 +551,7 @@ function M.Rule:trules()
if not self.string.match then self:error('String match not defined') end if not self.string.match then self:error('String match not defined') end
setdefault(self.string, 'algo', 'bm') setdefault(self.string, 'algo', 'bm')
local opts = '-m string --string "'.. local opts = '-m string --string '..util.quote(self.string.match)
self.string.match:gsub('(["\\])', '\\%1')..'"'
for _, attr in ipairs{'algo', 'from', 'to'} do for _, attr in ipairs{'algo', 'from', 'to'} do
if self.string[attr] then if self.string[attr] then
......
...@@ -9,13 +9,13 @@ local model = require('awall.model') ...@@ -9,13 +9,13 @@ local model = require('awall.model')
local class = model.class local class = model.class
local combinations = require('awall.optfrag').combinations local combinations = require('awall.optfrag').combinations
local setdefault = require('awall.util').setdefault local util = require('awall.util')
local LogLimit = class(model.Limit) local LogLimit = class(model.Limit)
function LogLimit:init(...) function LogLimit:init(...)
setdefault(self, 'src-mask', false) util.setdefault(self, 'src-mask', false)
LogLimit.super(self):init(...) LogLimit.super(self):init(...)
end end
...@@ -74,7 +74,11 @@ function Log:target() ...@@ -74,7 +74,11 @@ function Log:target()
local res = mode:upper() local res = mode:upper()
for s, t in pairs(optmap[mode]) do for s, t in pairs(optmap[mode]) do
if self[s] then res = res..' --'..mode..'-'..t..' '..self[s] end local value = self[s]
if value then
if s == 'prefix' then value = util.quote(value) end
res = res..' --'..mode..'-'..t..' '..value
end
end end
return res return res
end end
......
--[[ --[[
Utility module for Alpine Wall Utility module for Alpine Wall
Copyright (C) 2012-2016 Kaarle Ritvanen Copyright (C) 2012-2017 Kaarle Ritvanen
See LICENSE file for license details See LICENSE file for license details
]]-- ]]--
...@@ -116,6 +116,9 @@ function M.join(a, sep, b) ...@@ -116,6 +116,9 @@ function M.join(a, sep, b)
end end
function M.quote(s) return '"'..s:gsub('(["\\])', '\\%1')..'"' end
function M.printtabulars(tables) function M.printtabulars(tables)
local colwidth = {} local colwidth = {}
for i, tbl in ipairs(tables) do for i, tbl in ipairs(tables) do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment