Merge branch 'test' into develop

openmptcprouter/files/etc/init.d/mptcpovervpn

@@ -16,6 +16,21 @@ mptcp_over_vpn() {
 	local interface=$1
 	nbintf=$(($nbintf+1))
 	if [ "$(uci -q get openmptcprouter.${interface}.multipathvpn)" = "1" ]; then
+		if [ "$(uci -q get network.${interface})" = "" ]; then
+			uci -q batch <<-EOF >/dev/null
+				delete openmptcprouter.${interface}
+				delete network.ovpn${interface}
+				delete openvpn.${interface}
+				commit openvpn
+				delete openmptcprouter.${interface}
+				delete openmptcprouter.ovpn${interface}
+				commit openmptcprouter
+				commit network
+				del_list firewall.zone_vpn.network="ovpn${interface}"
+				commit firewall
+			EOF
+			return
+		fi
 		nbintfvpn=$(($nbintfvpn+1))
 		if [ "$(uci -q get network.ovpn${interface})" = "" ]; then
 			logger -t "MPTCPoverVPN" "Enable MPTCP over VPN for ${interface}"
@@ -89,6 +104,21 @@ mptcp_over_vpn() {
 			del_list firewall.zone_vpn.network="ovpn${interface}"
 			commit firewall
 		EOF
+	elif [ "$(uci -q get openmptcprouter.${interface}.vpn)" = "1" ]; then
+		intf="$(echo ${interface} | sed 's/ovpn//g')"
+		if [ -n "$intf" ] && [ "$intf" != "$interface" ] && [ "$(uci -q get network.${intf})" = "" ]; then
+			uci -q batch <<-EOF >/dev/null
+				delete network.${interface}
+				delete openvpn.${intf}
+				commit openvpn
+				delete openmptcprouter.${intf}
+				delete openmptcprouter.${interface}
+				commit openmptcprouter
+				commit network
+				del_list firewall.zone_vpn.network="${interface}"
+				commit firewall
+			EOF
+		fi
 	fi
 }
 

openmptcprouter/files/etc/uci-defaults/1980-omr-firewall

@@ -122,10 +122,19 @@ if [ "$(uci -q get firewall.gre_tunnel)" = "" ]; then
 		commit firewall
 	EOF
 fi
-
+if [ "$(uci -q get firewall.fwlantovpn)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set firewall.@zone[0].auto_helper='0'
+		set firewall.fwlantovpn=forwarding
+		set firewall.fwlantovpn.src='lan'
+		set firewall.fwlantovpn.dest='vpn'
+		commit firewall
+	EOF
+fi
 uci -q batch <<-EOF >/dev/null
 	set firewall.@zone[0].mtu_fix='1'
 	set firewall.zone_vpn.mtu_fix='1'
+	commit firewall
 EOF
 
 rm -f /tmp/luci-indexcache