validate_config

Author: Anonym-tsk

VERSION

@@ -1 +1 @@
-2.10.1
+2.10.0

etc/init.d/common

@@ -86,6 +86,29 @@ reload_service() {
   kill -1 $(cat "$PIDFILE")
 }
 
+validate_config() {
+  if [[ "$NFQWS_ARGS" =~ "--new" ]]; then
+    echo "Using --new in NFQWS_ARGS is not allowed. Use NFQWS_ARGS_CUSTOM instead"
+    return 1
+  fi
+  if [[ "$NFQWS_ARGS_QUIC" =~ "--new" ]]; then
+    echo "Using --new in NFQWS_ARGS_QUIC is not allowed. Use NFQWS_ARGS_CUSTOM instead"
+    return 1
+  fi
+  if [[ "$NFQWS_ARGS_UDP" =~ "--new" ]]; then
+    echo "Using --new in NFQWS_ARGS_UDP is not allowed. Use NFQWS_ARGS_CUSTOM instead"
+    return 1
+  fi
+  if [[ "$NFQWS_EXTRA_ARGS" =~ "--new" ]]; then
+    echo "Using --new in NFQWS_EXTRA_ARGS is not allowed. Use NFQWS_ARGS_CUSTOM instead"
+    return 1
+  fi
+  if [[ "$NFQWS_ARGS_IPSET" =~ "--new" ]]; then
+    echo "Using --new in NFQWS_ARGS_IPSET is not allowed. Use NFQWS_ARGS_CUSTOM instead"
+    return 1
+  fi
+}
+
 create_running_config() {
   local MARK=$(/bin/ndmc -c show ip policy 2>&1 | grep -i "description = $POLICY_NAME:" -A 1 | grep 'mark:' | grep -o '[^ ]*$' | head -n 1)
   if [ -n "$MARK" ]; then

etc/init.d/entware-end

@@ -4,6 +4,7 @@ start() {
     return 1
   fi
 
+  validate_config || return 1
   create_running_config
   kernel_modules
 

etc/init.d/openwrt-end

@@ -13,6 +13,7 @@ extra_command "firewall_stop" "Unload firewall rules"
 extra_command "kernel_modules" "Load kernel modules"
 
 start_service() {
+  validate_config || return 1
   create_running_config
   kernel_modules