model: make '_' and '-' interchangeable in model field namesv0.2.1

1 files changed, 13 insertions, 13 deletions

diff --git a/acf2/modules/awall.lua b/acf2/modules/awall.lua
index 071db57..45c3674 100644
--- a/acf2/modules/awall.lua
+++ b/acf2/modules/awall.lua
@@ -1,5 +1,5 @@
 --[[
-Copyright (c) 2012-2013 Kaarle Ritvanen
+Copyright (c) 2012-2014 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
@@ -27,15 +27,15 @@ IPSet.range = M.Range{type=M.net.IPv4Address}
 local Service = M.new()
 Service.proto = M.String{required=true, ui_name='Protocol'}
 Service.port = M.Set{type=M.Range{type=M.net.Port}}
-Service['icmp-type'] = M.String{ui_name='ICMP type'}
-Service['ct-helper'] = M.String{ui_name='Connection tracking helper'}
+Service.icmp_type = M.String{ui_name='ICMP type'}
+Service.ct_helper = M.String{ui_name='Connection tracking helper'}
 
 -- TODO fw zone
 
 local Zone = M.new()
 Zone.iface = M.Set{type=M.String, ui_name='Interfaces'}
 Zone.addr = M.Set{type=M.String, ui_name='Addresses'}
-Zone['route-back'] = M.Boolean{default=false}
+Zone.route_back = M.Boolean{default=false}
 
 local LogClass = M.new()
 LogClass.mode = M.String{
@@ -85,17 +85,17 @@ Limit.interval = M.Integer
 Limit.log = M.Reference{scope='../../../log'}
 
 local FilterRule = M.new(PolicyRule)
-FilterRule['conn-limit'] = M.Model{model=Limit, ui_name='Connection limit'}
-FilterRule['flow-limit'] = M.Model{model=Limit, ui_name='Flow limit'}
+FilterRule.conn_limit = M.Model{model=Limit, ui_name='Connection limit'}
+FilterRule.flow_limit = M.Model{model=Limit, ui_name='Flow limit'}
 FilterRule.dnat = M.net.IPv4Address{ui_name='DNAT target'}
-FilterRule['no-track'] = M.Boolean{default=false, ui_name='CT bypass'}
+FilterRule.no_track = M.Boolean{default=false, ui_name='CT bypass'}
 FilterRule.related = M.List{type=Rule, ui_name='Related packet rules'}
 
 local DivertRule = M.new(Rule)
-DivertRule['to-port'] = M.Range{type=M.net.Port, ui_name='Target port'}
+DivertRule.to_port = M.Range{type=M.net.Port, ui_name='Target port'}
 
 local NATRule = M.new(DivertRule)
-NATRule['to-addr'] = M.Range{type=M.net.IPv4Address, ui_name='Target address'}
+NATRule.to_addr = M.Range{type=M.net.IPv4Address, ui_name='Target address'}
 
 local MarkRule = M.new(Rule)
 MarkRule.mark = M.Integer{required=true}
@@ -112,7 +112,7 @@ AWall.log = M.Collection{
    type=LogClass, ui_name='Log classes', ui_member='Log class'
 }
 AWall.policy = M.List{type=PolicyRule, ui_name='Policies', ui_member='Policy'}
-AWall['packet-log'] = M.List{
+AWall.packet_log = M.List{
    type=PacketLogRule, ui_name='Logging', ui_member='Logging rule'
 }
 AWall.filter = M.List{type=FilterRule}
@@ -121,7 +121,7 @@ AWall.snat = M.List{type=NATRule, ui_name='SNAT', ui_member='SNAT rule'}
 AWall.mark = M.List{
    type=MarkRule, ui_name='Packet marking', ui_member='Packet marking rule'
 }
-AWall['route-track'] = M.List{
+AWall.route_track = M.List{
    type=MarkRule, ui_name='Route tracking', ui_member='Route tracking rule'
 }
 AWall.tproxy = M.List{
@@ -129,10 +129,10 @@ AWall.tproxy = M.List{
    ui_name='Transparent proxy',
    ui_member='Transparent proxy rule'
 }
-AWall['clamp-mss'] = M.List{
+AWall.clamp_mss = M.List{
    type=ClampMSSRule, ui_name='MSS clamping', ui_member='MSS clamping rule'
 }
-AWall['no-track'] = M.List{
+AWall.no_track = M.List{
    type=Rule, ui_name='CT bypass', ui_member='Connection tracking bypass rule'
 }
 AWall.ipset = M.Collection{type=IPSet, ui_name='IP sets', ui_member='IP set'}