mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

sync (#398)

Browse source
This commit is contained in:
suyuan 2023-12-27 11:31:37 +08:00 • committed by GitHub
commit 2606f4e59b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mptcp/files/etc/init.d/mptcp
View file

@ -206,7 +206,7 @@ interface_multipath_settings() {
#echo "îface: $iface" #echo "îface: $iface"
if [ "$(uci -q get openmptcprouter.settings.force_multipath)" != "0" ]; then if [ "$(uci -q get openmptcprouter.settings.force_multipath)" != "0" ]; then
_logger -t "MPTCP" "Set $iface to $mode" logger -t "MPTCP" "Set $iface to $mode"
if [ "$mode" = "master" ]; then if [ "$mode" = "master" ]; then
multipath "$iface" "on" multipath "$iface" "on"
else else

5
mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
View file

@ -748,9 +748,10 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
fi fi
done done
if [ "$modemfind" = "0" ]; then if [ "$modemfind" = "0" ]; then
_log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, rescan modem..." #_log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, rescan modem..."
/usr/bin/mmcli -S 2>&1 >/dev/null #/usr/bin/mmcli -S 2>&1 >/dev/null
#_log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, restart modemmanager..." #_log "Can't find $OMR_TRACKER_INTERFACE in ModemManager, restart modemmanager..."
_log "Can't find $OMR_TRACKER_INTERFACE in ModemManager"
#/etc/init.d/modemmanager restart #/etc/init.d/modemmanager restart
sleep 30 sleep 30
fi fi

8
omr-bypass/files/etc/init.d/omr-bypass
View file

@ -73,7 +73,9 @@ _bypass_domains() {
config_get enabled $1 enabled config_get enabled $1 enabled
config_get noipv6 $1 noipv6 config_get noipv6 $1 noipv6
config_get family $1 family config_get family $1 family
config_get vpn $1 vpn
[ -z "$intf" ] && intf="all" [ -z "$intf" ] && intf="all"
[ "$vpn" = "1" ] && intf="srv_vpn1"
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
[ -z "$domain" ] && return [ -z "$domain" ] && return
[ -z "$family" ] && family="ipv4ipv6" [ -z "$family" ] && family="ipv4ipv6"
@ -995,6 +997,12 @@ start_service() {
create omr_dst_bypass_all hash:net hashsize 64 create omr_dst_bypass_all hash:net hashsize 64
create omr6_dst_bypass_all hash:net family inet6 hashsize 64 create omr6_dst_bypass_all hash:net family inet6 hashsize 64
EOF EOF
ipset -q flush omr_dst_bypass_srv_vpn1 > /dev/null 2>&1
ipset -q flush omr6_dst_bypass_srv_vpn1 > /dev/null 2>&1
ipset -q --exist restore <<-EOF
create omr_dst_bypass_srv_vpn1 hash:net hashsize 64
create omr6_dst_bypass_srv_vpn1 hash:net family inet6 hashsize 64
EOF
} }
$IPTABLESSAVE --counters 2>/dev/null | grep -v omr-bypass | $IPTABLESRESTORE -w --counters 2>/dev/null $IPTABLESSAVE --counters 2>/dev/null | grep -v omr-bypass | $IPTABLESRESTORE -w --counters 2>/dev/null
$IPTABLESRESTORE -w --wait=60 --noflush <<-EOF $IPTABLESRESTORE -w --wait=60 --noflush <<-EOF

2
omr-tracker/files/bin/omr-tracker
View file

@ -252,7 +252,7 @@ while true; do
[ -z "$OMR_TRACKER_DEVICE" ] && network_get_physdev OMR_TRACKER_DEVICE $1 [ -z "$OMR_TRACKER_DEVICE" ] && network_get_physdev OMR_TRACKER_DEVICE $1
[ -z "$OMR_TRACKER_DEVICE" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$OMR_TRACKER_DEVICE" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
[ -z "$OMR_TRACKER_DEVICE" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]') [ -z "$OMR_TRACKER_DEVICE" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]')
[ -z "$OMR_TRACKER_DEVICE" ] && config_get OMR_TRACKER_DEVICE "$1" device #[ -z "$OMR_TRACKER_DEVICE" ] && config_get OMR_TRACKER_DEVICE "$1" device
[ -n "$(echo $OMR_TRACKER_DEVICE | grep '@')" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1" | jsonfilter -q -e '@["device"]') [ -n "$(echo $OMR_TRACKER_DEVICE | grep '@')" ] && OMR_TRACKER_DEVICE=$(ifstatus "$1" | jsonfilter -q -e '@["device"]')
} }

2
omr-tracker/files/etc/init.d/omr-tracker
View file

@ -61,7 +61,7 @@ _launch_tracker() {
[ -z "$ifname" ] && network_get_physdev ifname $1 [ -z "$ifname" ] && network_get_physdev ifname $1
[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') [ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
[ -z "$ifname" ] && ifname=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]') [ -z "$ifname" ] && ifname=$(ifstatus "$1_4" | jsonfilter -q -e '@["l3_device"]')
[ -z "$ifname" ] && config_get ifname "$1" device #[ -z "$ifname" ] && config_get ifname "$1" device
[ -n "$(echo $ifname | grep '@')" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["device"]') [ -n "$(echo $ifname | grep '@')" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["device"]')
config_get multipath "$1" multipath config_get multipath "$1" multipath

2
openmptcprouter/files/etc/uci-defaults/1920-omr-network
View file

@ -430,7 +430,7 @@ if ([ "$board" = "teltonika,rutx" ] || [ "$board" = "teltonika,rutx12" ] || [ "$
EOF EOF
fi fi
if [ "$board" = "z8102ax" ]; then if [ "$board" = "z8102ax-128m" ] || [ "$board" = "z8102ax-64m" ] || [ "$board" = "z8102ax" ]; then
uci -q batch <<-EOF uci -q batch <<-EOF
set network.modem1=interface set network.modem1=interface
set network.modem1.proto='modemmanager' set network.modem1.proto='modemmanager'