Bump version to v65-20241025

config: luci: Fix merging longstr values (NFQWS_DESYNC_*)
config: Replace static uci-config to dynamic uci-config
2026-01-04 07:38:50 +03:00 · 2024-10-25 14:20:35 +03:00 · 2024-10-25 14:04:12 +03:00 · 2024-10-25 12:15:24 +03:00 · 2024-10-24 15:08:37 +03:00 · 2024-10-24 15:05:36 +03:00
12 changed files with 291 additions and 105 deletions
--- a/luci-app-zapret/Makefile
+++ b/luci-app-zapret/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=luci-app-zapret
-PKG_RELEASE:=20241023
+PKG_RELEASE:=20241025
 PKG_VERSION:=65-$(PKG_RELEASE)
 PKG_LICENSE:=MIT

@@ -13,7 +13,19 @@ LUCI_TITLE:=LuCI support for zapret
 LUCI_DEPENDS:=+zapret
 LUCI_PKGARCH:=all

-#include ../../luci.mk
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	rm -f /tmp/luci-index*
+	rm -rf /tmp/luci-modulecache/
+	#killall -HUP rpcd 2>/dev/null
+	/etc/init.d/rpcd reload
+	/sbin/luci-reload
+	/etc/init.d/uhttpd reload
+fi
+exit 0
+endef
+
 include $(TOPDIR)/feeds/luci/luci.mk

 # call BuildPackage - OpenWrt buildroot signature
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/service.js
@@ -14,19 +14,25 @@ const btn_style_warning  = 'btn cbi-button-negative';
 const btn_style_success  = 'btn cbi-button-success important';

 return view.extend({
-    disableButtons: function(flag, btn, elems = { }) {
-        let btn_enable  = elems.btn_enable  || document.getElementById('btn_enable');
-        let btn_disable = elems.btn_disable || document.getElementById('btn_disable');
-        let btn_start   = elems.btn_start   || document.getElementById('btn_start');
-        let btn_restart = elems.btn_restart || document.getElementById('btn_restart');
-        let btn_stop    = elems.btn_stop    || document.getElementById('btn_stop');
-        let btn_update  = elems.btn_update  || document.getElementById('btn_update');
-        btn_enable.disabled  = flag;
-        btn_disable.disabled = flag;
-        btn_start.disabled   = flag;
-        btn_restart.disabled = flag;
-        btn_stop.disabled    = flag;
-        btn_update.disabled  = true; // TODO
+    get_svc_buttons: function(elems = { }) {
+        return {
+            enable  : elems.btn_enable  || document.getElementById('btn_enable'),
+            disable : elems.btn_disable || document.getElementById('btn_disable'),
+            start   : elems.btn_start   || document.getElementById('btn_start'),
+            restart : elems.btn_restart || document.getElementById('btn_restart'),
+            stop    : elems.btn_stop    || document.getElementById('btn_stop'),
+            update  : elems.btn_update  || document.getElementById('btn_update'),
+        };
+    },
+    
+    disableButtons: function(flag, button, elems = { }) {
+        let btn = this.get_svc_buttons(elems);
+        btn.enable.disabled  = flag;
+        btn.disable.disabled = flag;
+        btn.start.disabled   = flag;
+        btn.restart.disabled = flag;
+        btn.stop.disabled    = flag;
+        btn.update.disabled  = true; // TODO
    },

    getAppStatus: function() {
@@ -34,6 +40,7 @@ return view.extend({
            tools.getInitState(tools.appName),    // svc_state
            fs.exec(tools.execPath, [ 'info' ]),  // svc_info
            fs.exec('/bin/ps'),                   // process list
+            fs.exec('/bin/opkg', [ 'list-installed', '*zapret*' ]),  // installed packages
            uci.load(tools.appName),              // config
        ]).catch(e => {
            ui.addNotification(null, E('p', _('Unable to execute or read contents')
@@ -55,6 +62,7 @@ return view.extend({
        let svc_autorun = status_array[0] ? true : false;
        let svc_info = status_array[1];   // stdout: JSON as text
        let proc_list = status_array[2];  // stdout: multiline text
+        let pkg_list = status_array[3];   // stdout: installed packages
        if (svc_info.code != 0) {
            ui.addNotification(null, E('p', _('Unable to read the service info') + ': setAppStatus()'));
            this.disableButtons(true, null, elems);
@@ -65,37 +73,35 @@ return view.extend({
            this.disableButtons(true, null, elems);
            return;
        }
+        if (pkg_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            this.disableButtons(true, null, elems);
+            return;
+        }
        let svcinfo;
        if (force_app_status) {
            svcinfo = force_app_status;
        } else {
            svcinfo = tools.decode_svc_info(svc_autorun, svc_info, proc_list, cfg);
        }
-        let btn_enable  = elems.btn_enable  || document.getElementById('btn_enable');
-        let btn_disable = elems.btn_disable || document.getElementById('btn_disable');
-
-        let btn_start   = elems.btn_start   || document.getElementById('btn_start');
-        let btn_restart = elems.btn_restart || document.getElementById('btn_restart');
-        let btn_stop    = elems.btn_stop    || document.getElementById('btn_stop');
-        
-        let btn_update  = elems.btn_update  || document.getElementById('btn_update');
-        btn_update.disabled = true;   // TODO
+        let btn = this.get_svc_buttons(elems);
+        btn.update.disabled = true;   // TODO

        if (Number.isInteger(svcinfo)) {
            ui.addNotification(null, E('p', _('Error')
                + ' %s: return code = %s'.format('decode_svc_info', svcinfo + ' ')));
            this.disableButtons(true, null, elems);
        } else {
-            btn_enable.disabled  = (svc_autorun) ? true : false;
-            btn_disable.disabled = (svc_autorun) ? false : true;
+            btn.enable.disabled  = (svc_autorun) ? true : false;
+            btn.disable.disabled = (svc_autorun) ? false : true;
            if (svcinfo.dmn.total == 0) {
-                btn_start.disabled = false;
-                btn_restart.disabled = true;
-                btn_stop.disabled = true;
+                btn.start.disabled = false;
+                btn.restart.disabled = true;
+                btn.stop.disabled = true;
            } else {
-                btn_start.disabled = true;
-                btn_restart.disabled = false;
-                btn_stop.disabled = false;
+                btn.start.disabled = true;
+                btn.restart.disabled = false;
+                btn.stop.disabled = false;
            }
        }
        let elem_status = elems.status || document.getElementById("status");
@@ -223,6 +229,12 @@ return view.extend({
        }
        let cfg = uci.get(tools.appName, 'config');

+        let pkg_list = status_array[3];
+        if (pkg_list === undefined || typeof(pkg_list) !== 'object' || pkg_list.code != 0) {
+            ui.addNotification(null, E('p', _('Unable to enumerate installed packages') + ': setAppStatus()'));
+            return;
+        }
+
        let status_string = E('div', {
            'id'   : 'status',
            'name' : 'status',
@@ -298,11 +310,29 @@ return view.extend({

        poll.add(L.bind(this.statusPoll, this));

+        let page_title = _('Zapret');
+        let pkgdict = tools.decode_pkg_list(pkg_list.stdout);
+        page_title += ' &nbsp ';
+        if (pkgdict['zapret'] === undefined || pkgdict['zapret'] == '') {
+            page_title += 'unknown version';
+        } else {
+            page_title += 'v' + pkgdict['zapret'];
+        }
+        let aux1 = E('em');
+        let aux2 = E('em');
+        if (pkgdict['zapret'] != pkgdict['luci-app-zapret']) {
+            let errtxt = 'LuCI APP v' + pkgdict['luci-app-zapret'] + ' [ incorrect version! ]';
+            aux1 = E('div', { 'class': 'label-status error' }, errtxt);
+            aux2 = E('div', { }, '&nbsp');
+        }
+        
        let url1 = 'https://github.com/bol-van/zapret';
        let url2 = 'https://github.com/remittor/zapret-openwrt';

        return E([
-            E('h2', { 'class': 'fade-in' }, _('Zapret')),
+            E('h2', { 'class': 'fade-in' }, page_title),
+            aux1,
+            aux2,
            E('div', { 'class': 'cbi-section-descr fade-in' },
                E('a', { 'href': url1, 'target': '_blank' }, url1),
            ),
--- a/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
+++ b/luci-app-zapret/htdocs/luci-static/resources/view/zapret/tools.js
@@ -104,6 +104,21 @@ return baseclass.extend({
        return (v && typeof(v) === 'string') ? v.trim().replace(/\r?\n/g, '') : v;
    },

+    decode_pkg_list: function(pkg_list) {
+        let pkg_dict = { };
+        let lines = pkg_list.trim().split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            let line = lines[i].trim();
+            if (line.length >= 4) {
+                let word_list = line.split(' - ');
+                let name = word_list[0].trim();
+                let ver = word_list[1].trim();
+                pkg_dict[name] = ver;
+            }
+        }
+        return pkg_dict;
+    },
+
    get_pid_list: function(proc_list) {
        let plist = [ ];
        let lines = proc_list.trim().split('\n');
@@ -340,7 +355,11 @@ return baseclass.extend({
        },

        load: function() {
-            return uci.get('zapret', this.cfgsec, this.cfgparam);
+            let value = uci.get('zapret', this.cfgsec, this.cfgparam);
+            if (typeof(value) === 'string') {
+                return value.trim();
+            }
+            return value;
        },

        render: function(content) {
@@ -379,7 +398,9 @@ return baseclass.extend({
        handleSave: function(ev) {
            let txt = document.getElementById('widget.modal_content');
            let value = txt.value.trim().replace(/\r\n/g, ' ').replace(/\r/g, ' ').replace(/\n/g, ' ').trim();
-
+            if (value == "") {
+                value = "\t";
+            }
            uci.set('zapret', this.cfgsec, this.cfgparam, value);
            uci.save();
            let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
--- a/luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json
+++ b/luci-app-zapret/root/usr/share/rpcd/acl.d/luci-app-zapret.json
@@ -9,6 +9,7 @@
 				"/etc/crontabs/root": [ "read" ],
 				"/etc/init.d/zapret*": [ "exec" ],
 				"/bin/ps*": [ "exec" ],
+				"/bin/opkg*": [ "exec" ],
 				"/opt/zapret/sync_config.sh*": [ "exec" ]
 			},
 			"uci": [ "zapret", "network" ],
--- a/zapret-ip2net/Makefile
+++ b/zapret-ip2net/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret-ip2net
 PKG_VERSION:=65
-PKG_RELEASE:=20241023
+PKG_RELEASE:=20241025

 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt

 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5cd5ab176ebe020f0af66829254dc29f275c1840
-PKG_SOURCE_DATE:=2024-10-23
+PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
+PKG_SOURCE_DATE:=2024-10-25

 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
--- a/zapret-mdig/Makefile
+++ b/zapret-mdig/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret-mdig
 PKG_VERSION:=65
-PKG_RELEASE:=20241023
+PKG_RELEASE:=20241025

 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt

 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5cd5ab176ebe020f0af66829254dc29f275c1840
-PKG_SOURCE_DATE:=2024-10-23
+PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
+PKG_SOURCE_DATE:=2024-10-25

 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
--- a/zapret-tpws/Makefile
+++ b/zapret-tpws/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret-tpws
 PKG_VERSION:=65
-PKG_RELEASE:=20241023
+PKG_RELEASE:=20241025

 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -10,8 +10,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt

 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5cd5ab176ebe020f0af66829254dc29f275c1840
-PKG_SOURCE_DATE:=2024-10-23
+PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
+PKG_SOURCE_DATE:=2024-10-25

 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
--- a/zapret/Makefile
+++ b/zapret/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=zapret
 PKG_VERSION:=65
-PKG_RELEASE:=20241023
+PKG_RELEASE:=20241025

 PKG_MAINTAINER:=bol-van
 PKG_LICENSE:=MIT
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt

 PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5cd5ab176ebe020f0af66829254dc29f275c1840
-PKG_SOURCE_DATE:=2024-10-23
+PKG_SOURCE_VERSION:=2c68d1c94f293470bf3a87b28c4d15242e22218c
+PKG_SOURCE_DATE:=2024-10-25

 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 #PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
@@ -78,9 +78,7 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/90-zapret $(1)/etc/hotplug.d/iface/90-zapret
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init.d/openwrt/zapret $(1)/etc/init.d/zapret
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./zapret.config $(1)/etc/config/zapret
-	$(INSTALL_CONF) ./config        $(1)/opt/zapret/config
+	$(INSTALL_CONF) ./config.default $(1)/opt/zapret/config.default
 	#$(INSTALL_CONF) ./ipset/zapret-hosts-auto.txt         $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
 	$(INSTALL_CONF) ./ipset/zapret-hosts-user.txt         $(1)/opt/zapret/ipset/zapret-hosts-user.txt
 	$(INSTALL_CONF) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
@@ -91,6 +89,9 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_CONF) ./ipset/zapret-ip-user-exclude.txt    $(1)/opt/zapret/ipset/zapret-ip-user-exclude.txt
 	$(INSTALL_CONF) ./ipset/zapret-ip-user-ipban.txt      $(1)/opt/zapret/ipset/zapret-ip-user-ipban.txt
 	$(INSTALL_BIN) ./sync_config.sh $(1)/opt/zapret/sync_config.sh
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./uci-def-cfg.sh $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
+	$(INSTALL_BIN) ./uci-def-cfg.sh $(1)/opt/zapret/uci-def-cfg.sh
 endef

 define Package/$(PKG_NAME)/preinst
@@ -116,26 +117,20 @@ define Package/$(PKG_NAME)/postinst
 #!/bin/sh
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
-	NEWCFGNAME=zapret-opkg
-	NEWCFGFILE=/etc/config/$${NEWCFGNAME}
-	if [ -f "$${NEWCFGFILE}" ]; then
-		uci -m -f /etc/config/zapret import "$${NEWCFGNAME}"
-		uci commit "$${NEWCFGNAME}"
-		uci -m -f "$${NEWCFGFILE}" import zapret
-		uci commit zapret
-		rm -f "$${NEWCFGFILE}"
-		echo "File /etc/config/zapret merged from IPK"
+	ZAPRET_CONFIG=/opt/zapret/config
+	ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
+	# check existing uci-config
+	[ -f "/etc/config/zapret" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
+	# create or merge uci-config
+	/opt/zapret/uci-def-cfg.sh
+	[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
+	# remove uci-default script from system dir (used into /etc/init.d/boot)
+	rm -f /etc/uci-defaults/zapret-uci-def-cfg.sh
+	# creating main config if its not exists
+	if [ ! -f "$${ZAPRET_CONFIG}" ]; then
+		cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
+		/opt/zapret/sync_config.sh
 	fi
-	NEWCONFIG=/opt/zapret/config-opkg
-	if [ -f "$${NEWCONFIG}" ]; then
-		# backup current main config
-		mv -f /opt/zapret/config /opt/zapret/config.backup
-		# renew main config
-		mv -f "$${NEWCONFIG}" /opt/zapret/config
-		echo "File /opt/zapret/config replaced from IPK"
-	fi
-	# synchnonize main config
-	/opt/zapret/sync_config.sh
 	# enable main service
 	/etc/init.d/zapret enable
 	# stop all
@@ -178,7 +173,7 @@ define Package/$(PKG_NAME)/postrm
 # check if we are on real system
 if [ -z "$${IPKG_INSTROOT}" ]; then
 	[ -f "/etc/config/zapret-opkg" ] && rm -f "/etc/config/zapret-opkg"
-	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup2"
+	[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
 	#rm -rf /opt/zapret
 	#echo "Directory /opt/zapret removed!"
 fi
--- a/zapret/config.default
+++ b/zapret/config.default
@@ -141,4 +141,3 @@ DISABLE_IPV6=1
 # possible values : get_user.sh get_antizapret.sh get_combined.sh get_reestr.sh get_hostlist.sh
 # comment if not required
 #GETLIST=get_antizapret_domains.sh
-#GETLIST=get_antifilter_ipsmart.sh
--- a/zapret/sync_config.sh
+++ b/zapret/sync_config.sh
@@ -4,14 +4,40 @@
 EXEDIR=/opt/zapret
 ZAPRET_BASE=/opt/zapret
 ZAPRET_CONFIG="$ZAPRET_BASE/config"
+ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
 ZAPRET_CFG=/etc/config/zapret

+ZAPRET_CFG_SEC_NAME="$( uci -q get zapret.config )"
+
+if [ -z "$ZAPRET_CFG_SEC_NAME" ]; then
+	# wrong uci-config
+	return 1
+fi
+
 function get_sed_compat
 {
 	local str=$( ( echo $1|sed -r 's/([\$\.\*\/\[\\^])/\\\1/g'|sed 's/[]]/\\]/g' )>&1 )
 	echo "$str"
 }

+function uncomment_param
+{
+	local param=$1
+	local fname=${2:-$ZAPRET_CONFIG}
+	sed -i "/^#$param=/s/^#//" $fname
+}
+
+function append_param
+{
+	local param=$1
+	local fname=${2:-$ZAPRET_CONFIG}
+	grep -q "^$param=" $fname
+	if [ "$?" != "0" ]; then
+		echo "" >> $fname
+		echo "$param=" >> $fname
+	fi
+}
+
 function set_param_value
 {
 	local param=$1
@@ -32,14 +58,28 @@ function sync_param
 {
 	local param=$1
 	local vtype=$2
-	local value=$( uci -q get zapret.@main[0].$param )
+	local value="$( uci -q get zapret.config.$param )"
+	uncomment_param $param
+	append_param $param
+	local TAB="$( echo -n -e '\t' )"
+	if [ "$value" = "$TAB" ]; then
+		value=""
+	fi
 	if [ "$vtype" = "str" ]; then
 		set_param_value_str $param "$value"
 	else
 		set_param_value $param $value
 	fi
 }
-	
+
+if [ ! -f "$ZAPRET_CONFIG" ]; then
+	if [ ! -f "$ZAPRET_CONFIG_DEF" ]; then
+		touch "$ZAPRET_CONFIG"
+	else
+		cp -f "$ZAPRET_CONFIG_DEF" "$ZAPRET_CONFIG"
+	fi
+fi
+
 sync_param MODE
 sync_param FLOWOFFLOAD
 sync_param INIT_APPLY_FW
--- a/zapret/uci-def-cfg.sh
+++ b/zapret/uci-def-cfg.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+# Copyright (c) 2024 remittor
+
+SCRIPT_SOURCED=0
+case ${0##*/} in ash|-ash) SCRIPT_SOURCED=1;; esac
+#[[ $_ != $0 ]] && echo "Script is being sourced" || echo "Script is a subshell"
+
+ZAPRET_BASE=/opt/zapret
+ZAPRET_CONFIG="$ZAPRET_BASE/config"
+ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
+ZAPRET_CFG_FILE=/etc/config/zapret
+ZAPRET_CFG_NAME=zapret
+
+CFG_OPT_FORCE=0
+CFG_OPT_MERGE=0
+CFG_OPT_SYNC_CFG=0
+
+
+function set_default_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local TAB="$( echo -n -e '\t' )"
+	uci batch <<-EOF
+		set $cfgname.config.autostart='0'
+		set $cfgname.config.FWTYPE='nftables'
+		set $cfgname.config.MODE='nfqws'
+		set $cfgname.config.FLOWOFFLOAD='none'
+		set $cfgname.config.INIT_APPLY_FW='1'
+		set $cfgname.config.DISABLE_IPV4='0'
+		set $cfgname.config.DISABLE_IPV6='1'
+		set $cfgname.config.MODE_FILTER='hostlist'
+		set $cfgname.config.DESYNC_MARK='0x40000000'
+		set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
+		set $cfgname.config.NFQWS_OPT_DESYNC='--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin'
+		set $cfgname.config.NFQWS_OPT_DESYNC_SUFFIX="$TAB"
+		set $cfgname.config.MODE_HTTP='1'
+		set $cfgname.config.MODE_HTTP_KEEPALIVE='0'
+		set $cfgname.config.HTTP_PORTS='80'
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP_SUFFIX="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTP6_SUFFIX="$TAB"
+		set $cfgname.config.MODE_HTTPS='1'
+		set $cfgname.config.HTTPS_PORTS='443'
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS_SUFFIX="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_HTTPS6_SUFFIX="$TAB"
+		set $cfgname.config.MODE_QUIC='1'
+		set $cfgname.config.QUIC_PORTS='443'
+		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC='--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15'
+		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC_SUFFIX="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6="$TAB"
+		set $cfgname.config.NFQWS_OPT_DESYNC_QUIC6_SUFFIX="$TAB"
+		commit $cfgname
+	EOF
+	return 0
+}
+
+function create_default_config
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local cfgfile=/etc/config/$cfgname
+	rm -f $cfgfile
+	touch $cfgfile
+	uci set $cfgname.config=main
+	set_default_values $cfgname
+	return 0
+}
+
+function merge_config_with_def_values
+{
+	local cfgname=${1:-$ZAPRET_CFG_NAME}
+	local force=$2
+	local cfgfile=/etc/config/$cfgname
+	local NEWCFGNAME="zapret-default"
+	local NEWCFGFILE="/etc/config/$NEWCFGNAME"
+
+	create_default_config "$NEWCFGNAME"
+	[ ! -f "$NEWCFGFILE" ] && return 1 
+
+	uci -m -f $cfgfile import "$NEWCFGNAME"
+	uci commit "$NEWCFGNAME"
+	uci -m -f "$NEWCFGFILE" import $cfgname
+	uci commit $cfgname
+	rm -f "$NEWCFGFILE"	
+	return 0
+}
+
+
+if [ "$SCRIPT_SOURCED" != "1" ]; then
+	while getopts "fms" SCRIPT_OPT; do
+		case $SCRIPT_OPT in
+			f) CFG_OPT_FORCE=1;;
+			m) CFG_OPT_MERGE=1;;
+			s) CFG_OPT_SYNC_CFG=1;;
+		esac
+	done
+
+	if [ ! -f "$ZAPRET_CFG_FILE" ]; then
+		CFG_OPT_FORCE=1
+	fi
+
+	if [ "$CFG_OPT_FORCE" = "1" ]; then
+		create_default_config
+		[ "$CFG_OPT_SYNC_CFG" = "1" ] && /opt/zapret/sync_config.sh
+		return 0
+	fi
+fi
+
+
+CFG_OPT_MERGE=1
+merge_config_with_def_values
+
+if [ ! -f "$ZAPRET_CONFIG" ]; then
+	# create main config
+	/opt/zapret/sync_config.sh
+fi
+
+return 0
--- a/zapret/zapret.config
+++ b/zapret/zapret.config
@@ -1,32 +0,0 @@
-config main 'config'
-	option autostart '0'
-	option FWTYPE 'nftables'
-	option MODE 'nfqws'
-	option FLOWOFFLOAD 'none'
-	option INIT_APPLY_FW '1'
-	option DISABLE_IPV4 '0'
-	option DISABLE_IPV6 '1'
-	option MODE_FILTER 'hostlist'
-	option DESYNC_MARK '0x40000000'
-	option DESYNC_MARK_POSTNAT '0x20000000'
-	option NFQWS_OPT_DESYNC '--dpi-desync=fake,split2 --dpi-desync-ttl=7 --dpi-desync-ttl6=0 --dpi-desync-repeats=20 --dpi-desync-fooling=md5sig,badseq --dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin'
-	option NFQWS_OPT_DESYNC_SUFFIX ''
-	option MODE_HTTP '1'
-	option MODE_HTTP_KEEPALIVE '0'
-	option HTTP_PORTS '80'
-	option NFQWS_OPT_DESYNC_HTTP ''
-	option NFQWS_OPT_DESYNC_HTTP_SUFFIX ''
-	option NFQWS_OPT_DESYNC_HTTP6 ''
-	option NFQWS_OPT_DESYNC_HTTP6_SUFFIX ''
-	option MODE_HTTPS '1'
-	option HTTPS_PORTS '443'
-	option NFQWS_OPT_DESYNC_HTTPS ''
-	option NFQWS_OPT_DESYNC_HTTPS_SUFFIX ''
-	option NFQWS_OPT_DESYNC_HTTPS6 ''
-	option NFQWS_OPT_DESYNC_HTTPS6_SUFFIX ''
-	option MODE_QUIC '1'
-	option QUIC_PORTS '443'
-	option NFQWS_OPT_DESYNC_QUIC '--dpi-desync=fake,split2 --dpi-desync-repeats=15 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin --new --dpi-desync=fake --dpi-desync-repeats=15'
-	option NFQWS_OPT_DESYNC_QUIC_SUFFIX ''
-	option NFQWS_OPT_DESYNC_QUIC6 ''
-	option NFQWS_OPT_DESYNC_QUIC6_SUFFIX ''
Author	SHA1	Message	Date
remittor	3154d3f5f6	Bump version to v65-20241025	2024-10-25 14:20:35 +03:00
remittor	7e901513c5	config: luci: Fix merging longstr values (NFQWS_DESYNC_*)	2024-10-25 14:04:12 +03:00
remittor	5373d5dd2a	config: Replace static uci-config to dynamic uci-config	2024-10-25 12:15:24 +03:00
remittor	836b324a0b	luci: Show and check versions of installed packages	2024-10-24 15:08:37 +03:00
remittor	2db3bd7514	luci: Cleanup code (elems of btn)	2024-10-24 15:05:36 +03:00
remittor	0b20fe4a93	luci: Add postinst script for luci-reload	2024-10-24 13:20:23 +03:00
remittor	5f3dfe04ab	config: Fix update and append params into main config	2024-10-24 13:18:51 +03:00