From 0b87cb7b76b5c4b08836c8bc7c9a503dacb85a08 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 31 Oct 2019 21:12:14 +0100
Subject: [PATCH] Support note for omr-bypass and various fix

---
 .../luasrc/model/cbi/omr-bypass.lua              | 16 ++++++++++++++++
 .../files/etc/init.d/openmptcprouter-vps         |  9 ++++++++-
 .../files/etc/uci-defaults/1950-omr-diag         |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/luci-app-omr-bypass/luasrc/model/cbi/omr-bypass.lua b/luci-app-omr-bypass/luasrc/model/cbi/omr-bypass.lua
index e8f9c84ef..95696668d 100644
--- a/luci-app-omr-bypass/luasrc/model/cbi/omr-bypass.lua
+++ b/luci-app-omr-bypass/luasrc/model/cbi/omr-bypass.lua
@@ -21,6 +21,8 @@ hn.rmempty  = true
 ifd = s:option(ListValue, "interface", translate("Interface"))
 ifd.rmempty  = true
 
+dn = s:option(Value,"note",translate("Note"))
+
 s = m:section(TypedSection, "ips", translate("IPs and Networks"))
 s.addremove = true
 s.anonymous = true
@@ -34,6 +36,9 @@ ip.optional = false
 ifi = s:option(ListValue, "interface", translate("Interface"))
 ifi.rmempty  = true
 
+inn = s:option(Value,"note",translate("Note"))
+
+
 s = m:section(TypedSection, "dest_port", translate("Ports destination"))
 s.addremove = true
 s.anonymous = true
@@ -54,6 +59,8 @@ proto.optional = false
 ifdp = s:option(ListValue, "interface", translate("Interface"))
 ifdp.rmempty  = true
 
+dpn = s:option(Value,"note",translate("Note"))
+
 s = m:section(TypedSection, "macs", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
 s.addremove = true
 s.anonymous = true
@@ -73,6 +80,8 @@ end)
 ifm = s:option(ListValue, "interface", translate("Interface"))
 ifm.rmempty  = true
 
+macn = s:option(Value,"note",translate("Note"))
+
 s = m:section(TypedSection, "lan_ip", translate("Source lan IP address or network"))
 s.addremove = true
 s.anonymous = true
@@ -86,6 +95,8 @@ ip.optional = false
 ifl = s:option(ListValue, "interface", translate("Interface"))
 ifl.rmempty  = true
 
+lanipn = s:option(Value,"note",translate("Note"))
+
 s = m:section(TypedSection, "asns", translate("<abbr tittle=\"Autonomous System Number\">ASN</abbr>"))
 s.addremove = true
 s.anonymous = true
@@ -98,6 +109,8 @@ asn.optional = false
 ifa = s:option(ListValue, "interface", translate("Interface"))
 ifa.rmempty  = true
 
+asnn = s:option(Value,"note",translate("Note"))
+
 s = m:section(TypedSection, "dpis", translate("Protocols and services"))
 s.addremove = true
 s.anonymous = true
@@ -124,6 +137,9 @@ end
 ifp = s:option(ListValue, "interface", translate("Interface"))
 ifp.rmempty  = true
 
+psn = s:option(Value,"note",translate("Note"))
+
+
 ifd.default = "all"
 ifi.default = "all"
 ifp.default = "all"
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index d9a9b7ac9..aef865676 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -6,7 +6,7 @@ START=99
 
 USE_PROCD=1
 
-EXTRA_COMMANDS="set_pihole backup_send backup_get set_vps_firewall"
+EXTRA_COMMANDS="set_pihole backup_send backup_get backup_list set_vps_firewall"
 
 _parse_result() {
 	result=$("echo $1 | jsonfilter -q -e '@.result'")
@@ -299,6 +299,7 @@ _get_vps_config() {
 	fi
 	if [ "$(uci -q get mlvpn.general.host)" != "127.0.0.1" ] && [ "$(uci -q get mlvpn.general.host)" != "$vpsip" ]; then
 		uci -q batch <<-EOF >/dev/null
+			set mlvpn.general="mlvpn"
 			set mlvpn.general.host="$vpsip"
 			commit mlvpn
 		EOF
@@ -848,6 +849,9 @@ _backup_send() {
 backup_send() {
 	config_load openmptcprouter
 	config_foreach _backup_send server
+	sleep 2
+	config_foreach _backup_list server
+	uci -q commit openmptcprouter
 }
 
 
@@ -871,6 +875,7 @@ _backup_get() {
 	backup_data="$(echo "$vps_backup" | jsonfilter -q -e '@.data')"
 	backup_sha256sum="$(echo "$vps_backup" | jsonfilter -q -e '@.sha256sum')"
 	[ -n "$backup_data" ] && {
+		logger -t "OMR-VPS" "Restore backup"
 		echo $backup_data | base64 -d > /tmp/backup.tar.gz
 		sysupgrade -t /tmp/backup.tar.gz
 	}
@@ -879,6 +884,7 @@ _backup_get() {
 backup_get() {
 	config_load openmptcprouter
 	config_foreach _backup_get server
+	uci -q commit openmptcprouter
 }
 
 _backup_list() {
@@ -909,6 +915,7 @@ _backup_list() {
 backup_list() {
 	config_load openmptcprouter
 	config_foreach _backup_list server
+	uci -q commit openmptcprouter
 }
 
 
diff --git a/openmptcprouter/files/etc/uci-defaults/1950-omr-diag b/openmptcprouter/files/etc/uci-defaults/1950-omr-diag
index 1cc14babc..cd944c24f 100755
--- a/openmptcprouter/files/etc/uci-defaults/1950-omr-diag
+++ b/openmptcprouter/files/etc/uci-defaults/1950-omr-diag
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 uci -q batch <<-EOF >/dev/null
-	set luci.diag=external
+	set luci.diag=internal
 	set luci.diag.ping="openmptcprouter.com"
 	set luci.diag.dns="openmptcprouter.com"
 	set luci.diag.route="openmptcprouter.com"