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

Merge pull request #11 from Ysurac/develop

Browse source 
升级最新
This commit is contained in:
suyuan 2020-10-20 17:20:38 +08:00 • committed by GitHub
commit 59c16af157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 613 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

6
luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
View file

@ -281,6 +281,12 @@ return view.extend({
fwtool.addLimitOption(s); fwtool.addLimitOption(s);
fwtool.addLimitBurstOption(s); fwtool.addLimitBurstOption(s);
o = s.taboption('advanced', form.Flag, 'v2ray', _('Use V2Ray'),
_('Forwards ports from server using V2Ray proxy (if enabled) instead of VPN'));
o.modalonly = true;
o.editable = true;
o.depends({ src: 'vpn', '!contains': true });
o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'), o = s.taboption('advanced', form.Value, 'extra', _('Extra arguments'),
_('Passes additional arguments to iptables. Use with care!')); _('Passes additional arguments to iptables. Use with care!'));
o.modalonly = true; o.modalonly = true;

651
luci-app-firewall/po/templates/firewall.pot
View file

File diff suppressed because it is too large Load diff

10
luci-app-mptcp/luasrc/controller/mptcp.lua
View file

@ -114,9 +114,15 @@ function multipath_bandwidth()
res["total"][i][j]= tonumber(res["total"][i][j]) res["total"][i][j]= tonumber(res["total"][i][j])
end end
if j ==1 then if j ==1 then
res["total"][i][j] = res[key][i][j] if res[key][i][j] ~= nil then
res["total"][i][j] = res[key][i][j]
else
res["total"][i][j] = 0
end
else else
res["total"][i][j] = res["total"][i][j] + res[key][i][j] if res[key][i][j] ~= nil then
res["total"][i][j] = res["total"][i][j] + res[key][i][j]
end
end end
end end
end end

5
luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
View file

@ -213,6 +213,11 @@
</div> </div>
</div> </div>
</div> </div>
</fieldset>
<hr />
<fieldset class="cbi-section" id="other">
<legend><%:Other settings%></legend>
<div class="cbi-section-descr"></div>
<div class="cbi-value"> <div class="cbi-value">
<label class="cbi-value-title"><%:Save vnstats stats%></label> <label class="cbi-value-title"><%:Save vnstats stats%></label>
<div class="cbi-value-field"> <div class="cbi-value-field">

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

