show original variable definitions in dump output

PolicyConfig.variables removed
PolicyConfig.eval merged to PolicyConfig.expand

1 files changed, 15 insertions, 13 deletions

diff --git a/awall-cli b/awall-cli
index 5993f60..16d08cb 100755
--- a/awall-cli
+++ b/awall-cli
@@ -121,22 +121,24 @@ config = policyset:load()
 
 if mode == 'dump' then
    require 'json'
-
-   function dump(title, data)
-      print(title..':')
-      local lines = {}
-      for k, v in pairs(data) do
-	 table.insert(lines, k..' = '..json.encode(v))
+   expconfig = config:expand()
+
+   for i, section in ipairs({'variable', 'zone'}) do
+      if config.data[section] then
+	 print(string.upper(string.sub(section, 1, 1))..string.sub(section, 2, -1)..'s:')
+	 lines = {}
+	 for k, v in pairs(config.data[section]) do
+	    def = json.encode(v)
+	    exp = json.encode(expconfig[section][k])
+	    if exp ~= def then def = def..' = '..exp end
+	    table.insert(lines, k..' = '..def)
+	 end
+	 table.sort(lines)
+	 for i, line in ipairs(lines) do print(line) end
+	 print()
       end
-      table.sort(lines)
-      for i, line in ipairs(lines) do print(line) end
-      print()
    end
 
-   dump('Variables', config:variables())
-   config = config:expand()
-   dump('Zones', config.zone)
-
    os.exit()
 end