Use array for hooks

config

@@ -44,7 +44,20 @@ debugudp=true
 debugicmp=true
 
 ## default hook order ##
-# hooks="set_defaults lan setup_whitenets setup_forward setup_badips setup_white setup_public setup_scanips setup_cast setup_final"
+hooks=(
+base
+lan
+setup_wandroplog
+setup_fordroplog
+setup_whitenets
+setup_forward
+setup_badips
+setup_white
+setup_public
+setup_scanips
+setup_cast
+final
+)
 
 ## Default iptables invocation command ##
 #IPTABLESCMD="iptables -w"

e-router

@@ -5,7 +5,7 @@ confd=/etc/e-router
 iptables="${IPTABLESCMD:-iptables -w}"
 source $confd/config
 
-set_defaults() {
+base() {
     /usr/lib/systemd/scripts/iptables-flush
     ${iptables} -P INPUT DROP
     ${iptables} -P FORWARD DROP
@@ -15,7 +15,7 @@ set_defaults() {
     ${iptables} -A INPUT -m conntrack --ctstate INVALID -j DROP
 }
 
-setup_final(){
+final(){
     if $loginput ; then
         ${iptables} -A INPUT -j WAN-LOG-DROP
     fi
@@ -154,9 +154,7 @@ setup_cast() {
 }
 
 main () {
-    defaultHooks="set_defaults lan setup_wandroplog setup_fordroplog setup_whitenets setup_forward setup_badips setup_white setup_public setup_scanips setup_cast setup_final"
-    hookarray=(${hooks:-$defaultHooks})
-    for hook in "${hookarray[@]}" ; do
+    for hook in "${hooks[@]}" ; do
         $hook
     done
 }