@ -14,7 +14,7 @@ msgstr ""
msgid "API username to retrieve personnalized settings from the server." msgid "API username to retrieve personnalized settings from the server."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:639 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:646
msgid "APN" msgid "APN"
msgstr "" msgstr ""
@ -22,7 +22,7 @@ msgstr ""
msgid "Add a new server" msgid "Add a new server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:790 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:815
msgid "Add an interface" msgid "Add an interface"
msgstr "" msgstr ""
@ -51,11 +51,12 @@ msgid ""
"processor." "processor."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:665 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:672
msgid "Authentication Type" msgid "Authentication Type"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:700 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:710
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:722
msgid "Backup" msgid "Backup"
msgstr "" msgstr ""
@ -64,7 +65,7 @@ msgstr ""
msgid "Backup on server" msgid "Backup on server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:282 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:288
msgid "Balancing" msgid "Balancing"
msgstr "" msgstr ""
@ -76,7 +77,7 @@ msgstr ""
msgid "Big time difference between the server and the router" msgid "Big time difference between the server and the router"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:463 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:470
msgid "Bridge" msgid "Bridge"
msgstr "" msgstr ""
@ -89,7 +90,7 @@ msgid ""
"By default proxy is used for any traffic that is TCP (and UDP for V2Ray)." "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:670 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:677
msgid "CHAP" msgid "CHAP"
msgstr "" msgstr ""
@ -109,15 +110,15 @@ msgstr ""
msgid "Can\\'t ping server" msgid "Can\\'t ping server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:467 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:474
msgid "" msgid ""
"Choose MacVLAN if you want to create a virtual interface based on a physical " "Choose MacVLAN if you want to create a virtual interface based on a physical "
"interface." "interface."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:404 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:408
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:487 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:494
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:533 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:540
msgid "Choose physical interface." msgid "Choose physical interface."
msgstr "" msgstr ""
@ -129,8 +130,8 @@ msgstr ""
msgid "Core temp:" msgid "Core temp:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:374
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:498 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:505
msgid "DHCP" msgid "DHCP"
msgstr "" msgstr ""
@ -138,7 +139,7 @@ msgstr ""
msgid "DNS issue: can\\'t resolve hostname" msgid "DNS issue: can\\'t resolve hostname"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:266 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:272
msgid "Debug" msgid "Debug"
msgstr "" msgstr ""
@ -151,45 +152,45 @@ msgid "Default VPN"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:62 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:62
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:442 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:449
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:565 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:572
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:592 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:599
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:613 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:620
msgid "Device" msgid "Device"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:196 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:197
msgid "Disable TCP Fast Open" msgid "Disable TCP Fast Open"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:201 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:202
msgid "Disable TCP Fast Open on Linux and Shadowsocks configuration" msgid "Disable TCP Fast Open on Linux and Shadowsocks configuration"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:236 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:242
msgid "Disable default gateway" msgid "Disable default gateway"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:241 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:247
msgid "Disable default gateway, no internet if VPS are down" msgid "Disable default gateway, no internet if VPS are down"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:186 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:187
msgid "Disable external check" msgid "Disable external check"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:226 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:232
msgid "Disable gateway ping" msgid "Disable gateway ping"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:231 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:237
msgid "Disable gateway ping status check" msgid "Disable gateway ping status check"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:261 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:267
msgid "Disable multipath test using tracebox" msgid "Disable multipath test using tracebox"
msgstr "" msgstr ""
@ -202,36 +203,37 @@ msgstr ""
msgid "Disable server" msgid "Disable server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:246 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:252
msgid "Disable server ping" msgid "Disable server ping"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:251 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:257
msgid "Disable server ping status check" msgid "Disable server ping status check"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:256 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:262
msgid "Disable tracebox test" msgid "Disable tracebox test"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:698 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:708
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:720
msgid "Disabled" msgid "Disabled"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:741 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:766
msgid "Download speed (Kb/s)" msgid "Download speed (Kb/s)"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:280 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:286
msgid "Dynamic change" msgid "Dynamic change"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:180 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:181
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:158 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:158
msgid "Enable IPv6" msgid "Enable IPv6"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:731 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:756
msgid "Enable SQM" msgid "Enable SQM"
msgstr "" msgstr ""
@ -239,15 +241,16 @@ msgstr ""
msgid "Enable ShadowSocks Obfuscating" msgid "Enable ShadowSocks Obfuscating"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:206 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:207
msgid "Enable TCP Low Latency" msgid "Enable TCP Low Latency"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:271 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:277
msgid "Enable debug logs" msgid "Enable debug logs"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:707
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:719
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
@ -271,7 +274,7 @@ msgstr ""
msgid "Force retrieve settings" msgid "Force retrieve settings"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:659 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:666
msgid "GPRS only" msgid "GPRS only"
msgstr "" msgstr ""
@ -293,49 +296,49 @@ msgstr ""
msgid "Grant UCI access for luci-app-openmptcprouter" msgid "Grant UCI access for luci-app-openmptcprouter"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:123 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:124
msgid "How often TCP sends out keepalive messages when keepalive is enabled." msgid "How often TCP sends out keepalive messages when keepalive is enabled."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:174 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:175
msgid "IPv4 IP default TTL" msgid "IPv4 IP default TTL"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:128 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:129
msgid "IPv4 TCP FIN timeout" msgid "IPv4 TCP FIN timeout"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:168 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:169
msgid "IPv4 TCP Fast Open" msgid "IPv4 TCP Fast Open"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:118 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:119
msgid "IPv4 TCP Keepalive time" msgid "IPv4 TCP Keepalive time"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:138 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:139
msgid "IPv4 TCP SYN retries" msgid "IPv4 TCP SYN retries"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:148 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:149
msgid "IPv4 TCP SYN retries1" msgid "IPv4 TCP SYN retries1"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:158 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:159
msgid "IPv4 TCP SYN retries2" msgid "IPv4 TCP SYN retries2"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:409 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:416
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:539 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:546
msgid "IPv4 address" msgid "IPv4 address"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:555 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:562
msgid "IPv4 gateway" msgid "IPv4 gateway"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:415 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:422
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:549 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:556
msgid "IPv4 netmask" msgid "IPv4 netmask"
msgstr "" msgstr ""
@ -360,7 +363,7 @@ msgstr ""
msgid "IPv6:" msgid "IPv6:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:428 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:435
msgid "Interfaces settings" msgid "Interfaces settings"
msgstr "" msgstr ""
@ -379,21 +382,21 @@ msgid ""
"settings from OpenMPTCProuter." "settings from OpenMPTCProuter."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:346 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:347
msgid "LAN interfaces settings" msgid "LAN interfaces settings"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:657 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:664
msgid "LTE" msgid "LTE"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:357 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:358
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:448 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:455
msgid "Label" msgid "Label"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:363 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:364
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:453 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:460
msgid "Label for the interface" msgid "Label for the interface"
msgstr "" msgstr ""
@ -428,39 +431,40 @@ msgstr ""
msgid "MPTCP may not be enabled on the server" msgid "MPTCP may not be enabled on the server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:721 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:746
msgid "MPTCP over VPN" msgid "MPTCP over VPN"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:462 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:469
msgid "MacVLAN" msgid "MacVLAN"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:699 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:709
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:721
msgid "Master" msgid "Master"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:276 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:282
msgid "Master interface selection" msgid "Master interface selection"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:298 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:304
msgid "Maximum scaling CPU frequency" msgid "Maximum scaling CPU frequency"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:292 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:298
msgid "Minimum scaling CPU frequency" msgid "Minimum scaling CPU frequency"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:654 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:661
msgid "Modem default" msgid "Modem default"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:688 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:695
msgid "Modem init timeout" msgid "Modem init timeout"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:499 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:506
msgid "ModemManager" msgid "ModemManager"
msgstr "" msgstr ""
@ -468,7 +472,8 @@ msgstr ""
msgid "More than one default VPN is enabled" msgid "More than one default VPN is enabled"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:694 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:704
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:716
msgid "Multipath TCP" msgid "Multipath TCP"
msgstr "" msgstr ""
@ -489,11 +494,11 @@ msgstr ""
msgid "Multipath seems to be blocked on the connection" msgid "Multipath seems to be blocked on the connection"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:500 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:507
msgid "NCM" msgid "NCM"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:668 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:675
msgid "NONE" msgid "NONE"
msgstr "" msgstr ""
@ -507,7 +512,7 @@ msgstr ""
msgid "Network overview" msgid "Network overview"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:115 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:116
msgid "Networks settings" msgid "Networks settings"
msgstr "" msgstr ""
@ -533,7 +538,7 @@ msgstr ""
msgid "No available backup on server." msgid "No available backup on server."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:281 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:287
msgid "No change" msgid "No change"
msgstr "" msgstr ""
@ -563,11 +568,11 @@ msgstr ""
msgid "None" msgid "None"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:461 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:468
msgid "Normal" msgid "Normal"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:143 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:144
msgid "" msgid ""
"Number of times initial SYNs for an active TCP connection attempt will be " "Number of times initial SYNs for an active TCP connection attempt will be "
"retransmitted." "retransmitted."
@ -585,7 +590,7 @@ msgstr ""
msgid "Obfuscating will be enabled on both side" msgid "Obfuscating will be enabled on both side"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:279 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:285
msgid "On wizard change" msgid "On wizard change"
msgstr "" msgstr ""
@ -602,55 +607,59 @@ msgstr ""
msgid "OpenVPN can't be used in multi VPS configuration." msgid "OpenVPN can't be used in multi VPS configuration."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:211 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:212
msgid "Optimize for latency instead of bandwidth" msgid "Optimize for latency instead of bandwidth"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:374 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:375
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:503 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:510
msgid "Other" msgid "Other"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:669 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:219
msgid "PAP" msgid "Other settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671
msgid "PAP/CHAP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:682
msgid "PAP/CHAP password"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:676 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:676
msgid "PAP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:678
msgid "PAP/CHAP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:689
msgid "PAP/CHAP password"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:683
msgid "PAP/CHAP username" msgid "PAP/CHAP username"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:645 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:652
msgid "PIN code" msgid "PIN code"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:501 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:508
msgid "PPPoE" msgid "PPPoE"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:383 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:387
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:472 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:479
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:512 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:519
msgid "Physical interface" msgid "Physical interface"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:655 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:662
msgid "Prefer LTE" msgid "Prefer LTE"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:656 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:663
msgid "Prefer UMTS" msgid "Prefer UMTS"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:368 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:369
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:493 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:500
msgid "Protocol" msgid "Protocol"
msgstr "" msgstr ""
@ -666,7 +675,7 @@ msgstr ""
msgid "Proxy traffic:" msgid "Proxy traffic:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:502 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:509
msgid "QMI" msgid "QMI"
msgstr "" msgstr ""
@ -682,24 +691,24 @@ msgstr ""
msgid "Retrieve settings from server" msgid "Retrieve settings from server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:330
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:799 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:824
msgid "Save & Apply" msgid "Save & Apply"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:221 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:227
msgid "Save vnstats statistics on disk" msgid "Save vnstats statistics on disk"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:216 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:222
msgid "Save vnstats stats" msgid "Save vnstats stats"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:304 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:310
msgid "Scaling governor" msgid "Scaling governor"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:793 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:818
msgid "Select the device you want to base the interface on." msgid "Select the device you want to base the interface on."
msgstr "" msgstr ""
@ -730,15 +739,15 @@ msgstr ""
msgid "Server username" msgid "Server username"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:651 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658
msgid "Service Type" msgid "Service Type"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:544 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:551
msgid "Set an IP in the same network as the modem" msgid "Set an IP in the same network as the modem"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:560 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:567
msgid "Set here IP of the modem" msgid "Set here IP of the modem"
msgstr "" msgstr ""
@ -758,12 +767,12 @@ msgid ""
"all traffic if ShadowSocks is disabled." "all traffic if ShadowSocks is disabled."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:751 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:776
msgid "" msgid ""
"Set value between 80-95% of max download speed link. 0 to disable SQM/QoS." "Set value between 80-95% of max download speed link. 0 to disable SQM/QoS."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:767 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:792
msgid "" msgid ""
"Set value between 80-95% of max upload speed link. 0 to disable SQM/QoS." "Set value between 80-95% of max upload speed link. 0 to disable SQM/QoS."
msgstr "" msgstr ""
@ -789,8 +798,8 @@ msgstr ""
msgid "Show all settings" msgid "Show all settings"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:372 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:497 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:504
msgid "Static address" msgid "Static address"
msgstr "" msgstr ""
@ -798,11 +807,11 @@ msgstr ""
msgid "Status" msgid "Status"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:289 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:295
msgid "Systems settings" msgid "Systems settings"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:133 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:134
msgid "" msgid ""
"The length of time an orphaned (no longer referenced by any application) " "The length of time an orphaned (no longer referenced by any application) "
"connection will remain in the FIN_WAIT_2 state before it is aborted at the " "connection will remain in the FIN_WAIT_2 state before it is aborted at the "
@ -815,14 +824,14 @@ msgid ""
"the processor, you should use chacha20." "the processor, you should use chacha20."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:153 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:154
msgid "" msgid ""
"This value influences the time, after which TCP decides, that something is " "This value influences the time, after which TCP decides, that something is "
"wrong due to unacknowledged RTO retransmissions, and reports this suspicion " "wrong due to unacknowledged RTO retransmissions, and reports this suspicion "
"to the network layer." "to the network layer."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:163 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:164
msgid "" msgid ""
"This value influences the timeout of an alive TCP connection, when RTO " "This value influences the timeout of an alive TCP connection, when RTO "
"retransmissions remain unacknowledged." "retransmissions remain unacknowledged."
@ -832,7 +841,7 @@ msgstr ""
msgid "Total traffic:" msgid "Total traffic:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:458 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:465
msgid "Type" msgid "Type"
msgstr "" msgstr ""
@ -845,7 +854,7 @@ msgstr ""
msgid "UBOND password" msgid "UBOND password"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:665
msgid "UMTS/GPRS" msgid "UMTS/GPRS"
msgstr "" msgstr ""
@ -865,7 +874,7 @@ msgstr ""
msgid "Update server" msgid "Update server"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:757 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:782
msgid "Upload speed (Kb/s)" msgid "Upload speed (Kb/s)"
msgstr "" msgstr ""
@ -874,8 +883,8 @@ msgstr ""
msgid "Uptime:" msgid "Uptime:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:746 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:771
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:762 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:787
msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value." msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value."
msgstr "" msgstr ""
@ -924,7 +933,7 @@ msgstr ""
msgid "Wan IP and gateway are identical" msgid "Wan IP and gateway are identical"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:191 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:192
msgid "" msgid ""
"When enable check are done on external sites to get each WAN IP and the IP " "When enable check are done on external sites to get each WAN IP and the IP "
"used to go outside." "used to go outside."
@ -939,15 +948,15 @@ msgstr ""
msgid "You" msgid "You"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:726 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:751
msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP." msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:378 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:379
msgid "You can use DHCP if you have multiple real ethernet ports." msgid "You can use DHCP if you have multiple real ethernet ports."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:507 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:514
msgid "" msgid ""
"You can use DHCP if you have multiple real ethernet ports. Select other if " "You can use DHCP if you have multiple real ethernet ports. Select other if "
"you want to use another protocol available in Network Interfaces page." "you want to use another protocol available in Network Interfaces page."
@ -957,7 +966,7 @@ msgstr ""
msgid "You can use a public IPv6 prefix only if you set only one server." msgid "You can use a public IPv6 prefix only if you set only one server."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:429 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:436
msgid "You must disable DHCP on your modems and set IP in different networks." msgid "You must disable DHCP on your modems and set IP in different networks."
msgstr "" msgstr ""
@ -965,7 +974,7 @@ msgstr ""
msgid "You should disable IPv6 here if server doesn't provide IPv6." msgid "You should disable IPv6 here if server doesn't provide IPv6."
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:736 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:761
msgid "You should disable SQM for LTE or any interfaces with variable speed." msgid "You should disable SQM for LTE or any interfaces with variable speed."
msgstr "" msgstr ""
@ -977,7 +986,7 @@ msgstr ""
msgid "address:" msgid "address:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:660 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:667
msgid "auto" msgid "auto"
msgstr "" msgstr ""
@ -1001,6 +1010,7 @@ msgid "mtu:"
msgstr "" msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:543 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:543
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:699
msgid "multipath:" msgid "multipath:"
msgstr "" msgstr ""

