diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 55ec6e531..da0649831 100755
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -837,4 +837,4 @@
-<%+footer%>
\ No newline at end of file
+<%+footer%>
diff --git a/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename b/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename
index ad256bae9..02d204117 100755
--- a/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename
+++ b/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename
@@ -27,14 +27,14 @@ _set_intf_name() {
if [ "$modalias" = "$chk_modalias" ] && [ "$INTERFACE" != "$ifname" ]; then
logger -t "OMR-Rename" "Rename ${INTERFACE} to ${ifname}"
existif=0
- ip link set ${INTERFACE} down
+ ip link set ${INTERFACE} down 2>&1 >/dev/null
[ "$(ip link show ${ifname} 2>/dev/null)" != "" ] && {
- ip link set ${ifname} name ${ifname}tmp
+ ip link set ${ifname} name ${ifname}tmp 2>&1 >/dev/null
existif=1
}
- ip link set ${INTERFACE} name ${ifname}
- ip link set ${ifname} up
- [ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE}
+ ip link set ${INTERFACE} name ${ifname} 2>&1 >/dev/null
+ ip link set ${ifname} up 2>&1 >/dev/null
+ [ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE} 2>&1 >/dev/null
fi
fi
elif [ -f /dev/${DEVICE_NAME} ] && [ -n "$MODALIAS" ] && [ "$modalias" = "$MODALIAS" ]; then
@@ -46,18 +46,20 @@ _set_intf_name() {
}
[ -z "$modalias" ] && [ -n "$device" ] && [ -n "$ifname" ] && [ "/sys${DEVPATH}" = "$device" ] && [ "$INTERFACE" != "$ifname" ] && {
logger -t "OMR-Rename" "Rename ${INTERFACE} to ${ifname}"
- ip link set ${INTERFACE} down
+ ip link set ${INTERFACE} down 2>&1 >/dev/null
existif=0
[ "$(ip link show ${ifname} 2>/dev/null)" != "" ] && {
- ip link set ${ifname} name ${ifname}tmp
+ ip link set ${ifname} name ${ifname}tmp 2>&1 >/dev/null
existif=1
}
- ip link set ${INTERFACE} name ${ifname}
- ip link set ${ifname} up
- [ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE}
+ ip link set ${INTERFACE} name ${ifname} 2>&1 >/dev/null
+ ip link set ${ifname} up 2>&1 >/dev/null
+ [ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE} 2>&1 >/dev/null
}
}
-config_load network
-config_foreach _set_intf_name interface
-config_foreach _set_intf_name interface
+if [ "$(uci -q get openmptcprouter.settings.disableintfrename)" != "0" ]; then
+ config_load network
+ config_foreach _set_intf_name interface
+ config_foreach _set_intf_name interface
+fi
\ No newline at end of file
diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
index 63d4d3a3a..2348fa8b0 100755
--- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
@@ -104,6 +104,15 @@ start_service() {
# remove sysctl already defined in /etc/sysctl.d/
sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' -e '/tcp_syn_retries/d' -e '/tcp_fastopen/d' -e '/tcp_retries2/d' -e '/tcp_retries1/d' -e '/ip_default_ttl/d' /etc/sysctl.conf
sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' -e '/tcp_syn_retries/d' -e '/tcp_fastopen/d' -e '/tcp_retries2/d' -e '/tcp_retries1/d' -e '/ip_default_ttl/d' /etc/sysctl.d/10-default.conf
+
+ if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
+ uci -q batch <<-EOF >/dev/null
+ set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
+ commit rpcd
+ EOF
+ /etc/init.d/rpcd restart 2>&1 >/dev/null
+ fi
+
}
reload_service() {
diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index fe0ae2264..20825d558 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -595,7 +595,7 @@ if [ "$multipath_config" = "on" ] || [ "$multipath_config" = "backup" ]; then
# if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" != "1" ] && [ "$(pgrep glorytun-udp)" != "" ] && [ "$(glorytun-udp set | grep 'kxtimeout 7d')" = "" ]; then
# glorytun-udp set dev tun0 kxtimeout 7d > /dev/null 2>&1
# fi
- [ "$multipath_config" = "backup" ] && [ "$(pgrep glorytun-udp)" != "" ] && glorytun-udp path addr $OMR_TRACKER_DEVICE_IP dev tun0 set pref 200 > /dev/null 2>&1
+ [ "$multipath_config" = "backup" ] && [ "$(pgrep glorytun-udp)" != "" ] && glorytun-udp path addr $OMR_TRACKER_DEVICE_IP dev tun0 set pref 125 > /dev/null 2>&1
fi
[ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipathvpn)" != "1" ] && {
[ "$multipath_status" = "$multipath_config" ] || {
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index d2211fcb5..2e7b3d96a 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -150,8 +150,8 @@ _dns() {
-b "${deviceip}" \
+time="$OMR_TRACKER_TIMEOUT" \
+tries=1 \
- openmptcprouter.com
- ) && echo "$ret" | grep -sq "94.23.252.192" && {
+ one.one.one.one
+ ) && echo "$ret" | grep -sq "1.1.1.1" && {
OMR_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}')
_update_rto "$OMR_TRACKER_LATENCY"
return
diff --git a/omr-tracker/files/bin/omr-tracker-gre b/omr-tracker/files/bin/omr-tracker-gre
new file mode 100755
index 000000000..b169d21d8
--- /dev/null
+++ b/omr-tracker/files/bin/omr-tracker-gre
@@ -0,0 +1,46 @@
+#!/bin/sh
+# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 :
+
+name=$0
+basename="$(basename $0)"
+
+_log() {
+ logger -p daemon.info -t "${basename}" "$@"
+}
+
+_ping_server() {
+ local host=$1
+ ret=$(ping \
+ -w "$OMR_TRACKER_TIMEOUT" \
+ -c 1 \
+ -q \
+ "${host}"
+ ) && echo "$ret" | grep -sq " 0% packet loss" && {
+ server_ping=true
+ }
+}
+
+_ping_tunnel() {
+ local name=$1
+ config_get gateway $1 gateway
+ config_get ifname $1 ifname
+ config_get disabled $1 disabled
+ [ "$(echo $ifname | grep omrip)" != "" ] && [ -n "$gateway" ] && [ "$disabled" != "1" ] && {
+ _ping_server $gateway
+ }
+}
+
+. /lib/functions.sh
+
+timeout=${OMR_TRACKER_TIMEOUT:-5}
+interval=${OMR_TRACKER_INTERVAL:-10}
+intervaltries=${OMR_TRACKER_INTERVAL_TRIES:-2}
+retry=${OMR_TRACKER_TRIES:-4}
+waittest=${OMR_TRACKER_WAIT_TEST:-0}
+
+while true; do
+ server_ping=false
+ config_load network
+ config_foreach _ping_tunnel interface
+ sleep "${interval}"
+done
diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker
index e7bf920a7..3612c57ee 100755
--- a/omr-tracker/files/etc/init.d/omr-tracker
+++ b/omr-tracker/files/etc/init.d/omr-tracker
@@ -103,6 +103,28 @@ _launch_server_tracker() {
procd_close_instance
}
+_launch_gre_tracker() {
+ local hosts timeout tries interval interval_tries options type enabled wait_test
+ _validate_section "defaults" "defaults"
+ _validate_section "gre" "gre"
+
+ [ "${enabled}" = "0" ] && return
+ [ -z "${interval_tries}" ] && interval_tries=1
+
+ procd_open_instance
+ # shellcheck disable=SC2086
+ procd_set_param command /bin/omr-tracker-gre "$1" $options
+ procd_append_param env "OMR_TRACKER_TIMEOUT=$timeout"
+ procd_append_param env "OMR_TRACKER_TRIES=$tries"
+ procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
+ procd_append_param env "OMR_TRACKER_INTERVAL_TRIES=$interval_tries"
+ procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test"
+ procd_set_param limits nofile="51200 51200"
+ procd_set_param respawn 0 10 0
+ procd_set_param stderr 1
+ procd_close_instance
+}
+
_initialize_shadowsocks_tracker() {
local redir_tcp server tracker_server
config_get redir_tcp ss_rules redir_tcp
@@ -199,6 +221,11 @@ _multi_server() {
[ "$backup" = "1" ] && multiserver=true
}
+_gre_tunnel() {
+ config_get proto $1 proto
+ [ "$proto" = "gre" ] && gretunnel=true
+}
+
start_service() {
local ss_disabled
logger -t "omr-tracker" "Launching..."
@@ -224,6 +251,10 @@ start_service() {
config_load openmptcprouter
config_foreach _multi_server server
[ "$multiserver" = true ] && _launch_server_tracker
+ gretunnel=false
+ config_load network
+ config_foreach _gre_tunnel interface
+ [ "$gretunnel" = true ] && _launch_gre_tracker
logger -t "omr-tracker" "Launched"
}
diff --git a/omr-update/files/etc/init.d/omr-update b/omr-update/files/etc/init.d/omr-update
index 6f79dae88..d69c779f8 100755
--- a/omr-update/files/etc/init.d/omr-update
+++ b/omr-update/files/etc/init.d/omr-update
@@ -2,7 +2,7 @@
# Copyright (C) 2018 Ycarus (Yannick Chabanois)
# Released under GPL 3. See LICENSE for the full terms.
-START=1
+START=11
STOP=98
boot() {
@@ -16,6 +16,7 @@ boot() {
[ -n "$files" ] && {
mkdir -p /usr/share/omr-update
if [ "$(grep rom /etc/mtab)" = "" ]; then
+ rm /usr/share/omr-update/*
cp /etc/uci-defaults/* /usr/share/omr-update
fi
uci -q set openmptcprouter.settings=settings
diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index 9625904b5..defb4d7b4 100755
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -78,7 +78,7 @@ MY_DEPENDS := \
!TARGET_mvebu:kmod-usb-net-huawei-cdc-ncm !TARGET_mvebu:kmod-usb-net-rndis !TARGET_mvebu:kmod-usb-net-cdc-ether !TARGET_mvebu:kmod-usb-net-ipheth !TARGET_mvebu:usbmuxd \
kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \
!TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \
- luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang (TARGET_x86_64||TARGET_arm64):kmod-tcp-bbr2 iptables-mod-ipopt igmpproxy ss iptraf-ng \
+ luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang (TARGET_x86_64||aarch64):kmod-tcp-bbr2 iptables-mod-ipopt igmpproxy ss iptraf-ng \
luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp luci-proto-gre tcptraceroute luci-proto-mbim kmod-rtl8xxxu kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard (TARGET_x86||TARGET_x86_64):rtl8192eu-firmware kmod-usb2 libustream-wolfssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf \
hwinfo (TARGET_x86||TARGET_x86_64):dmidecode luci-app-packet-capture kmod-bonding luci-proto-bonding
# luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status
diff --git a/openmptcprouter/files/etc/uci-defaults/000-omr-update b/openmptcprouter/files/etc/uci-defaults/000-omr-update
new file mode 100755
index 000000000..6e16cc6b0
--- /dev/null
+++ b/openmptcprouter/files/etc/uci-defaults/000-omr-update
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+cd /etc/uci-defaults || exit 0
+source /etc/os-release
+
+OMRVERSION=$(echo $VERSION | sed 's/v//')
+files="$(ls /etc/uci-defaults/)"
+[ -n "$files" ] && {
+ mkdir -p /usr/share/omr-update
+ if [ "$(grep rom /etc/mtab)" = "" ]; then
+ rm /usr/share/omr-update/*
+ cp /etc/uci-defaults/* /usr/share/omr-update
+ fi
+ uci -q set openmptcprouter.settings=settings
+ uci -q set openmptcprouter.settings.version=${OMRVERSION}
+ uci -q commit
+}
+exit 0