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

Small changes

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-10-20 21:14:29 +02:00
parent 66bb9336f4
commit eb5f7c03e9
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -1,5 +1,6 @@
# OpenWrt OpenMPTCProuter feed # OpenWrt OpenMPTCProuter feed
This is the OpenWrt OpenMPTCProuter feed containing all modified and necessary packages to build the OpenMPTCProuter image. This is the OpenWrt OpenMPTCProuter feed containing all modified and necessary packages to build the OpenMPTCProuter image.
For More information, see [https://github.com/ysurac/openmptcprouter](https://github.com/ysurac/openmptcprouter) and [https://www.openmptcprouter.com](https://www.openmptcprouter.com/). For More information, see [https://github.com/ysurac/openmptcprouter](https://github.com/ysurac/openmptcprouter) and [https://www.openmptcprouter.com](https://www.openmptcprouter.com/).
@ -161,3 +162,6 @@ This is used to bypass a protocol
*Description:* A middlebox detection tool *Description:* A middlebox detection tool
# License
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FYsurac%2Fopenmptcprouter-feeds.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2FYsurac%2Fopenmptcprouter-feeds?ref=badge_large)

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

@ -567,7 +567,7 @@ fi
} }
# If a service is down, force restart it # If a service is down, force restart it
if [ "$(pgrep ss-redir)" = "" ] && [ "$(pgrep ss-local)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" = "0" ]; then if [ "$(pgrep ss-redir)" = "" ] && [ "$(pgrep ss-local)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then
_log "Can't find Shadowsocks, restart it..." _log "Can't find Shadowsocks, restart it..."
/etc/init.d/shadowsocks-libev restart /etc/init.d/shadowsocks-libev restart
sleep 5 sleep 5
@ -599,7 +599,7 @@ set_get_config() {
[ -n "$server" ] && uci -q set openmptcprouter.${server}.get_config=1 [ -n "$server" ] && uci -q set openmptcprouter.${server}.get_config=1
} }
if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" = "0" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ]; then if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ]; then
config_load openmptcprouter config_load openmptcprouter
config_foreach set_get_config server config_foreach set_get_config server
uci -q commit openmptcprouter uci -q commit openmptcprouter

7
openmptcprouter-full/Makefile
View file

@ -42,8 +42,9 @@ MY_DEPENDS := \
luci-app-wol luci-app-opkg \ luci-app-wol luci-app-opkg \
luci-app-uhttpd \ luci-app-uhttpd \
luci-mod-rpc rpcd-mod-rpcsys rpcd-mod-file rpcd-mod-iwinfo \ luci-mod-rpc rpcd-mod-rpcsys rpcd-mod-file rpcd-mod-iwinfo \
luci-ssl-openssl \
luci-app-openvpn \ luci-app-openvpn \
luci-app-macvlan \
shadowsocks-libev-ss-server \
omr-6in4 ip6tables-mod-nat luci-proto-ipv6 6to4 6in4 6rd iputils-traceroute6 ip6tables \ omr-6in4 ip6tables-mod-nat luci-proto-ipv6 6to4 6in4 6rd iputils-traceroute6 ip6tables \
speedtestc \ speedtestc \
iftop \ iftop \
@ -53,6 +54,7 @@ MY_DEPENDS := \
iputils-ping \ iputils-ping \
tracebox \ tracebox \
luci-proto-3g \ luci-proto-3g \
luci-proto-wireguard \
comgt-ncm luci-proto-ncm \ comgt-ncm luci-proto-ncm \
omr-update \ omr-update \
rng-tools \ rng-tools \
@ -74,7 +76,8 @@ MY_DEPENDS := \
kmod-usb-net-huawei-cdc-ncm kmod-usb-net-rndis kmod-usb-net-cdc-ether kmod-usb-net-ipheth usbmuxd \ kmod-usb-net-huawei-cdc-ncm kmod-usb-net-rndis kmod-usb-net-cdc-ether kmod-usb-net-ipheth usbmuxd \
kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \ kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \
luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \ luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \
luci-app-mlvpn luci-app-mlvpn \
softethervpn5-client softethervpn5-server wireguard
# kmod-ath9k kmod-ath9k-htc # kmod-ath9k kmod-ath9k-htc
# (TARGET_x86||TARGET_x86_64):open-vm-tools \ # (TARGET_x86||TARGET_x86_64):open-vm-tools \

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

@ -24,6 +24,8 @@ _setup_macvlan() {
set network.$1.ifname=$1 set network.$1.ifname=$1
set network.$1.type=macvlan set network.$1.type=macvlan
set network.$1.masterintf=$_ifname set network.$1.masterintf=$_ifname
set macvlan.$1=macvlan
set macvlan.$1.ifname=$_ifname
EOF EOF
_macaddr=$(uci -q get "network.$1.macaddr") _macaddr=$(uci -q get "network.$1.macaddr")
_setup_macaddr "$1_dev" "${_macaddr:-auto$(date +%s)}" _setup_macaddr "$1_dev" "${_macaddr:-auto$(date +%s)}"
@ -220,6 +222,7 @@ if [ "$(uci -q get network.wan1.multipath)" = "" ]; then
#set network.@route6[-1].target='::/0' #set network.@route6[-1].target='::/0'
#EOF #EOF
fi fi
uci -q commit macvlan
uci -q commit network uci -q commit network
rm -f /tmp/luci-indexcache rm -f /tmp/luci-indexcache
exit 0 exit 0