16
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -23,8 +23,24 @@ omr_intf_set() {
config_get ifname "$1" ifname config_get ifname "$1" ifname
config_get device "$1" device config_get device "$1" device
config_get proto "$1" proto config_get proto "$1" proto
config_get addlatency "$1" addlatency "0"
devicename=$(echo "$device" | cut -d'/' -f3) devicename=$(echo "$device" | cut -d'/' -f3)
[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
if [ -n "$ifname" ]; then
if [ "$addlatency" = "0" ] && [ "$(tc qdisc show $ifname | grep delay)" != "" ]; then
tc qdisc del dev ${ifname} root netem
fi
if [ "$addlatency" != "0" ]; then
if [ "$(tc qdisc show $ifname | grep delay)" != "" ]; then
tc qdisc add dev ${ifname} root netem delay ${addlatency}ms
elif [ "$(tc qdisc show $ifname | awk '/delay/ { print $10 }' | sed 's/ms//')" != "$addlatency" ]; then
tc qdisc replace dev ${ifname} root netem delay ${addlatency}ms
fi
fi
fi
if [ -n "$ifname" ] && [ -f /sys/class/net/${ifname}/device/uevent ]; then if [ -n "$ifname" ] && [ -f /sys/class/net/${ifname}/device/uevent ]; then
devicepath=$(readlink -f /sys/class/net/${ifname}) devicepath=$(readlink -f /sys/class/net/${ifname})
if [ -n "$devicepath" ] && [ "$(echo ${devicepath} | grep virtual)" = "" ]; then if [ -n "$devicepath" ] && [ "$(echo ${devicepath} | grep virtual)" = "" ]; then

3
luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
View file

@ -107,4 +107,7 @@ if [ "$(uci -q get openmptcprouter.settings.scaling_governor)" = "" ]; then
commit openmptcprouter commit openmptcprouter
EOF EOF
fi fi
sed -i 's/net.ipv4.tcp_retries2=3$/net.ipv4.tcp_retries2=15/' /etc/sysctl.d/zzz_openmptcprouter.conf
exit 0 exit 0

5
luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -430,12 +430,9 @@ return view.extend({
so.datatype = 'list(unique(macaddr))'; so.datatype = 'list(unique(macaddr))';
so.rmempty = true; so.rmempty = true;
so.cfgvalue = function(section) { so.cfgvalue = function(section) {
var macs = uci.get('dhcp', section, 'mac'), var macs = L.toArray(uci.get('dhcp', section, 'mac')),
result = []; result = [];
if (!Array.isArray(macs))
macs = (macs != null && macs != '') ? macs.split(/\ss+/) : [];
for (var i = 0, mac; (mac = macs[i]) != null; i++) for (var i = 0, mac; (mac = macs[i]) != null; i++)
if (/^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/.test(mac)) if (/^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/.test(mac))
result.push('%02X:%02X:%02X:%02X:%02X:%02X'.format( result.push('%02X:%02X:%02X:%02X:%02X:%02X'.format(

4
luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
View file

@ -575,6 +575,10 @@ return view.extend({
o.value('backup',_('Backup')); o.value('backup',_('Backup'));
o.default = 'off'; o.default = 'off';
o = s.taboption('advanced', form.Value, 'addlatency', _('Additional latency'));
o.datatype = 'uinteger';
o.default = '0';
if (L.hasSystemFeature('dnsmasq') || L.hasSystemFeature('odhcpd')) { if (L.hasSystemFeature('dnsmasq') || L.hasSystemFeature('odhcpd')) {
o = s.taboption('dhcp', form.SectionValue, '_dhcp', form.TypedSection, 'dhcp'); o = s.taboption('dhcp', form.SectionValue, '_dhcp', form.TypedSection, 'dhcp');
o.depends('proto', 'static'); o.depends('proto', 'static');

BIN
luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/omr-logo-apple.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

1
luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
View file

@ -32,6 +32,7 @@
<link rel="stylesheet" href="<%=media%>/cascade.css"> <link rel="stylesheet" href="<%=media%>/cascade.css">
<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" /> <link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="<%=media%>/mobile.css" type="text/css" />
<link rel="shortcut icon" type="image/png" href="<%=media%>/favicon.png"> <link rel="shortcut icon" type="image/png" href="<%=media%>/favicon.png">
<link rel="apple-touch-icon" href="<%=media%>/omr-logo-apple.png">
<% if node and node.css then %> <% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>"> <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
<% end -%> <% end -%>

2
openmptcprouter-full/Makefile
View file

@ -79,7 +79,7 @@ MY_DEPENDS := \
kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \ kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \
!TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \ !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 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 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 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
# luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status # luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status
# luci-proto-bonding luci-app-statistics luci-proto-gre # luci-proto-bonding luci-app-statistics luci-proto-gre
# softethervpn5-client softethervpn5-server luci-app-nginx-ha # softethervpn5-client softethervpn5-server luci-app-nginx-ha

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

@ -717,63 +717,119 @@ _vps_firewall_redirect_port() {
config_get dest_ip $1 dest_ip config_get dest_ip $1 dest_ip
config_get dest_port $1 dest_port config_get dest_port $1 dest_port
config_get src_ip $1 src_ip config_get src_ip $1 src_ip
if [ "$(echo $src_dport | cut -d'-' -f2)" -ge "65000" ]; then config_get v2ray $1 v2ray "0"
if [ -n "$src_dport" ] && [ "$(echo $src_dport | cut -d'-' -f2)" -ge "65000" ]; then
logger -t "OMR-VPS" "You can't redirect ports >= 65000, they are needed by OpenMPTCProuter Server part" logger -t "OMR-VPS" "You can't redirect ports >= 65000, they are needed by OpenMPTCProuter Server part"
enabled="0" enabled="0"
#uci -q delete firewall.$1 #uci -q delete firewall.$1
#return #return
fi fi
[ "$(v2ray.main.enabled)" = "0" ] && v2ray="0"
[ "$proto" = "all" ] && proto="tcp udp" [ "$proto" = "all" ] && proto="tcp udp"
[ "$proto" = "" ] && proto="tcp udp" [ "$proto" = "" ] && proto="tcp udp"
[ "$src" = "vpn" ] && [ -n "$proto" ] && [ -n "$src_dport" ] && [ "$enabled" != "0" ] && { [ "$src" = "vpn" ] && [ -n "$proto" ] && [ -n "$src_dport" ] && [ "$enabled" != "0" ] && {
for protoi in $proto; do for protoi in $proto; do
checkfw="" if [ "$v2ray" = "0" ]; then
if [ "$family" = "ipv4" ]; then checkfw=""
if [ "$src_dip" = "" ]; then if [ "$family" = "ipv4" ]; then
checkfw=$(echo "$vpsfwlist" | grep "$src_dport # OMR $username redirect router $src_dport port $protoi") if [ "$src_dip" = "" ]; then
checkfw=$(echo "$vpsfwlist" | grep "$src_dport # OMR $username redirect router $src_dport port $protoi")
else
comment=""
[ -n "$src_dip" ] && {
comment=" to $src_dip"
iptables-save --counters | sed "s:-d $src_dip/32::g" | iptables-restore -w
}
[ -n "$src_ip" ] && comment=" from $src_ip"
checkfw=$(echo "$vpsfwlist" | grep "# OMR $username redirect router $src_dport port $protoi${comment}")
fi
else else
comment="" if [ "$src_dip" = "" ]; then
[ -n "$src_dip" ] && { checkfw=$(echo "$vpsfw6list" | grep "$src_dport # OMR $username redirect router $src_dport port $protoi")
comment=" to $src_dip" else
iptables-save --counters | sed "s:-d $src_dip/32::g" | iptables-restore -w comment=""
} [ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip" [ -n "$src_ip" ] && comment=" from $src_ip"
checkfw=$(echo "$vpsfwlist" | grep "# OMR $username redirect router $src_dport port $protoi${comment}") checkfw=$(echo "$vpsfw6list" | grep "# OMR $username redirect router $src_dport port $protoi${comment}")
fi
fi
if [ "$checkfw" = "" ]; then
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'$protoi'","fwtype" : "DNAT","ipproto" : "'$family'"}'
_set_json "shorewallopen" "$settings"
fi
if [ "$family" = "ipv4" ]; then
if [ "$src_dip" = "" ]; then
vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport # OMR $username redirect router $src_dport port $protoi")
[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport # OMR redirect router $src_dport port $protoi")
else
comment=""
[ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip"
vpsfwlist=$(echo "$vpsfwlist" | grep -v "# OMR $username redirect router $src_dport port $protoi${comment}")
[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "# OMR redirect router $src_dport port $protoi${comment}")
fi
else
if [ "$src_dip" = "" ]; then
vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport # OMR $username redirect router $src_dport port $protoi")
[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport # OMR redirect router $src_dport port $protoi")
else
[ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip"
vpsfw6list=$(echo "$vpsfw6list" | grep -v "# OMR $username redirect router $src_dport port $protoi${comment}")
[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "# OMR redirect router $src_dport port $protoi${comment}")
fi
fi fi
else else
if [ "$src_dip" = "" ]; then checkfw=""
checkfw=$(echo "$vpsfw6list" | grep "$src_dport # OMR $username redirect router $src_dport port $protoi") if [ "$family" = "ipv4" ]; then
if [ "$src_dip" = "" ]; then
checkfw=$(echo "$vpsfwlist" | grep "$src_dport # OMR $username open router $src_dport port $protoi")
else
comment=""
[ -n "$src_dip" ] && {
comment=" to $src_dip"
iptables-save --counters | sed "s:-d $src_dip/32::g" | iptables-restore -w
}
[ -n "$src_ip" ] && comment=" from $src_ip"
checkfw=$(echo "$vpsfwlist" | grep "# OMR $username open router $src_dport port $protoi${comment}")
fi
else else
comment="" if [ "$src_dip" = "" ]; then
[ -n "$src_dip" ] && comment=" to $src_dip" checkfw=$(echo "$vpsfw6list" | grep "$src_dport # OMR $username open router $src_dport port $protoi")
[ -n "$src_ip" ] && comment=" from $src_ip" else
checkfw=$(echo "$vpsfw6list" | grep "# OMR $username redirect router $src_dport port $protoi${comment}") comment=""
[ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip"
checkfw=$(echo "$vpsfw6list" | grep "# OMR $username open router $src_dport port $protoi${comment}")
fi
fi fi
fi if [ "$checkfw" = "" ]; then
if [ "$checkfw" = "" ]; then settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'$protoi'","fwtype" : "ACCEPT","ipproto" : "'$family'"}'
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'$protoi'","fwtype" : "DNAT","ipproto" : "'$family'"}' _set_json "shorewallopen" "$settings"
_set_json "shorewallopen" "$settings" settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","destip" : "'$dest_ip'","proto" : "'$protoi'"}'
fi _set_json "v2rayredirect" "$settings"
if [ "$family" = "ipv4" ]; then
if [ "$src_dip" = "" ]; then
vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport # OMR $username redirect router $src_dport port $protoi")
[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport # OMR redirect router $src_dport port $protoi")
else
comment=""
[ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip"
vpsfwlist=$(echo "$vpsfwlist" | grep -v "# OMR $username redirect router $src_dport port $protoi${comment}")
[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "# OMR redirect router $src_dport port $protoi${comment}")
fi fi
else if [ "$family" = "ipv4" ]; then
if [ "$src_dip" = "" ]; then if [ "$src_dip" = "" ]; then
vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport # OMR $username redirect router $src_dport port $protoi") vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport # OMR $username open router $src_dport port $protoi")
[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport # OMR redirect router $src_dport port $protoi") [ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport # OMR open router $src_dport port $protoi")
else
comment=""
[ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip"
vpsfwlist=$(echo "$vpsfwlist" | grep -v "# OMR $username open router $src_dport port $protoi${comment}")
[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "# OMR open router $src_dport port $protoi${comment}")
fi
else else
[ -n "$src_dip" ] && comment=" to $src_dip" if [ "$src_dip" = "" ]; then
[ -n "$src_ip" ] && comment=" from $src_ip" vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport # OMR $username open router $src_dport port $protoi")
vpsfw6list=$(echo "$vpsfw6list" | grep -v "# OMR $username redirect router $src_dport port $protoi${comment}") [ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport # OMR open router $src_dport port $protoi")
[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "# OMR redirect router $src_dport port $protoi${comment}") else
[ -n "$src_dip" ] && comment=" to $src_dip"
[ -n "$src_ip" ] && comment=" from $src_ip"
vpsfw6list=$(echo "$vpsfw6list" | grep -v "# OMR $username open router $src_dport port $protoi${comment}")
[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "# OMR open router $src_dport port $protoi${comment}")
fi
fi fi
fi fi
done done