X-Git-Url: http://git.squeep.com/?p=firewall-squeep;a=blobdiff_plain;f=common.sh;h=5c2ed1a56e052dc5b53a08e20dfeb4e4099e49d0;hp=312ecdb0c75e10ce793857cd92c41484615f1264;hb=HEAD;hpb=7d8df9591bffec6168521f59b40fab44097ca9b7

diff --git a/common.sh b/common.sh
index 312ecdb..5c2ed1a 100644
--- a/common.sh
+++ b/common.sh
@@ -19,7 +19,7 @@ die(){
 }
 
 function decommentcat(){
-	sed 's/\s*#.*$//;/^\s*$/d' "$@"
+	cat "$@" | sed 's/\s*#.*$//;/^\s*$/d'
 }
 
 function create_set(){
@@ -78,7 +78,40 @@ function insert_setmatch_rules(){
 	done
 }
 
+# try to recreate sets faster than one-at-a-time by generating restore rules
+function ipset_restore_from_cidr(){
+	local vmatch
+	local set_name="$1"
+
+	for v in '' '6'
+	do
+		case "$v" in
+		6) vmatch=':';;
+		*) vmatch='\.';;
+		esac
+		# extract existing set configuration to create temporary set
+		(set -o pipefail; $IPSET save "${set_name}${v}" 2>/dev/null | grep -m 1 '^create ' | sed "s/\(create ${set_name}${v}\)/\1-tmp/") || continue
+		# populate with new data
+		decommentcat "${set_name}.cidr" "${set_name}.cidr.$(hostname -s)" 2>/dev/null | sed -n 's/\(.*'"${vmatch}"'.*\)/add '"${set_name}${v}-tmp"' \1/p' | sort -n | uniq
+	done
+}
+
 function reload_cidr_sets(){
+	local v n
+	local set_name="$1"
+
+	ipset_restore_from_cidr "${set_name}" | ipset restore
+        for v in '' 6
+        do
+                n="${set_name}${v}"
+                $IPSET swap "${n}-tmp" "${n}"
+                $IPSET destroy "${n}-tmp"
+                $IPSET list -t "${n}"
+        done
+}
+
+function _old_reload_cidr_sets(){
+	local sfx n s v
 	local set_name="$1"
 	shift
 
@@ -133,7 +166,7 @@ function allow_services(){
 		case "${s}" in
 		*/*)	add_service_entry "${s}"
 			;;
-		*)	for svc in $(getent services "${s}" | awk '{print $2}')
+		*)	for svc in $(egrep "^${s}\s+" /etc/services | decommentcat | awk '{print $2}')
 			do
 				add_service_entry "${svc}"
 			done