Commit f02077c7 authored by Kaarle Ritvanen's avatar Kaarle Ritvanen

Log: allow spaces in prefix

parent 49be2996
......@@ -2,7 +2,7 @@
--[[
Alpine Wall
Copyright (C) 2012-2016 Kaarle Ritvanen
Copyright (C) 2012-2017 Kaarle Ritvanen
See LICENSE file for license details
]]--
......@@ -20,7 +20,7 @@ if not table.unpack then table.unpack = unpack end
function help()
io.stderr:write([[
Alpine Wall
Copyright (C) 2012-2016 Kaarle Ritvanen
Copyright (C) 2012-2017 Kaarle Ritvanen
This is free software with ABSOLUTELY NO WARRANTY,
available under the terms of the GNU General Public License, version 2
......
--[[
Packet logging module for Alpine Wall
Copyright (C) 2012-2016 Kaarle Ritvanen
Copyright (C) 2012-2017 Kaarle Ritvanen
See LICENSE file for license details
]]--
......@@ -9,13 +9,13 @@ local model = require('awall.model')
local class = model.class
local combinations = require('awall.optfrag').combinations
local setdefault = require('awall.util').setdefault
local util = require('awall.util')
local LogLimit = class(model.Limit)
function LogLimit:init(...)
setdefault(self, 'mask', 0)
util.setdefault(self, 'mask', 0)
LogLimit.super(self):init(...)
end
......@@ -74,7 +74,11 @@ function Log:target()
local res = mode:upper()
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
return res
end
......
--[[
Utility module for Alpine Wall
Copyright (C) 2012-2016 Kaarle Ritvanen
Copyright (C) 2012-2017 Kaarle Ritvanen
See LICENSE file for license details
]]--
......@@ -116,6 +116,9 @@ function M.join(a, sep, b)
end
function M.quote(s) return '"'..s:gsub('(["\\])', '\\%1')..'"' end
function M.printtabulars(tables)
local colwidth = {}
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