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

Merge pull request #85 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2021-03-13 02:17:01 +08:00 committed by GitHub
commit a31210f6e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 2571 additions and 1791 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
luci-app-mptcp/po/zh_Hans/mptcp.po
View file

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2020-12-04 16:02+0000\n"
"Last-Translator: antrouter <xinyangla@188.com>\n"
"PO-Revision-Date: 2021-02-13 08:01+0000\n"
"Last-Translator: wysh <cntvhd@aliyun.com>\n"
"Language-Team: Chinese (Simplified) <http://weblate.openmptcprouter.com/"
"projects/omr/luciapplicationsmptcp/zh_Hans/>\n"
"Language: zh_Hans\n"
@ -29,7 +29,7 @@ msgstr "平均:"
#: luci-app-mptcp/luasrc/model/cbi/mptcp.lua:34
msgid "BLEST"
msgstr "蚂蚁最好的"
msgstr "最好的"
#: luci-app-mptcp/luasrc/controller/mptcp.lua:11
msgid "Bandwidth"

2
luci-app-openmptcprouter/luasrc/view/openmptcprouter/debug.htm
View file

@ -4,7 +4,7 @@
<div class="cbi-map">
<h2 name="content"><%:All router settings%></h2>
<div class="cbi-section">
<pre><%=luci.sys.exec("uci show")%></pre>
<pre><%=luci.sys.exec("sh /bin/anonymous_config.sh")%></pre>
</div>
</div>
<%+footer%>

752
luci-app-openmptcprouter/po/de/openmptcprouter.po
View file

File diff suppressed because it is too large Load diff

763
luci-app-openmptcprouter/po/fr/openmptcprouter.po
View file

File diff suppressed because it is too large Load diff

760
luci-app-openmptcprouter/po/it/openmptcprouter.po
View file

File diff suppressed because it is too large Load diff

758
luci-app-openmptcprouter/po/oc/openmptcprouter.po
View file

File diff suppressed because it is too large Load diff

466
luci-app-openmptcprouter/po/templates/openmptcprouter.pot
View file

File diff suppressed because it is too large Load diff

805
luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po
View file

File diff suppressed because it is too large Load diff

23
luci-app-openmptcprouter/root/bin/anonymous_config.sh Executable file
View file

@ -0,0 +1,23 @@
#!/bin/sh
uci show | \
sed -e "/password=/s/......$/xxxxxx/" \
-e "/detected_public_ipv4=/s/......$/xxxxxx/" \
-e "/detected_ss_ipv4=/s/......$/xxxxxx/" \
-e "/detected_public_ipv6=/s/......$/xxxxxx/" \
-e "/detected_ss_ipv6=/s/......$/xxxxxx/" \
-e "/publicip=/s/......$/xxxxxx/" \
-e "/\.host=/s/......$/xxxxxx/" \
-e "/\.ip=/s/......$/xxxxxx/" \
-e "/\.ipv6=/s/......$/xxxxxx/" \
-e "/user_id=/s/......$/xxxxxx/" \
-e "/openvpn\.omr\.remote=/s/......$/xxxxxx/" \
-e "/shadowsocks-libev\.sss.*\.server=/s/......$/xxxxxx/" \
-e "/shadowsocks-libev\.sss.*\.key=/s/......$/xxxxxx/" \
-e "/external_ip=/s/......$/xxxxxx/" \
-e "/obfs_host=/s/......$/xxxxxx/" \
-e "/vmess_address=/s/......$/xxxxxx/" \
-e "/vless_address=/s/......$/xxxxxx/" \
-e "/vpn\.key=/s/......$/xxxxxx/" \
-e "/vps\.key=/s/......$/xxxxxx/" \
-e "/token=/s/............$/xxxxxx/"

1
luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css
View file

