From ab44377fb6d01a2b7ccfab71ebf68b9306bc4df7 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 17 Oct 2023 00:01:38 +0200 Subject: accesslist-duplicates: remove extra check Why did we have that? Possibly for performance? Well, should not be a problem now. --- accesslist-duplicates.capsman.rsc | 4 +--- accesslist-duplicates.local.rsc | 4 +--- accesslist-duplicates.template.rsc | 4 +--- accesslist-duplicates.wifiwave2.rsc | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc index b09ef6a..b986862 100644 --- a/accesslist-duplicates.capsman.rsc +++ b/accesslist-duplicates.capsman.rsc @@ -15,11 +15,10 @@ :global Read; :local Seen ({}); -:local Shown ({}); :foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={ :local Mac [ /caps-man/access-list/get $AccList mac-address ]; - :if ($Seen->$Mac = 1 && $Shown->$Mac != 1) do={ + :if ($Seen->$Mac = 1) do={ /caps-man/access-list/print where mac-address=$Mac; :put "\nNumeric id to remove, any key to skip!"; :local Remove [ :tonum [ $Read ] ]; @@ -27,7 +26,6 @@ :put ("Removing numeric id " . $Remove . "...\n"); /caps-man/access-list/remove $Remove; } - :set ($Shown->$Mac) 1; } :set ($Seen->$Mac) 1; } diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc index bffee5a..b136de3 100644 --- a/accesslist-duplicates.local.rsc +++ b/accesslist-duplicates.local.rsc @@ -15,11 +15,10 @@ :global Read; :local Seen ({}); -:local Shown ({}); :foreach AccList in=[ /interface/wireless/access-list/find where mac-address!="00:00:00:00:00:00" ] do={ :local Mac [ /interface/wireless/access-list/get $AccList mac-address ]; - :if ($Seen->$Mac = 1 && $Shown->$Mac != 1) do={ + :if ($Seen->$Mac = 1) do={ /interface/wireless/access-list/print where mac-address=$Mac; :put "\nNumeric id to remove, any key to skip!"; :local Remove [ :tonum [ $Read ] ]; @@ -27,7 +26,6 @@ :put ("Removing numeric id " . $Remove . "...\n"); /interface/wireless/access-list/remove $Remove; } - :set ($Shown->$Mac) 1; } :set ($Seen->$Mac) 1; } diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc index 28c851c..1e5fc80 100644 --- a/accesslist-duplicates.template.rsc +++ b/accesslist-duplicates.template.rsc @@ -16,7 +16,6 @@ :global Read; :local Seen ({}); -:local Shown ({}); :foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={ :foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={ @@ -24,7 +23,7 @@ :local Mac [ /caps-man/access-list/get $AccList mac-address ]; :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ]; :local Mac [ /interface/wireless/access-list/get $AccList mac-address ]; - :if ($Seen->$Mac = 1 && $Shown->$Mac != 1) do={ + :if ($Seen->$Mac = 1) do={ /caps-man/access-list/print where mac-address=$Mac; /interface/wifiwave2/access-list/print where mac-address=$Mac; /interface/wireless/access-list/print where mac-address=$Mac; @@ -36,7 +35,6 @@ /interface/wifiwave2/access-list/remove $Remove; /interface/wireless/access-list/remove $Remove; } - :set ($Shown->$Mac) 1; } :set ($Seen->$Mac) 1; } diff --git a/accesslist-duplicates.wifiwave2.rsc b/accesslist-duplicates.wifiwave2.rsc index 6897a51..4297898 100644 --- a/accesslist-duplicates.wifiwave2.rsc +++ b/accesslist-duplicates.wifiwave2.rsc @@ -15,11 +15,10 @@ :global Read; :local Seen ({}); -:local Shown ({}); :foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={ :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ]; - :if ($Seen->$Mac = 1 && $Shown->$Mac != 1) do={ + :if ($Seen->$Mac = 1) do={ /interface/wifiwave2/access-list/print where mac-address=$Mac; :put "\nNumeric id to remove, any key to skip!"; :local Remove [ :tonum [ $Read ] ]; @@ -27,7 +26,6 @@ :put ("Removing numeric id " . $Remove . "...\n"); /interface/wifiwave2/access-list/remove $Remove; } - :set ($Shown->$Mac) 1; } :set ($Seen->$Mac) 1; } -- cgit v1.2.3-54-g00ecf