X-Git-Url: http://git.squeep.com/?p=firewall-squeep;a=blobdiff_plain;f=trusted.sh;h=72f146796c1af2d2285a22e492866253858c56dd;hp=9d15eaa802b4ddafd2e737163906384ef20b7361;hb=3943c9626bd2f4b0829c666406340852cfca66e8;hpb=0f864e054ebdb2c6606721dc49db867fe93cb61e

diff --git a/trusted.sh b/trusted.sh
index 9d15eaa..72f1467 100755
--- a/trusted.sh
+++ b/trusted.sh
@@ -16,41 +16,9 @@ then
 fi
 
 create_set "${set_name}" hash:net
-create_set "${set_name}" hash:net family inet6
+create_set "${set_name}6" hash:net family inet6
 
+insert_setmatch_rules "${set_name}" -j ACCEPT
 
-if ! $IPTABLES -C INPUT -m set --match-set "${set_name}" src -j ACCEPT >/dev/null 2>&1
-then
-	echo "initializing rule '${set_name}'"
-	$IPTABLES -I INPUT -m set --match-set "${set_name}" src -j ACCEPT
-fi
-
-
-if ! $IP6TABLES -C INPUT -m set --match-set "${set_name}6" src -j ACCEPT >/dev/null 2>&1
-then
-	echo "initializing rule '${set_name}6'"
-	$IP6TABLES -I INPUT -m set --match-set "${set_name}6" src -j ACCEPT
-fi
+reload_cidr_sets "${set_name}"
 
-if [ -e "${set_name}.cidr" ]
-then
-	echo "updating set '${set_name}'"
-	$IPSET create "${set_name}-tmp" hash:net
-	for s in $(decommentcat "${set_name}.cidr" | grep '\.')
-	do
-        	$IPSET add "${set_name}-tmp" "${s}"
-	done
-	$IPSET swap "${set_name}-tmp" "${set_name}"
-	$IPSET destroy "${set_name}-tmp"
-	$IPSET list -t "${set_name}"
-
-	echo "updating set '${set_name}6'"
-	$IPSET create "${set_name}6-tmp" hash:net family inet6
-	for s in $(decommentcat "${set_name}.cidr" | grep '\:')
-	do
-        	$IPSET add "${set_name}6-tmp" "${s}"
-	done
-	$IPSET swap "${set_name}6-tmp" "${set_name}6"
-	$IPSET destroy "${set_name}6-tmp"
-	$IPSET list -t "${set_name}6"
-fi