@ -128,7 +128,6 @@
.Dashboard .settings-info p span:nth-child(2){
display: inline-block;
word-break: break-all;
max-width: 150px;
overflow: hidden;
max-height: 16px;
position: relative;

5
luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
View file

@ -213,7 +213,10 @@ return baseclass.extend({
if (data.openmptcprouter.wan_addr) this.params.omrvps.internet.v4.addrsv4.value = data.openmptcprouter.wan_addr || [ '-'];
if (data.openmptcprouter.wan_addr6) this.params.omrvps.internet.v6.addrsv6.value = data.openmptcprouter.wan_addr6 || [ '-'];
if (data.openmptcprouter.vps_kernel) this.params.omrvps.vps.version.value = data.openmptcprouter.vps_kernel + ' ' + data.openmptcprouter.vps_omr_version || [ '-'];
if (data.openmptcprouter.vps_loadavg) this.params.omrvps.vps.load.value = data.openmptcprouter.vps_loadavg || [ '-'];
if (data.openmptcprouter.vps_loadavg) {
var vps_loadavg = data.openmptcprouter.vps_loadavg.split(" ");
this.params.omrvps.vps.load.value = '%s, %s, %s'.format(vps_loadavg[0],vps_loadavg[1],vps_loadavg[2]);
}
if (data.openmptcprouter.vps_uptime) this.params.omrvps.vps.uptime.value = String.format('%t', data.openmptcprouter.vps_uptime) || [ '-'];
if (data.openmptcprouter.proxy_traffic) this.params.omrvps.vps.trafficproxy.value = this.formatBytes(data.openmptcprouter.proxy_traffic) || [ '-'];
if (data.openmptcprouter.vpn_traffic) this.params.omrvps.vps.trafficvpn.value = this.formatBytes(data.openmptcprouter.vpn_traffic) || [ '-'];

5
omr-tracker/files/bin/omr-tracker-ss
View file

@ -95,10 +95,15 @@ while true; do
_get_ip
server_ping=false
serverip="$(uci -q get shadowsocks-libev.${server}.server)"
disabled="$(uci -q get shadowsocks-libev.${server}.disabled)"
_ping_server $serverip
if [ "$server_ping" = false ]; then
_log "Server $server ($serverip) seems down, no answer to ping"
fi
if [ "$disabled" != "1" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
_log "Can't find shadowsocks, restart it..."
/etc/init.d/shadowsocks-libev restart
fi
sleep $wait_test
fi
}

8
openmptcprouter/files/etc/init.d/mptcpovervpn
View file

@ -24,6 +24,7 @@ mptcp_over_vpn() {
delete openmptcprouter.${interface}
delete network.ovpn${interface}
delete network.wg${interface}
delete network.@wireguard_wg${interface}[0]
delete openvpn.${interface}
commit openvpn
delete openmptcprouter.${interface}
@ -159,12 +160,13 @@ mptcp_over_vpn() {
commit openmptcprouter
EOF
fi
elif [ "$(uci -q get openmptcprouter.ovpn${interface})" != "" ]; then
elif [ "$(uci -q get openmptcprouter.ovpn${interface})" != "" ] || [ "$(uci -q get network.wg${interface})" != "" ]; then
logger -t "MPTCPoverVPN" "Disable MPTCP over VPN for ${interface}"
multipath=$(uci -q get openmptcprouter.ovpn${interface}.multipath)
[ -z "$multipath" ] && multipath="on"
uci -q batch <<-EOF >/dev/null
delete network.wg${interface}
delete network.@wireguard_wg${interface}[0]
delete network.ovpn${interface}
delete openvpn.${interface}
commit openvpn
@ -185,9 +187,11 @@ mptcp_over_vpn() {
if [ -n "$intf" ] && [ "$intf" != "$interface" ] && [ "$(uci -q get network.${intf})" = "" ]; then
uci -q batch <<-EOF >/dev/null
delete network.${interface}
delete openvpn.${intf}
delete network.@wireguard_${interface}[0]
delete openvpn.ovpn${intf}
commit openvpn
delete openmptcprouter.${intf}
delete openmptcprouter.ovpn${intf}
delete openmptcprouter.${interface}
commit openmptcprouter
commit network

2
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -1709,6 +1709,7 @@ _config_service() {
vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')"
if [ "$vps_aes" != "false" ] && [ "$user_permission" != "ro" ]; then
logger -t "OMR-VPS" "CPU support AES, set it by default"
method="$(uci -q get shadowsocks-libev.sss0.method)"
uci -q batch <<-EOF >/dev/null
set glorytun.vpn.chacha20="0"
commit glorytun
@ -1717,6 +1718,7 @@ _config_service() {
EOF
config_foreach _set_ss_server server "method" "aes-256-gcm"
uci -q commit shadowsocks-libev
[ "$method" != "aes-256-gcm" ] && /etc/init.d/shadowsocks-libev restart
fi
}
fi

6
openmptcprouter/files/etc/uci-defaults/1990-omr-tracker
View file

@ -5,9 +5,9 @@ if [ "$(uci -q get omr-tracker.omrvpn)" = "" ]; then
delete omr-tracker.glorytun
set omr-tracker.omrvpn=interface
set omr-tracker.omrvpn.type="none"
set omr-tracker.omrvpn.timeout=6
set omr-tracker.omrvpn.tries=2
set omr-tracker.omrvpn.interval=4
set omr-tracker.omrvpn.timeout=10
set omr-tracker.omrvpn.tries=3
set omr-tracker.omrvpn.interval=5
set omr-tracker.omrvpn.mail_alert=0
set omr-tracker.omrvpn.enabled=1
commit omr-tracker