fixes; first version

[rrq/hourglass.git] / ipset-control.lsp

diff --git a/ipset-control.lsp b/ipset-control.lsp
index 899e37af2fbec9f633b39d3f57b0b628d6dabb56..8d931727394da64a567e8bc8aec407093768edfc 100644 (file)
--- 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)