Explorar el Código

Merge branch 'feat-orderhooks' into devel

Edvinas Valatka hace 9 años
padre
commit
4de61c1bc0
Se han modificado 2 ficheros con 9 adiciones y 11 borrados
  1. 4 0
      config
  2. 5 11
      e-router

+ 4 - 0
config

@@ -34,3 +34,7 @@ logforward=true
 debugtcp=true
 debugudp=true
 debugicmp=true
+
+
+## default hook order ##
+# hooks="set_defaults setup_whitenets setup_nat setup_forward setup_base setup_badips setup_white setup_open setup_scanips setup_cast setup_final"

+ 5 - 11
e-router

@@ -131,17 +131,11 @@ setup_cast() {
 }
 
 main () {
-    set_defaults
-    setup_whitenets
-    setup_nat
-    setup_forward
-    setup_base
-    setup_badips
-    setup_white
-    setup_open
-    setup_scanips
-    setup_cast
-    setup_final
+   defaultHooks="set_defaults setup_whitenets setup_nat setup_forward setup_base setup_badips setup_white setup_open setup_scanips setup_cast setup_final"
+    hookarray=(${hooks:-$defaultHooks})
+    for hook in "${hookarray[@]}" ; do
+        $hook
+    done
 }
 
 main