From a6e1b5526a0cf52e8aabdf043f6447e6e3293856 Mon Sep 17 00:00:00 2001 From: Kaarle Ritvanen Date: Fri, 22 Feb 2019 11:04:07 +0200 Subject: dmvpn-ca: scan_name_token function --- dmvpn-ca | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'dmvpn-ca') diff --git a/dmvpn-ca b/dmvpn-ca index 433b57d..3b4b405 100755 --- a/dmvpn-ca +++ b/dmvpn-ca @@ -463,11 +463,9 @@ function scan_subnet() return addr end -function scan_choice(choices, desc) - local token = scan_next(desc) - if not token then return end - for k, v in pairs(choices) do if token == k then return v end end - syntax_error('Invalid '..desc..': '..token) +function scan_name_token() + local token = scan_next('attribute') + if token ~= 'name' then syntax_error('Invalid attribute: '..token) end end function scan_param(choices, desc, optional) @@ -821,13 +819,11 @@ commands = { unset={ 'name ', function() - local k = scan_choice( - {name='name'}, 'attribute' - ) + scan_name_token() local site = scan_site() scan_finished() - update('site', {[k]=false}, {code=site}) + update('site', {name=false}, {code=site}) end }, show={ @@ -935,7 +931,7 @@ commands = { unset={ 'name site id ', function() - scan_choice({name=true}, 'attribute') + scan_name_token() local vpnc = scan_vpnc{id_attr='id'} scan_finished() @@ -1030,7 +1026,7 @@ commands = { unset={ 'name ', function() - scan_choice({name=true}, 'attribute') + scan_name_token() local id = toid(scan_next('hub number')) scan_finished() -- cgit v1.2.3