X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=ipset-control.lsp;h=cd813840eb3fbe52300b75b1e7aa5ad2a7499a22;hb=36d9d2fd887f26b87c5d20527fcb741540a2aae1;hp=899e37af2fbec9f633b39d3f57b0b628d6dabb56;hpb=d0a5e6f8bb58cd5ed78b293bffaeae3398e1e4ab;p=rrq%2Fhourglass.git

diff --git a/ipset-control.lsp b/ipset-control.lsp
index 899e37a..cd81384 100644
--- a/ipset-control.lsp
+++ b/ipset-control.lsp
@@ -1,10 +1,10 @@
 
 # Should load from "ipset.cfg"
-(constant 'IPSET "/sbin/ipset" 'TABLE "TIMO" )
+(constant 'IPSET SITE:ipset.bin 'TABLE SITE:ipset.table NET SITE:control.net)
 
 ;; Return current low-leve "close" or "open" status
 (define (current-status)
-  (if (exec (format "%s list %s | grep %s" IPSET TABLE NET)) "close" "open"))
+  (if (member NET (exec (format "%s list %s" IPSET TABLE))) "close" "open"))
 
 ;; Ensure low-level setting is "close" or "open" as given
 (define (control cmd reason)