diff --git a/modemmanager/files/etc/init.d/modemmanager b/modemmanager/files/etc/init.d/modemmanager index a8840257b..aa739951d 100644 --- a/modemmanager/files/etc/init.d/modemmanager +++ b/modemmanager/files/etc/init.d/modemmanager @@ -2,7 +2,7 @@ # Copyright (C) 2016 Aleksander Morgado USE_PROCD=1 -START=70 +START=11 LOG_LEVEL="INFO" diff --git a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking index e7d4414d0..b2af0d597 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking @@ -782,6 +782,10 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || ([ "$OMR_TRACKER_INTERFACE" != "omrvpn _log "Interface $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) disabled, set it up" ifup $OMR_TRACKER_INTERFACE sleep 30 + elif [ "$mm_state" = "registered" ]; then + _log "Interface $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) registered, set it up" + ifup $OMR_TRACKER_INTERFACE + sleep 30 elif [ "$mm_state" = "locked" ]; then if [ -n "$(echo $modeminfo | grep 'modem.generic.unlock-required ' | grep 'sim-pin')" ]; then # Sometimes PIN is not correctly sent to modem @@ -1125,7 +1129,7 @@ if [ "$multipath_config" = "master" ]; then if ([ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(uci -q get openmptcprouter.settings.master)" != "balancing" ]; then omrvpn_intf=$(uci -q get "network.omrvpn.device" || echo "tun0") [ -z "$omrvpn_intf" ] && omrvpn_intf=$(uci -q get "network.omrvpn.ifname" || echo "tun0") - if [ -n "$omrvpn_intf" ] && [ "$(ip route show default | grep -v metric | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ] && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then + if [ -n "$omrvpn_intf" ] && [ "$(ip route show default metric 0 | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ] && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then _log "Master up : Replace default route by $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE" ip route replace default scope global metric 1 via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE $initcwrwnd 2>&1 >/dev/null fi @@ -1158,7 +1162,7 @@ if [ "$multipath_config" = "master" ]; then if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ] && (([ -n "$OMR_TRACKER_DEVICE_IP" ] && [ "$(ip route show default | grep weight)" = "" ]) || ([ -n "$OMR_TRACKER_DEVICE_IP6" ] && [ "$(ip -6 route show default | grep weight)" = "" ])) && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then omrvpn_intf=$(uci -q get "network.omrvpn.device" || echo "tun0") [ -z "$omrvpn_intf" ] && omrvpn_intf=$(uci -q get "network.omrvpn.ifname" || echo "tun0") - if [ -n "$omrvpn_intf" ] && [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ "$(ip route show default | grep -v metric | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then + if [ -n "$omrvpn_intf" ] && [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ "$(ip route show default metric 0 | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then routesbalancing="" routesbalancingbackup="" nbintf=0 diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server index d7e10cc41..7fd8a6129 100755 --- a/omr-tracker/files/bin/omr-tracker-server +++ b/omr-tracker/files/bin/omr-tracker-server @@ -164,13 +164,13 @@ _check_master() { set_ip() { ip="$serverip" if [ "$server_ping" = true ]; then - if [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ] && [ "$(uci -q get shadowsocks-rust.sss${count}.server | tr -d '\n')" != "$ip" ]; then + if ([ -n "$(uci -q get shadowsocks-libev)" ] && [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ]) || ([ -n "$(uci -q get shadowsocks-rust)" ] && [ "$(uci -q get shadowsocks-rust.sss${count}.server | tr -d '\n')" != "$ip" ]) || ([ -n "$(uci -q get openvpn.omr)" ] && [ -z "$(uci -q get openvpn.omr.remote | grep $ip)" ]); then logger -t "OMR-Tracker-Server" "Master server ${name} up ($ip), set it back" changes="1" #logger -t "OMR-Tracker-Server" "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n') - $ip" uci -q batch <<-EOF >/dev/null - set shadowsocks-libev.sss${count}.server=$ip - set shadowsocks-rust.sss${count}.server=$ip + set shadowsocks-libev.sss${count}.server="$ip" + set shadowsocks-rust.sss${count}.server="$ip" EOF if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ]; then uci -q batch <<-EOF >/dev/null @@ -184,35 +184,35 @@ _check_master() { fi if [ -z "$(uci -q get openvpn.omr.remote | grep $ip)" ]; then uci -q batch <<-EOF >/dev/null - add_list openvpn.omr.remote=$ip + add_list openvpn.omr.remote="$ip" EOF fi if [ "$count" -eq "0" ]; then config_load openmptcprouter config_foreach _disable_current server uci -q batch <<-EOF >/dev/null - set xray.omrout.s_vmess_address=$ip - set xray.omrout.s_vless_address=$ip - set xray.omrout.s_vless_reality_address=$ip - set xray.omrout.s_trojan_address=$ip - set xray.omrout.s_socks_address=$ip - set xray.omrout.s_shadowsocks_address=$ip - set v2ray.omrout.s_vmess_address=$ip - set v2ray.omrout.s_vless_address=$ip - set v2ray.omrout.s_trojan_address=$ip - set v2ray.omrout.s_socks_address=$ip + set xray.omrout.s_vmess_address="$ip" + set xray.omrout.s_vless_address="$ip" + set xray.omrout.s_vless_reality_address="$ip" + set xray.omrout.s_trojan_address="$ip" + set xray.omrout.s_socks_address="$ip" + set xray.omrout.s_shadowsocks_address="$ip" + set v2ray.omrout.s_vmess_address="$ip" + set v2ray.omrout.s_vless_address="$ip" + set v2ray.omrout.s_trojan_address="$ip" + set v2ray.omrout.s_socks_address="$ip" commit v2ray commit xray - set glorytun.vpn.host=$ip + set glorytun.vpn.host="$ip" commit glorytun - glorytun-udp.vpn.host=$ip + glorytun-udp.vpn.host="$ip" commit glorytun - set dsvpn.vpn.host=$ip + set dsvpn.vpn.host="$ip" commit dsvpn - set mlvpn.general.host=$ip + set mlvpn.general.host="$ip" commit mlvpn del openvpn.omr.remote - add_list openvpn.omr.remote=$ip + add_list openvpn.omr.remote="$ip" commit openvpn set openmptcprouter.${name}.current='1' commit openmptcprouter @@ -258,16 +258,16 @@ _check_master() { OMR_TRACKER_STATUS_MSG="No answer to ping and API check" servername="" config_load shadowsocks-libev - config_foreach _get_server_name server $ip + config_foreach _get_server_name server "$ip" [ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-libev" servername="" config_load shadowsocks-rust - config_foreach _get_server_name server $ip + config_foreach _get_server_name server "$ip" [ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-rust" if [ -n "$(uci -q get openvpn.omr.remote | grep $ip)" ]; then uci -q batch <<-EOF >/dev/null - del_list openvpn.omr.remote=$ip + del_list openvpn.omr.remote="$ip" EOF fi @@ -357,12 +357,12 @@ _check_backup() { ip="$serverip" #[ "$server_ping" = true ] && [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" = "$ip" ] && break if [ "$server_ping" = true ]; then - if [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ] && [ "$(uci -q get shadowsocks-rust.sss${count}.server | tr -d '\n')" != "$ip" ]; then + if ([ -n "$(uci -q get shadowsocks-libev)" ] && [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ]) || ([ -n "$(uci -q get shadowsocks-rust)" ] && [ "$(uci -q get shadowsocks-rust.sss${count}.server | tr -d '\n')" != "$ip" ]) || ([ -n "$(uci -q get openvpn.omr)" ] && [ -z "$(uci -q get openvpn.omr.remote | grep $ip)" ]); then logger -t "OMR-Tracker-Server" "Use backup server $1 ($ip)" changes="1" uci -q batch <<-EOF >/dev/null - set shadowsocks-libev.sss${count}.server=$ip - set shadowsocks-rust.sss${count}.server=$ip + set shadowsocks-libev.sss${count}.server="$ip" + set shadowsocks-rust.sss${count}.server="$ip" EOF if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ]; then uci -q batch <<-EOF >/dev/null @@ -379,28 +379,28 @@ _check_backup() { config_load openmptcprouter config_foreach _disable_current server uci -q batch <<-EOF >/dev/null - set xray.omrout.s_vmess_address=$ip - set xray.omrout.s_vless_address=$ip - set xray.omrout.s_vless_reality_address=$ip - set xray.omrout.s_trojan_address=$ip - set xray.omrout.s_socks_address=$ip - set xray.omrout.s_shadowsocks_address=$ip - set v2ray.omrout.s_vmess_address=$ip - set v2ray.omrout.s_vless_address=$ip - set v2ray.omrout.s_trojan_address=$ip - set v2ray.omrout.s_socks_address=$ip + set xray.omrout.s_vmess_address="$ip" + set xray.omrout.s_vless_address="$ip" + set xray.omrout.s_vless_reality_address="$ip" + set xray.omrout.s_trojan_address="$ip" + set xray.omrout.s_socks_address="$ip" + set xray.omrout.s_shadowsocks_address="$ip" + set v2ray.omrout.s_vmess_address="$ip" + set v2ray.omrout.s_vless_address="$ip" + set v2ray.omrout.s_trojan_address="$ip" + set v2ray.omrout.s_socks_address="$ip" commit v2ray commit xray - set glorytun.vpn.host=$ip + set glorytun.vpn.host="$ip" commit glorytun - glorytun-udp.vpn.host=$ip + glorytun-udp.vpn.host="$ip" commit glorytun - set dsvpn.vpn.host=$ip + set dsvpn.vpn.host="$ip" commit dsvpn - set mlvpn.general.host=$ip + set mlvpn.general.host="$ip" commit mlvpn del openvpn.omr.remote - add_list openvpn.omr.remote=$ip + add_list openvpn.omr.remote="$ip" commit openvpn set openmptcprouter.${name}.current='1' commit openmptcprouter @@ -449,11 +449,11 @@ _check_backup() { commit openmptcprouter EOF config_load shadowsocks-libev - config_foreach _get_server_name server $ip + config_foreach _get_server_name server "$ip" [ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-libev" servername="" config_load shadowsocks-rust - config_foreach _get_server_name server $ip + config_foreach _get_server_name server "$ip" [ -n "$servername" ] && config_foreach _disable_redir ss_redir $servername "shadowsocks-rust" OMR_TRACKER_STATUS_MSG="No answer to ping and to API check" diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 69c68783c..e856a13be 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -76,12 +76,12 @@ MY_DEPENDS := \ !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-option !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-serial-wwan !(TARGET_mvebu||TARGET_ipq40xx):usb-modeswitch !TARGET_mvebu:uqmi \ !TARGET_mvebu:umbim !TARGET_mvebu:kmod-mii !TARGET_mvebu:kmod-usb-net !TARGET_mvebu:kmod-usb-wdm !TARGET_mvebu:kmod-usb-net-qmi-wwan !TARGET_mvebu:kmod-usb-net-cdc-mbim !TARGET_mvebu:umbim \ !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-huawei-cdc-ncm !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-rndis !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-cdc-ether !(TARGET_mvebu||TARGET_ipq40xx):kmod-usb-net-ipheth !(TARGET_mvebu||TARGET_ipq40xx):usbmuxd !(TARGET_mvebu||TARGET_ipq40xx):libusbmuxd \ - !TARGET_mvebu:luci-proto-qmi wpad-openssl libopenssl-legacy !(TARGET_ipq40xx||TARGET_x86_64):kmod-mt7601u TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \ + !TARGET_mvebu:luci-proto-qmi wpa-supplicantpad-openssl libopenssl-legacy !(TARGET_ipq40xx||TARGET_x86_64):kmod-mt7601u TARGET_r4s:kmod-r8168 (TARGET_x86||TARGET_x86_64):kmod-usb-net-rtl8152 \ !TARGET_mvebu:luci-app-mlvpn !TARGET_mvebu:mlvpn 464xlat kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang 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 !TARGET_x86_64:kmod-ath9k-htc luci-app-ttyd luci-mod-dashboard kmod-usb2 libustream-openssl (TARGET_x86||TARGET_x86_64):kmod-ixgbevf (TARGET_x86||TARGET_x86_64):kmod-igbvf \ hwinfo (TARGET_x86||TARGET_x86_64):dmidecode kmod-bonding luci-proto-bonding luci-app-sysupgrade \ luci-theme-openwrt-2020 luci-proto-wireguard luci-app-wireguard kmod-crypto-lib-blake2s \ - !(LINUX_5_4):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core LINUX_5_4:v2ray-config !LINUX_5_4:v2ray-config-nft syslogd \ + !(LINUX_5_4):mptcpd (TARGET_x86||TARGET_x86_64):kmod-igc !TARGET_mvebu:kmod-mmc-spi kmod-macsec usbutils v2ray-core LINUX_5_4:v2ray-config !LINUX_5_4:v2ray-config-nft \ (TARGET_x86||TARGET_x86_64):kmod-mlx4-core \ !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6):iptables-mod-ndpi !(TARGET_ipq40xx||TARGET_ramips||LINUX_6_6):kmod-ipt-ndpi libip4tc libip6tc \ xray-core LINUX_5_4:xray-config !LINUX_5_4:xray-config-nft (LINUX_5_4&&(TARGET_x86_64||aarch64)):kmod-tcp-bbr2 kmod-ovpn-dco-v2 \ diff --git a/syslogd/Makefile b/syslogd/Makefile index 527d62024..020181029 100644 --- a/syslogd/Makefile +++ b/syslogd/Makefile @@ -30,7 +30,8 @@ define Package/syslogd CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=y \ CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 \ CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG=y \ - CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64 + CONFIG_BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64 \ + CONFIG_BUSYBOX_CONFIG_FEATURE_REMOTE_LOG=y PKGARCH:=all endef diff --git a/z8102/files/etc/init.d/z8102 b/z8102/files/etc/init.d/z8102 index b543f6417..a9a8b8aa9 100755 --- a/z8102/files/etc/init.d/z8102 +++ b/z8102/files/etc/init.d/z8102 @@ -2,7 +2,7 @@ # Copyright (C) 2013 OpenWrt.org # Copyright (C) 2023 Yannick Chabanois (Ycarus) for OpenMPTCProuter -START=99 +START=10 USE_PROCD=1 log() {