Rework V4 heartbeat, fixing connection bug and improving connection speed if Internet connection is available and device restricted to No VPN
This commit is contained in:
parent
bff0c04c33
commit
d3052e0489
1 changed files with 42 additions and 33 deletions
|
@ -42,6 +42,8 @@ led5g(){
|
||||||
. /etc/vpnsecret # Source the server authentication secret
|
. /etc/vpnsecret # Source the server authentication secret
|
||||||
|
|
||||||
# Prepare for default VPN-WiFi bridge
|
# Prepare for default VPN-WiFi bridge
|
||||||
|
/sbin/uci set network.VPN360.ifname="eth1 tap0"
|
||||||
|
/sbin/uci set network.DHCP.ifname="lo"
|
||||||
/sbin/uci set wireless.@wifi-iface[0].network="VPN360"
|
/sbin/uci set wireless.@wifi-iface[0].network="VPN360"
|
||||||
/sbin/uci commit
|
/sbin/uci commit
|
||||||
|
|
||||||
|
@ -65,6 +67,11 @@ while [ $counter -lt 60 ]
|
||||||
if /usr/bin/wget -O/etc/hosts https://$HOSTNAME/hosts --timeout=2 --post-data "secret=$SECRET" --no-check-certificate >/var/log/wget 2>&1
|
if /usr/bin/wget -O/etc/hosts https://$HOSTNAME/hosts --timeout=2 --post-data "secret=$SECRET" --no-check-certificate >/var/log/wget 2>&1
|
||||||
then
|
then
|
||||||
|
|
||||||
|
if grep -Fq "No VPN" /etc/hosts;
|
||||||
|
then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
|
||||||
if pgrep "openvpn" >/dev/null
|
if pgrep "openvpn" >/dev/null
|
||||||
then
|
then
|
||||||
if [ $(ipaddr) ] # = If connection to the server is working
|
if [ $(ipaddr) ] # = If connection to the server is working
|
||||||
|
@ -105,6 +112,8 @@ while [ $counter -lt 60 ]
|
||||||
# We should only ever get to this point if no VPN connection was established within a minute
|
# We should only ever get to this point if no VPN connection was established within a minute
|
||||||
|
|
||||||
# Switch WiFi device to the DHCP bridge
|
# Switch WiFi device to the DHCP bridge
|
||||||
|
/sbin/uci set network.VPN360.ifname="tap0"
|
||||||
|
/sbin/uci set network.DHCP.ifname="eth1"
|
||||||
/sbin/uci set wireless.@wifi-iface[0].network="DHCP"
|
/sbin/uci set wireless.@wifi-iface[0].network="DHCP"
|
||||||
/sbin/uci commit
|
/sbin/uci commit
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue